Aggiunta versione app a video

salesbook.Maui/Core/System/GenericSystemService.cs

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

salesbook.Maui/MauiProgram.cs

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

salesbook.Maui/Platforms/iOS/Info.plist

@@ -51,6 +51,9 @@
     <key>NSPhotoLibraryAddUsageDescription</key>
     <string>Permette all'app di salvare file o immagini nella tua libreria fotografica se necessario.</string>
 
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>Alcune librerie di sistema potrebbero accedere al Bluetooth. L’app non utilizza direttamente il Bluetooth.</string>
+
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>

salesbook.Maui/salesbook.Maui.csproj

@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>2.1.3</ApplicationDisplayVersion>
-		<ApplicationVersion>20</ApplicationVersion>
+		<ApplicationDisplayVersion>2.1.5</ApplicationDisplayVersion>
+		<ApplicationVersion>23</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -120,6 +120,7 @@
 		<PublishTrimmed>true</PublishTrimmed>
 		<PublishAot>true</PublishAot>
 		<MonoAotMode>Hybrid</MonoAotMode>
+		<MtouchLink>None</MtouchLink>
 	</PropertyGroup>
 
 	<ItemGroup>

salesbook.Shared/Components/Pages/Login.razor

@@ -1,8 +1,10 @@
 @page "/login"
 @using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Core.Interface.System
 @using salesbook.Shared.Core.Services
 @inject IUserAccountService UserAccountService
 @inject AppAuthenticationStateProvider AuthenticationStateProvider
+@inject IGenericSystemService GenericSystemService
 
 @if (Spinner)
 {
@@ -34,7 +36,7 @@ else
             </div>
 
             <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">
             </div>
         </div>

salesbook.Shared/Components/Pages/PersonalInfo.razor

@@ -1,6 +1,7 @@
 @page "/PersonalInfo"
 @attribute [Authorize]
 @using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Core.Authorization.Enum
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Core.Interface.System.Network
@@ -16,7 +17,8 @@
     <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">
+                <MudAvatar Style="height: 70px; width: 70px; font-size: 2rem; font-weight: bold"
+                           Color="Color.Secondary">
                     @UtilityString.ExtractInitials(UserSession.User.Fullname)
                 </MudAvatar>
 
@@ -24,7 +26,8 @@
                     <span class="info-nome">@UserSession.User.Fullname</span>
                     @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>
@@ -113,6 +116,8 @@
             </MudButton>
         </div>
     </div>
+
+    <AppVersion/>
 }
 
 @code {

salesbook.Shared/Components/Pages/SyncPage.razor

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

salesbook.Shared/Components/SingleElements/AppVersion.razor

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

salesbook.Shared/Components/SingleElements/AppVersion.razor.css

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

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

@@ -214,7 +214,8 @@
                         @if (item.p.Type == AttachedDTO.TypeAttached.Position)
                         {
                             <MudChip T="string" Icon="@Icons.Material.Rounded.LocationOn" Color="Color.Success"
-                                     OnClick="@(() => OpenPosition(item.p))" OnClose="@(() => OnRemoveAttached(item.index))">
+                                     OnClick="@(() => OpenPosition(item.p))"
+                                     OnClose="@(() => OnRemoveAttached(item.index))">
                                 @item.p.Description
                             </MudChip>
                         }
@@ -234,7 +235,8 @@
                     {
                         foreach (var file in ActivityFileList)
                         {
-                            <MudChip T="string" OnClick="@(() => OpenAttached(file.Id, file.FileName))" OnClose="@(() => DeleteAttach(file))" Color="Color.Default">
+                            <MudChip T="string" OnClick="@(() => OpenAttached(file.Id, file.FileName))"
+                                     OnClose="@(() => DeleteAttach(file))" Color="Color.Default">
                                 @file.FileName
                             </MudChip>
                         }
@@ -242,7 +244,7 @@
                 }
                 else
                 {
-                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
+                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
                 }
             </div>
 
@@ -453,12 +455,15 @@
         {
             IsLoading = true;
             await InvokeAsync(StateHasChanged);
-            
+
             SelectedComessa = ActivityModel.Commessa;
 
             Users = await ManageData.GetTable<StbUser>();
             if (!ActivityModel.UserName.IsNullOrEmpty())
+            {
                 SelectedUser = Users.FindLast(x => x.UserName.Equals(ActivityModel.UserName));
+                await InvokeAsync(StateHasChanged);
+            }
 
             if (!IsNew && Id != null)
                 ActivityFileList = await IntegryApiService.GetActivityFile(Id);
@@ -576,6 +581,9 @@
         {
             ActivityModel.CodAnag = parts[0];
             ActivityModel.Cliente = parts[1];
+
+            var isCliente = Clienti.FirstOrDefault(x => x.CodAnag != null && x.CodAnag.Equals(ActivityModel.CodAnag));
+            ActivityModel.TipoAnag = isCliente == null ? "P" : "C";
         }
 
         OnAfterChangeValue();
@@ -593,6 +601,7 @@
             if (com.CodAnag != null)
             {
                 ActivityModel.CodAnag = com.CodAnag;
+                ActivityModel.TipoAnag = com.TipoAnag;
                 ActivityModel.Cliente = Clienti
                     .Where(x => x.CodAnag != null && x.CodAnag.Equals(com.CodAnag))
                     .Select(x => x.RagSoc)
@@ -605,6 +614,7 @@
             {
                 ActivityModel.CodAnag = null;
                 ActivityModel.Cliente = null;
+                ActivityModel.TipoAnag = null;
             }
         }
         else
@@ -613,6 +623,7 @@
             ActivityModel.Commessa = null;
             ActivityModel.CodAnag = null;
             ActivityModel.Cliente = null;
+            ActivityModel.TipoAnag = null;
         }
 
         OnAfterChangeValue();
@@ -786,7 +797,7 @@
             Snackbar.Add("Impossibile aprire il file", Severity.Error);
         }
     }
-    
+
     private async Task DeleteAttach(ActivityFileDto file)
     {
         Snackbar.Clear();

salesbook.Shared/Core/Interface/System/IGenericSystemService.cs

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