Creata pagina step della commessa

salesbook.Maui/MauiProgram.cs

@@ -9,6 +9,7 @@ using MudExtensions.Services;
 using salesbook.Maui.Core.Services;
 using salesbook.Shared;
 using salesbook.Shared.Core.Dto;
+using salesbook.Shared.Core.Dto.PageState;
 using salesbook.Shared.Core.Helpers;
 using salesbook.Shared.Core.Interface;
 using salesbook.Shared.Core.Messages.Activity.Copy;
@@ -58,6 +59,12 @@ namespace salesbook.Maui
             builder.Services.AddScoped<ISyncDbService, SyncDbService>();
             builder.Services.AddScoped<IManageDataService, ManageDataService>();
 
+            //SessionData
+            builder.Services.AddSingleton<JobSteps>();
+            builder.Services.AddSingleton<UserPageState>();
+            builder.Services.AddSingleton<UserListState>();
+            builder.Services.AddSingleton<FilterUserDTO>();
+
             //Message
             builder.Services.AddScoped<IMessenger, WeakReferenceMessenger>();
             builder.Services.AddScoped<NewActivityService>();
@@ -73,7 +80,6 @@ namespace salesbook.Maui
             builder.Services.AddSingleton<IFormFactor, FormFactor>();
             builder.Services.AddSingleton<IAttachedService, AttachedService>();
             builder.Services.AddSingleton<LocalDbService>();
-            builder.Services.AddSingleton<FilterUserDTO>();
 
             return builder.Build();
         }

salesbook.Shared/Components/Layout/NavMenu.razor

@@ -67,10 +67,10 @@
         {
             var location = args.Location.Remove(0, NavigationManager.BaseUri.Length);
 
-            var newIsVisible = new List<string> { "Calendar", "Users", "Notifications" }
+            var newIsVisible = new List<string> { "Calendar", "Users", "Notifications", "Commessa" }
                 .Contains(location);
 
-            var newPlusVisible = new List<string> { "Calendar", "Users" }
+            var newPlusVisible = new List<string> { "Calendar", "Users", "Commessa" }
                 .Contains(location);
 
             if (IsVisible == newIsVisible && PlusVisible == newPlusVisible) return;

salesbook.Shared/Components/Pages/Commessa.razor

@@ -0,0 +1,95 @@
+@page "/commessa/{CodJcom}"
+@page "/commessa/{CodJcom}/{RagSoc}"
+@attribute [Authorize]
+@using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Core.Dto.JobProgress
+@using salesbook.Shared.Core.Dto.PageState
+@using salesbook.Shared.Core.Entity
+@using salesbook.Shared.Core.Interface
+@inject JobSteps JobSteps
+@inject IManageDataService ManageData
+
+<HeaderLayout Title="@CodJcom" ShowProfile="false" Back="true" BackTo="Indietro"/>
+
+@if (IsLoading)
+{
+    <SpinnerLayout FullScreen="true"/>
+}
+else
+{
+    <div class="container content">
+        @if (CommessaModel == null)
+        {
+            <NoDataAvailable Text="Nessuna commessa trovata"/>
+        }
+        else
+        {
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked>
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab2">
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab3">
+
+            <div class="box">
+                <ul class="tab-list">
+                    <li class="tab-item"><label class="tab-trigger" for="tab1">Avanzamento</label></li>
+                    <li class="tab-item"><label class="tab-trigger" for="tab2">Attività</label></li>
+                    <li class="tab-item"><label class="tab-trigger" for="tab3">Allegati</label></li>
+                </ul>
+            </div>
+
+            <!-- contenuti -->
+            <div class="tab-container">
+                <div class="tab-content">
+                    @if (Steps != null)
+                    {
+                        <div class="timeline-container">
+                            <div class="timeline">
+                                @foreach (var step in Steps)
+                                {
+                                    <div class="step">
+                                        <div class="@(step.Status!.Skip ? "circle skipped" : step.Status!.Progress ? "in-progress" : "circle completed")"></div>
+                                        <div class="label">
+                                            <div class="titleStep">@step.StepName</div>
+                                            @if (step.Date is not null)
+                                            {
+                                                <div class="subtitleStep">@($"{step.Date.Value:D}") @(step.Status!.Progress ? "(In corso...)" : "")</div>
+                                            }
+                                        </div>
+                                    </div>
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+                <div class="tab-content">Contenuto 2</div>
+                <div class="tab-content">Contenuto 3</div>
+            </div>
+        }
+    </div>
+}
+
+@code {
+    [Parameter] public string CodJcom { get; set; } = "";
+    [Parameter] public string RagSoc { get; set; } = "";
+
+    private List<CRMJobStepDTO>? Steps { get; set; }
+    private JtbComt? CommessaModel { get; set; }
+
+    private bool IsLoading { get; set; } = true;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+    }
+
+    private async Task LoadData()
+    {
+        CommessaModel = (await ManageData.GetTable<JtbComt>(x => x.CodJcom.Equals(CodJcom))).LastOrDefault();
+        Steps = JobSteps.Steps;
+
+        IsLoading = false;
+    }
+
+}
+

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

@@ -0,0 +1,215 @@
+/* Container scrollabile */
+
+.timeline-container {
+    height: 100%;
+    overflow-y: auto;
+    padding-right: 10px;
+}
+
+.timeline {
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+    position: relative;
+    padding-left: 40px; /* spazio per linea e cerchi */
+}
+
+.step {
+    display: flex;
+    align-items: flex-start;
+    gap: 15px;
+    position: relative;
+}
+
+/* Linea sopra e sotto ogni step */
+
+.step::before,
+.step::after {
+    content: "";
+    position: absolute;
+    left: -31px;
+    width: 2px;
+    background: #ddd;
+}
+
+.step::after {
+    top: 30%;
+    bottom: -1.5rem;
+}
+
+.step:first-child::before { display: none; }
+
+.step:last-child::after { display: none; }
+
+/* Cerchio base */
+
+.circle,
+.in-progress {
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
+    z-index: 1;
+    margin-left: -40px;
+    background-color: var(--mud-palette-tertiary);
+}
+
+/* Stato skippato */
+
+.skipped { background: #ccc; }
+
+/* Stato completato */
+
+.completed {
+    background: var(--mud-palette-primary);
+    color: white;
+    font-weight: bold;
+}
+
+/* Stato in corso con spinner */
+
+.in-progress {
+    border: 2px solid var(--mud-palette-primary);
+    border-top: 2px solid transparent;
+    animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+
+    100% { transform: rotate(360deg); }
+}
+
+/* Label con titolo + sottotitolo */
+
+.label {
+    display: flex;
+    flex-direction: column;
+}
+
+.titleStep {
+    font-size: 1.1rem;
+    font-weight: 600;
+    color: #111;
+    line-height: normal;
+}
+
+.subtitleStep {
+    font-size: .90rem;
+    color: #666;
+    line-height: normal;
+}
+
+.timeline-container::-webkit-scrollbar { width: 6px; }
+
+.timeline-container::-webkit-scrollbar-thumb {
+    background: #bbb;
+    border-radius: 3px;
+}
+
+/*--------------
+    TabPanel
+----------------*/
+
+.box {
+    display: flex;
+    flex-direction: column;
+    width: -webkit-fill-available;
+    box-shadow: var(--custom-box-shadow);
+    border-radius: 16px;
+    overflow: clip;
+    margin-bottom: 1rem;
+}
+
+/* nascondo gli input */
+
+.tab-toggle { display: none; }
+
+.tab-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    display: flex;
+    position: relative;
+    z-index: 1;
+    background: var(--mud-palette-surface);
+}
+
+/* la lineetta */
+
+.tab-list::before {
+    content: '';
+    display: block;
+    height: 3px;
+    width: calc(100% / 3);
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    background-color: var(--mud-palette-primary);
+    transition: transform .3s;
+}
+
+.tab-item {
+    flex: 1;
+    text-align: center;
+    transition: .3s;
+    opacity: 0.5;
+}
+
+.tab-trigger {
+    display: block;
+    padding: 10px 0;
+    cursor: pointer;
+}
+
+/* tab attivo */
+
+#tab1:checked ~ .box .tab-list .tab-item:nth-child(1),
+#tab2:checked ~ .box .tab-list .tab-item:nth-child(2),
+#tab3:checked ~ .box .tab-list .tab-item:nth-child(3) {
+    opacity: 1;
+    font-weight: bold;
+    display: block;
+}
+
+/* spostamento lineetta */
+
+#tab1:checked ~ .box .tab-list::before { transform: translateX(0%); }
+
+#tab2:checked ~ .box .tab-list::before { transform: translateX(100%); }
+
+#tab3:checked ~ .box .tab-list::before { transform: translateX(200%); }
+
+.tab-container {
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    width: -webkit-fill-available;
+}
+
+.tab-content {
+    display: none;
+    flex: 1;
+    overflow-y: auto;
+    animation: fade .3s ease;
+    padding: .5rem;
+}
+
+#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; }
+
+@keyframes fade {
+    from {
+        opacity: 0;
+        transform: translateY(5px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}

salesbook.Shared/Components/Pages/User.razor

@@ -7,12 +7,15 @@
 @using salesbook.Shared.Components.Layout.Spinner
 @using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Core.Dto.JobProgress
+@using salesbook.Shared.Core.Dto.PageState
 @inject IManageDataService ManageData
 @inject IMapper Mapper
 @inject IDialogService Dialog
-@inject INetworkService NetworkService
+@inject IIntegryApiService IntegryApiService
+@inject UserPageState UserState
 
-<HeaderLayout BackTo="Indietro" LabelSave="Modifica" OnSave="() => OpenUserForm(Anag)" Back="true" BackOnTop="true" Title="" ShowProfile="false" />
+<HeaderLayout BackTo="Indietro" LabelSave="Modifica" OnSave="() => OpenUserForm(Anag)" Back="true" BackOnTop="true" Title="" ShowProfile="false"/>
 
 @if (IsLoading)
 {
@@ -89,11 +92,27 @@ else
             </div>
         </div>
 
-        <MudTabs TabPanelClass="custom-tab-panel" Elevation="2" Rounded="true" PanelClass="pt-2" Centered="true">
+        <input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked>
-            <MudTabPanel Text="Contatti">
+        <input type="radio" class="tab-toggle" name="tab-toggle" id="tab2">
+
+        <div class="box">
+            <ul class="tab-list">
+                <li class="tab-item">
+                    <label class="tab-trigger" for="tab1">Contatti</label>
+                </li>
+                <li class="tab-item">
+                    <label class="tab-trigger" for="tab2">Commesse</label>
+                </li>
+            </ul>
+        </div>
+
+        <!-- contenuti -->
+        <div class="tab-container">
+            <div class="tab-content">
+                <!-- Contatti -->
                 @if (PersRif is { Count: > 0 })
                 {
-                    <div style="margin-top: 1rem;" class="container-pers-rif">
+                    <div class="container-pers-rif">
                         <Virtualize Items="PersRif" Context="person">
                             @{
                                 var index = PersRif.IndexOf(person);
@@ -117,20 +136,30 @@ else
                         Aggiungi contatto
                     </MudButton>
                 </div>
-            </MudTabPanel>
+            </div>
-            <MudTabPanel Text="Commesse">
+            <div class="tab-content">
-                @if (Commesse.IsNullOrEmpty())
+                <!-- Commesse -->
+                @if (LoadCommessa)
                 {
-                    <NoDataAvailable Text="Nessuna commessa presente"/>
+                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
                 }
                 else
                 {
-                    <Virtualize Items="Commesse" Context="commessa">
+                    @if (Commesse.IsNullOrEmpty())
-                        <CommessaCard Commessa="commessa"/>
+                    {
-                    </Virtualize>
+                        <NoDataAvailable Text="Nessuna commessa presente"/>
+                    }
+                    else
+                    {
+                        <div class="commesse-container">
+                            <Virtualize Items="Commesse" Context="commessa">
+                                <CommessaCard Steps="@Steps[commessa.CodJcom]" RagSoc="@Anag.RagSoc" Commessa="commessa"/>
+                            </Virtualize>
+                        </div>
+                    }
                 }
-            </MudTabPanel>
+            </div>
-        </MudTabs>
+        </div>
     </div>
 }
 
@@ -140,14 +169,26 @@ else
 
     private ContactDTO Anag { get; set; } = new();
     private List<PersRifDTO>? PersRif { get; set; }
-    private List<JtbComt> Commesse { get; set; }
+    private List<JtbComt>? Commesse { get; set; }
     private StbUser? Agente { get; set; }
+    private Dictionary<string, List<CRMJobStepDTO>?> Steps { get; set; } = [];
 
     private bool IsLoading { get; set; } = true;
+    private bool LoadCommessa { get; set; } = true;
 
     protected override async Task OnInitializedAsync()
     {
-        await LoadData();
+        if (UserState.CodUser != null && UserState.CodUser.Equals(CodContact))
+        {
+            LoadDataFromSession();
+        }
+        else
+        {
+            await LoadData();
+        }
+
+        IsLoading = false;
+        StateHasChanged();
     }
 
     private async Task LoadData()
@@ -164,18 +205,64 @@ else
         }
 
         await LoadPersRif();
-
+        _ = LoadCommesse();
-        Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag != null && x.CodAnag.Equals(CodContact));
 
         if (Anag.CodVage != null)
         {
             Agente = (await ManageData.GetTable<StbUser>(x => x.UserCode != null && x.UserCode.Equals(Anag.CodVage))).LastOrDefault();
         }
 
-        IsLoading = false;
+        SetDataSession();
+    }
+
+    private void LoadDataFromSession()
+    {
+        Anag = UserState.Anag;
+        PersRif = UserState.PersRif;
+        Commesse = UserState.Commesse;
+        Agente = UserState.Agente;
+        Steps = UserState.Steps;
+
+        SortCommesse();
+
+        LoadCommessa = false;
         StateHasChanged();
     }
 
+    private void SetDataSession()
+    {
+        UserState.CodUser = CodContact;
+        UserState.Anag = Anag;
+        UserState.PersRif = PersRif;
+        UserState.Agente = Agente;
+        UserState.Steps = Steps;
+    }
+
+    private async Task LoadCommesse()
+    {
+        await Task.Run(async () =>
+        {
+            Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag != null && x.CodAnag.Equals(CodContact));
+            UserState.Commesse = Commesse;
+
+            foreach (var commessa in Commesse)
+            {
+                var steps = (await IntegryApiService.RetrieveJobProgress(commessa.CodJcom)).Steps;
+                Steps.Add(commessa.CodJcom, steps);
+            }
+
+            LoadCommessa = false;
+        });
+
+        SortCommesse();
+        StateHasChanged();
+    }
+
+    private void SortCommesse()
+    {
+        Commesse = Commesse?.OrderBy(x => x.LastUpd.HasValue).ThenBy(x => x.LastUpd).ToList();
+    }
+
     private async Task LoadPersRif()
     {
         if (IsContact)

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

@@ -87,6 +87,7 @@
     box-shadow: var(--custom-box-shadow);
     padding: .25rem 0;
     border-radius: 16px;
+    margin-bottom: 0 !important;
 }
 
 .container-button .divider {
@@ -156,4 +157,121 @@
     display: flex;
     gap: 1rem;
     flex-direction: column;
+}
+
+.commesse-container {
+    display: flex;
+    flex-direction: column;
+    gap: 1.25rem;
+}
+
+.commesse-container ::deep > div:first-child:not(.activity-card) {
+    display: none;
+}
+
+/*--------------
+    TabPanel
+----------------*/
+
+.box {
+    display: flex;
+    flex-direction: column;
+    width: -webkit-fill-available;
+    box-shadow: var(--custom-box-shadow);
+    border-radius: 16px;
+    overflow: clip;
+    margin-bottom: 1rem;
+}
+
+/* nascondo gli input */
+
+.tab-toggle { display: none; }
+
+.tab-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    display: flex;
+    position: relative;
+    z-index: 1;
+    background: var(--mud-palette-surface);
+}
+
+/* la lineetta */
+
+.tab-list::before {
+    content: '';
+    display: block;
+    height: 3px;
+    width: calc(100% / 2);
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    background-color: var(--mud-palette-primary);
+    transition: transform .3s;
+}
+
+.tab-item {
+    flex: 1;
+    text-align: center;
+    transition: .3s;
+    opacity: 0.5;
+}
+
+.tab-trigger {
+    display: block;
+    padding: 10px 0;
+    cursor: pointer;
+}
+
+/* tab attivo */
+
+#tab1:checked ~ .box .tab-list .tab-item:nth-child(1),
+#tab2:checked ~ .box .tab-list .tab-item:nth-child(2) {
+    opacity: 1;
+    font-weight: bold;
+    display: block;
+}
+
+/* spostamento lineetta */
+
+#tab1:checked ~ .box .tab-list::before { transform: translateX(0%); }
+
+#tab2:checked ~ .box .tab-list::before { transform: translateX(100%); }
+
+.tab-container {
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    width: -webkit-fill-available;
+}
+
+.tab-content {
+    display: none;
+    flex: 1;
+    overflow-y: auto;
+    animation: fade .3s ease;
+    padding: .5rem;
+}
+
+.tab-content::-webkit-scrollbar { width: 3px; }
+
+.tab-content::-webkit-scrollbar-thumb {
+    background: #bbb;
+    border-radius: 2px;
+}
+
+#tab1:checked ~ .tab-container .tab-content:nth-child(1),
+#tab2:checked ~ .tab-container .tab-content:nth-child(2) { display: block; }
+
+@keyframes fade {
+    from {
+        opacity: 0;
+        transform: translateY(5px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
 }

salesbook.Shared/Components/Pages/Users.razor

@@ -6,11 +6,14 @@
 @using salesbook.Shared.Components.SingleElements.BottomSheet
 @using salesbook.Shared.Components.Layout.Spinner
 @using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Core.Dto.PageState
+@using salesbook.Shared.Core.Dto.Users
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Messages.Contact
 @inject IManageDataService ManageData
 @inject NewContactService NewContact
 @inject FilterUserDTO Filter
+@inject UserListState UserState
 
 <HeaderLayout Title="Contatti"/>
 
@@ -70,22 +73,46 @@
     protected override void OnInitialized()
     {
         NewContact.OnContactCreated += async response => await OnUserCreated(response);
-        Console.WriteLine($"Filter HashCode: {Filter.GetHashCode()} - IsInitialized: {Filter.IsInitialized}");
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
         {
-            await LoadData();
+            IsLoading = true;
+            StateHasChanged();
+
+            if (UserState.FilteredGroupedUserList == null && UserState.GroupedUserList == null)
+            {
+                await LoadData();
+                SetDataSession();   
+            } 
+            else
+            {
+                LoadFromSession();
+            }
+
+            FilterUsers();
+
+            IsLoading = false;
+            StateHasChanged();
         }
     }
 
+    private void LoadFromSession()
+    {
+        GroupedUserList = UserState.GroupedUserList!;
+        FilteredGroupedUserList = UserState.FilteredGroupedUserList!;
+    }
+
+    private void SetDataSession()
+    {
+        UserState.GroupedUserList = GroupedUserList;
+        UserState.FilteredGroupedUserList = FilteredGroupedUserList;
+    }
+
     private async Task LoadData()
     {
-        IsLoading = true;
-        StateHasChanged();
-
         if (!Filter.IsInitialized)
         {
             var loggedUser = (await ManageData.GetTable<StbUser>(x => x.UserName.Equals(UserSession.User.Username))).Last();
@@ -126,19 +153,6 @@
                 HeaderLetter = currentLetter
             });
         }
-
-        FilterUsers();
-
-        IsLoading = false;
-        StateHasChanged();
-    }
-
-
-    private class UserDisplayItem
-    {
-        public required ContactDTO User { get; set; }
-        public bool ShowHeader { get; set; }
-        public string? HeaderLetter { get; set; }
     }
 
     private void FilterUsers() => FilterUsers(false);

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

@@ -1,24 +1,68 @@
+@using salesbook.Shared.Core.Dto.JobProgress
+@using salesbook.Shared.Core.Dto.PageState
 @using salesbook.Shared.Core.Entity
+@inject JobSteps JobSteps
 
-<div style="margin-top: 1rem;" class="activity-card">
+<div @onclick="OpenPageCommessa" 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>
+                <MudText Class="activity-title" Typo="Typo.body1" HtmlTag="h3">@Commessa.CodJcom</MudText>
                 <div class="activity-hours-section">
-                    <span class="activity-hours">
+                    @if (LastUpd is not null)
-                        @Commessa.CodJcom
+                    {
-                    </span>
+                        <span class="activity-hours">Aggiornato il @($"{LastUpd:d}")</span>
+                    }
                 </div>
             </div>
+            <span class="activity-title">@Commessa.Descrizione</span>
         </div>
     </div>
 
     <div class="activity-info-section">
-        <MudChip T="string" Icon="@IconConstants.Chip.User" Size="Size.Small">Stato</MudChip>
+        @if (Stato is not null)
+        {
+            <MudChip T="string" Variant="Variant.Outlined" Icon="@IconConstants.Chip.Stato" Size="Size.Small">@Stato</MudChip>
+        }
     </div>
 </div>
 
 @code {
     [Parameter] public JtbComt Commessa { get; set; } = new();
+    [Parameter] public string RagSoc { get; set; } = "";
+    [Parameter] public List<CRMJobStepDTO>? Steps { get; set; }
+
+    private string? Stato { get; set; }
+    private DateTime? LastUpd { get; set; }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        GetStepInfo();
+    }
+
+    private void GetStepInfo()
+    {
+        if (Steps is null) return;
+
+        var lastBeforeSkip = Steps
+            .TakeWhile(s => s.Status is { Skip: false })
+            .LastOrDefault();
+
+        if (lastBeforeSkip is not null) Stato = lastBeforeSkip.StepName;
+
+        LastUpd = Steps
+            .Where(s => s.Date.HasValue)
+            .Select(s => s.Date!.Value)
+            .DefaultIfEmpty()
+            .Max();
+
+        if (LastUpd.Equals(DateTime.MinValue)) LastUpd = null;
+    }
+
+    private void OpenPageCommessa()
+    {
+        JobSteps.Steps = Steps;
+        NavigationManager.NavigateTo($"commessa/{Commessa.CodJcom}/{RagSoc}");
+    }
+
 }

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

@@ -28,8 +28,9 @@
 }
 
 .activity-hours {
-    font-weight: 700;
+    color: var(--mud-palette-gray-darker);
-    color: var(--mud-palette-text-primary);
+    font-weight: 600;
+    font-size: .8rem;
 }
 
 .activity-hours-section ::deep .mud-chip { margin: 5px 0 0 !important; }
@@ -40,13 +41,18 @@
     flex-direction: column;
 }
 
-.title-section ::deep > .activity-title {
+.activity-title {
     font-weight: 800 !important;
     margin: 0 !important;
     line-height: normal !important;
     color: var(--mud-palette-text-primary);
 }
 
+.title-section ::deep > .activity-title {
+    font-weight: 600;
+    color: var(--mud-palette-text-primary);
+}
+
 .activity-body-section ::deep > .activity-subtitle {
     color: var(--mud-palette-gray-darker);
     margin: .2rem 0 !important;
@@ -55,5 +61,7 @@
 
 .activity-info-section {
     display: flex;
-    flex-wrap: wrap;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: .25rem;
 }

salesbook.Shared/Core/Dto/JobProgress/CRMJobProgressResponseDTO.cs

@@ -0,0 +1,9 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto.JobProgress;
+
+public class CRMJobProgressResponseDTO
+{
+    [JsonPropertyName("steps")]
+    public List<CRMJobStepDTO> Steps { get; set; }
+}

salesbook.Shared/Core/Dto/JobProgress/CRMJobStatusDTO.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto.JobProgress;
+
+public class CRMJobStatusDTO
+{
+    [JsonPropertyName("completed")]
+    public bool Completed { get; set; }
+    
+    [JsonPropertyName("progress")]
+    public bool Progress { get; set; }
+
+    [JsonPropertyName("skip")]
+    public bool Skip { get; set; }
+}

salesbook.Shared/Core/Dto/JobProgress/CRMJobStepDTO.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto.JobProgress;
+
+public class CRMJobStepDTO
+{
+    [JsonPropertyName("stepName")]
+    public string? StepName { get; set; }
+
+    [JsonPropertyName("status")]
+    public CRMJobStatusDTO? Status { get; set; }
+
+    [JsonPropertyName("date")] 
+    public DateTime? Date { get; set; }
+}

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

@@ -0,0 +1,8 @@
+using salesbook.Shared.Core.Dto.JobProgress;
+
+namespace salesbook.Shared.Core.Dto.PageState;
+
+public class JobSteps
+{
+    public List<CRMJobStepDTO>? Steps { get; set; }
+}

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

@@ -0,0 +1,9 @@
+using salesbook.Shared.Core.Dto.Users;
+
+namespace salesbook.Shared.Core.Dto.PageState;
+
+public class UserListState
+{
+    public List<UserDisplayItem>? GroupedUserList { get; set; }
+    public List<UserDisplayItem>? FilteredGroupedUserList { get; set; }
+}

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

@@ -0,0 +1,15 @@
+using salesbook.Shared.Core.Dto.JobProgress;
+using salesbook.Shared.Core.Entity;
+
+namespace salesbook.Shared.Core.Dto.PageState;
+
+public class UserPageState
+{
+    public string? CodUser { get; set; }
+    
+    public ContactDTO Anag { get; set; }
+    public List<PersRifDTO>? PersRif { get; set; }
+    public List<JtbComt> Commesse { get; set; }
+    public StbUser? Agente { get; set; }
+    public Dictionary<string, List<CRMJobStepDTO>?> Steps { get; set; }
+}

salesbook.Shared/Core/Dto/Users/UserDisplayItem.cs

@@ -0,0 +1,8 @@
+namespace salesbook.Shared.Core.Dto.Users;
+
+public class UserDisplayItem
+{
+    public required ContactDTO User { get; set; }
+    public bool ShowHeader { get; set; }
+    public string? HeaderLetter { get; set; }
+}

salesbook.Shared/Core/Entity/JtbComt.cs

@@ -107,4 +107,7 @@ public class JtbComt
 
     [Column("note_tecniche"), JsonPropertyName("noteTecniche")]
     public string NoteTecniche { get; set; }
+
+    [Ignore, JsonIgnore]
+    public DateTime? LastUpd { get; set; }
 }

salesbook.Shared/Core/Interface/IIntegryApiService.cs

@@ -1,4 +1,5 @@
 using salesbook.Shared.Core.Dto;
+using salesbook.Shared.Core.Dto.JobProgress;
 using salesbook.Shared.Core.Entity;
 
 namespace salesbook.Shared.Core.Interface;
@@ -22,6 +23,8 @@ public interface IIntegryApiService
     Task<List<ActivityFileDto>> GetActivityFile(string activityId);
     Task<Stream> DownloadFile(string activityId, string fileName);
 
+    Task<CRMJobProgressResponseDTO> RetrieveJobProgress(string codJcom);
+
     //Position
     Task<PositionDTO> SavePosition(PositionDTO position);
     Task<PositionDTO> RetrievePosition(string id);

salesbook.Shared/Core/Services/IntegryApiService.cs

@@ -1,6 +1,7 @@
 using IntegryApiClient.Core.Domain.Abstraction.Contracts.Account;
 using IntegryApiClient.Core.Domain.RestClient.Contacts;
 using salesbook.Shared.Core.Dto;
+using salesbook.Shared.Core.Dto.JobProgress;
 using salesbook.Shared.Core.Entity;
 using salesbook.Shared.Core.Interface;
 using System.Net.Http.Headers;
@@ -146,4 +147,11 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
 
         return integryApiRestClient.Get<PositionDTO>("retrievePosition", queryParams)!;
     }
+
+    public Task<CRMJobProgressResponseDTO> RetrieveJobProgress(string codJcom)
+    {
+        var queryParams = new Dictionary<string, object> { { "codJcom", codJcom } };
+
+        return integryApiRestClient.Get<CRMJobProgressResponseDTO>("crm/retrieveJobProgress", queryParams)!;
+    }
 }

salesbook.Shared/wwwroot/css/app.css

@@ -31,11 +31,11 @@ a, .btn-link {
 .btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus { box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb; }
 
 .content {
-    /*padding-top: 1.1rem;*/
+    padding-top: 1rem;
     display: flex;
     align-items: center;
     flex-direction: column;
-    height: 84vh;
+    height: 90vh;
 }
 
 h1:focus { outline: none; }