2 Commits

Author SHA1 Message Date
3fd5410bf5 Aggiunta versione app a video 2025-11-14 12:40:17 +01:00
e338e7d253 Fix caricamenti in Modal Activity 2025-11-14 09:58:52 +01:00
9 changed files with 50 additions and 3 deletions

View File

@@ -0,0 +1,8 @@
using salesbook.Shared.Core.Interface.System;
namespace salesbook.Maui.Core.System;
public class GenericSystemService : IGenericSystemService
{
public string GetCurrentAppVersion() => AppInfo.VersionString;
}

View File

@@ -7,6 +7,7 @@ using MudBlazor.Services;
using MudExtensions.Services; using MudExtensions.Services;
using salesbook.Maui.Core.RestClient.IntegryApi; using salesbook.Maui.Core.RestClient.IntegryApi;
using salesbook.Maui.Core.Services; using salesbook.Maui.Core.Services;
using salesbook.Maui.Core.System;
using salesbook.Maui.Core.System.Network; using salesbook.Maui.Core.System.Network;
using salesbook.Maui.Core.System.Notification; using salesbook.Maui.Core.System.Notification;
using salesbook.Maui.Core.System.Notification.Push; using salesbook.Maui.Core.System.Notification.Push;
@@ -16,6 +17,7 @@ using salesbook.Shared.Core.Dto.PageState;
using salesbook.Shared.Core.Helpers; using salesbook.Shared.Core.Helpers;
using salesbook.Shared.Core.Interface; using salesbook.Shared.Core.Interface;
using salesbook.Shared.Core.Interface.IntegryApi; using salesbook.Shared.Core.Interface.IntegryApi;
using salesbook.Shared.Core.Interface.System;
using salesbook.Shared.Core.Interface.System.Network; using salesbook.Shared.Core.Interface.System.Network;
using salesbook.Shared.Core.Interface.System.Notification; using salesbook.Shared.Core.Interface.System.Notification;
using salesbook.Shared.Core.Messages.Activity.Copy; using salesbook.Shared.Core.Messages.Activity.Copy;
@@ -102,6 +104,7 @@ namespace salesbook.Maui
builder.Services.AddSingleton<IFormFactor, FormFactor>(); builder.Services.AddSingleton<IFormFactor, FormFactor>();
builder.Services.AddSingleton<IAttachedService, AttachedService>(); builder.Services.AddSingleton<IAttachedService, AttachedService>();
builder.Services.AddSingleton<INetworkService, NetworkService>(); builder.Services.AddSingleton<INetworkService, NetworkService>();
builder.Services.AddSingleton<IGenericSystemService, GenericSystemService>();
builder.Services.AddSingleton<LocalDbService>(); builder.Services.AddSingleton<LocalDbService>();
_ = typeof(System.Runtime.InteropServices.SafeHandle); _ = typeof(System.Runtime.InteropServices.SafeHandle);

View File

@@ -1,8 +1,10 @@
@page "/login" @page "/login"
@using salesbook.Shared.Components.Layout.Spinner @using salesbook.Shared.Components.Layout.Spinner
@using salesbook.Shared.Core.Interface.System
@using salesbook.Shared.Core.Services @using salesbook.Shared.Core.Services
@inject IUserAccountService UserAccountService @inject IUserAccountService UserAccountService
@inject AppAuthenticationStateProvider AuthenticationStateProvider @inject AppAuthenticationStateProvider AuthenticationStateProvider
@inject IGenericSystemService GenericSystemService
@if (Spinner) @if (Spinner)
{ {
@@ -34,7 +36,7 @@ else
</div> </div>
<div class="my-4 login-footer"> <div class="my-4 login-footer">
<span>Powered by</span> <span>@($"v{GenericSystemService.GetCurrentAppVersion()} | Powered by")</span>
<img src="_content/salesbook.Shared/images/logoIntegry.svg" class="img-fluid" alt="Integry"> <img src="_content/salesbook.Shared/images/logoIntegry.svg" class="img-fluid" alt="Integry">
</div> </div>
</div> </div>

View File

@@ -1,6 +1,7 @@
@page "/PersonalInfo" @page "/PersonalInfo"
@attribute [Authorize] @attribute [Authorize]
@using salesbook.Shared.Components.Layout @using salesbook.Shared.Components.Layout
@using salesbook.Shared.Components.SingleElements
@using salesbook.Shared.Core.Authorization.Enum @using salesbook.Shared.Core.Authorization.Enum
@using salesbook.Shared.Core.Interface @using salesbook.Shared.Core.Interface
@using salesbook.Shared.Core.Interface.System.Network @using salesbook.Shared.Core.Interface.System.Network
@@ -16,7 +17,8 @@
<div class="container content pb-safe-area"> <div class="container content pb-safe-area">
<div class="container-primary-info"> <div class="container-primary-info">
<div class="section-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"
Color="Color.Secondary">
@UtilityString.ExtractInitials(UserSession.User.Fullname) @UtilityString.ExtractInitials(UserSession.User.Fullname)
</MudAvatar> </MudAvatar>
@@ -24,7 +26,8 @@
<span class="info-nome">@UserSession.User.Fullname</span> <span class="info-nome">@UserSession.User.Fullname</span>
@if (UserSession.User.KeyGroup is not null) @if (UserSession.User.KeyGroup is not null)
{ {
<span class="info-section">@(((KeyGroupEnum)UserSession.User.KeyGroup).ConvertToHumanReadable())</span> <span
class="info-section">@(((KeyGroupEnum)UserSession.User.KeyGroup).ConvertToHumanReadable())</span>
} }
</div> </div>
</div> </div>
@@ -113,6 +116,8 @@
</MudButton> </MudButton>
</div> </div>
</div> </div>
<AppVersion/>
} }
@code { @code {

View File

@@ -1,12 +1,15 @@
@page "/sync" @page "/sync"
@page "/sync/{DateFilter}" @page "/sync/{DateFilter}"
@using salesbook.Shared.Components.Layout.Spinner @using salesbook.Shared.Components.Layout.Spinner
@using salesbook.Shared.Components.SingleElements
@using salesbook.Shared.Core.Interface @using salesbook.Shared.Core.Interface
@inject ISyncDbService syncDb @inject ISyncDbService syncDb
@inject IManageDataService manageData @inject IManageDataService manageData
<SyncSpinner Elements="@Elements"/> <SyncSpinner Elements="@Elements"/>
<AppVersion/>
@code { @code {
[Parameter] public string? DateFilter { get; set; } [Parameter] public string? DateFilter { get; set; }

View File

@@ -0,0 +1,6 @@
@using salesbook.Shared.Core.Interface.System
@inject IGenericSystemService GenericSystemService
<div class="app-version">
<span>@($"v{GenericSystemService.GetCurrentAppVersion()}")</span>
</div>

View File

@@ -0,0 +1,11 @@
.app-version{
width: 100%;
display: flex;
justify-content: center;
margin: 8px 0;
}
.app-version span{
font-size: smaller;
color: var(--mud-palette-gray-darker);
}

View File

@@ -460,7 +460,10 @@
Users = await ManageData.GetTable<StbUser>(); Users = await ManageData.GetTable<StbUser>();
if (!ActivityModel.UserName.IsNullOrEmpty()) if (!ActivityModel.UserName.IsNullOrEmpty())
{
SelectedUser = Users.FindLast(x => x.UserName.Equals(ActivityModel.UserName)); SelectedUser = Users.FindLast(x => x.UserName.Equals(ActivityModel.UserName));
await InvokeAsync(StateHasChanged);
}
if (!IsNew && Id != null) if (!IsNew && Id != null)
ActivityFileList = await IntegryApiService.GetActivityFile(Id); ActivityFileList = await IntegryApiService.GetActivityFile(Id);

View File

@@ -0,0 +1,6 @@
namespace salesbook.Shared.Core.Interface.System;
public interface IGenericSystemService
{
string GetCurrentAppVersion();
}