Finish v1.0.1(4)

salesbook.Maui/MauiProgram.cs

@@ -27,9 +27,17 @@ namespace salesbook.Maui
             var builder = MauiApp.CreateBuilder();
             builder
                 .UseMauiApp<App>()
+                .UseIntegry(appToken: AppToken, useLoginAzienda: true)
                 .UseMauiCommunityToolkit()
-                .ConfigureFonts(fonts => { fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); })
-                .UseLoginAzienda(AppToken);
+                .UseSentry(options =>
+                {
+                    options.Dsn = "https://453b6b38f94fd67e40e0d5306d6caff8@o4508499810254848.ingest.de.sentry.io/4509605099667536";
+#if DEBUG
+                    options.Debug = true;
+#endif
+                    options.TracesSampleRate = 1.0;
+                })
+                .ConfigureFonts(fonts => { fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); });
 
             builder.Services.AddMauiBlazorWebView();
             builder.Services.AddMudServices();

salesbook.Maui/salesbook.Maui.csproj

@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
-		<ApplicationVersion>3</ApplicationVersion>
+		<ApplicationDisplayVersion>1.0.1</ApplicationDisplayVersion>
+		<ApplicationVersion>4</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -55,8 +55,7 @@
 
 	</PropertyGroup>
 
-	<PropertyGroup
-		Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' AND '$(Configuration)' == 'Debug'">
+	<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android' AND '$(Configuration)' == 'Debug'">
 
 		<!--these help speed up android builds-->
 		<!--
@@ -66,16 +65,14 @@
 		-->
 	</PropertyGroup>
 
-	<PropertyGroup
-		Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' AND '$(Configuration)' == 'Debug'">
+	<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' AND '$(Configuration)' == 'Debug'">
 		<!--forces the simulator to pickup entitlements-->
 		<EnableCodeSigning>true</EnableCodeSigning>
 		<CodesignRequireProvisioningProfile>true</CodesignRequireProvisioningProfile>
 		<DisableCodesignVerification>true</DisableCodesignVerification>
 	</PropertyGroup>
 
-	<PropertyGroup
-		Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
+	<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
 		<SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
 		<DefineConstants>$(DefineConstants);APPLE;PLATFORM</DefineConstants>
 	</PropertyGroup>
@@ -85,8 +82,7 @@
 		<CodesignProvision>VS: WildCard Development</CodesignProvision>
 	</PropertyGroup>
 
-	<ItemGroup
-		Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
 		<!--
 		<BundleResource Include="Platforms\iOS\PrivacyInfo.xcprivacy" LogicalName="PrivacyInfo.xcprivacy" />
 
@@ -98,7 +94,7 @@
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
 		<!-- Android App Icon -->
-		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" ForegroundScale="0.65"/>
+		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" ForegroundScale="0.65" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
@@ -122,14 +118,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui" Version="11.2.0" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="12.0.0" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageReference Include="IntegryApiClient.MAUI" Version="1.1.4" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.70" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.70" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.70" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
+		<PackageReference Include="IntegryApiClient.MAUI" Version="1.1.6" />
+		<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="sqlite-net-pcl" Version="1.9.172" />
 	</ItemGroup>
 

salesbook.Shared/Components/Pages/Calendar.razor

@@ -372,7 +372,9 @@
         filteredActivity = filteredActivity
             .Where(x => Filter.Category == null || x.Category.Equals(Filter.Category));
 
-        return filteredActivity.ToList();
+        return filteredActivity
+            .OrderBy(x => x.EffectiveTime ?? x.EstimatedTime)
+            .ToList();
     }
 
     [JSInvokable]

salesbook.Shared/Components/Routes.razor

@@ -1,4 +1,4 @@
-@using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Components.SingleElements.Modal.ExceptionModal
 @inject NavigationManager NavigationManager
 
 <ErrorBoundary @ref="ErrorBoundary">

salesbook.Shared/Components/SingleElements/BottomSheet/AddMemo.razor

@@ -0,0 +1,45 @@
+<div class="bottom-sheet-backdrop @(IsSheetVisible ? "show" : "")" @onclick="CloseBottomSheet"></div>
+
+<div class="bottom-sheet-container @(IsSheetVisible ? "show" : "")">
+    <div class="bottom-sheet pb-safe-area">
+        <div class="title">
+            <MudText Typo="Typo.h6">
+                <b>Aggiungi un promemoria</b>
+            </MudText>
+            <MudIconButton Icon="@Icons.Material.Filled.Close" OnClick="() => CloseBottomSheet()"/>
+        </div>
+        
+        <div class="input-card">
+            <div class="form-container">
+                <span>Data</span>
+
+                <MudTextField T="DateTime?" Format="yyyy-MM-dd" InputType="InputType.Date" @bind-Value="Date" />
+            </div>
+        </div>
+        
+        <div class="input-card">
+            <MudTextField T="string?" Placeholder="Memo" Variant="Variant.Text" Lines="4" @bind-Value="Memo" />
+        </div>
+
+        <div class="button-section">
+            <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="() => CloseBottomSheet(true)">Salva</MudButton>
+        </div>
+    </div>
+</div>
+
+@code {
+    [Parameter] public bool IsSheetVisible { get; set; }
+    [Parameter] public EventCallback<bool> IsSheetVisibleChanged { get; set; }
+
+    private DateTime? Date { get; set; } = DateTime.Today;
+    private string? Memo { get; set; }
+
+    private void CloseBottomSheet(bool save)
+    {
+        IsSheetVisible = false;
+        IsSheetVisibleChanged.InvokeAsync(IsSheetVisible);
+    }
+
+    private void CloseBottomSheet() => CloseBottomSheet(false);
+
+}

salesbook.Shared/Components/SingleElements/BottomSheet/AddMemo.razor.css

@@ -0,0 +1 @@
+

salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor

@@ -29,7 +29,7 @@
                                    FullWidth="true" T="string"
                                    Variant="Variant.Text"
                                    Virtualize="true"
-                                   @* @bind-SelectedValues="Filter.User" *@
+                                   @bind-SelectedValues="FilterActivity.User"
                                    Class="customIcon-select"
                                    AdornmentIcon="@Icons.Material.Filled.Code"/>
 
@@ -43,7 +43,7 @@
                 <MudSelectExtended FullWidth="true"
                                    T="string?"
                                    Variant="Variant.Text"
-                                   @* @bind-Value="Filter.Type" *@
+                                   @bind-Value="FilterActivity.Type"
                                    Class="customIcon-select"
                                    AdornmentIcon="@Icons.Material.Filled.Code">
                     @foreach (var type in ActivityType)
@@ -61,7 +61,7 @@
                 <MudSelectExtended FullWidth="true"
                                    T="string?"
                                    Variant="Variant.Text"
-                                   @* @bind-Value="Filter.Result" *@
+                                   @bind-Value="FilterActivity.Result"
                                    Class="customIcon-select"
                                    AdornmentIcon="@Icons.Material.Filled.Code">
                     @foreach (var result in ActivityResult)
@@ -79,7 +79,7 @@
                 <MudSelectExtended FullWidth="true"
                                    T="ActivityCategoryEnum?"
                                    Variant="Variant.Text"
-                                   @* @bind-Value="Filter.Category" *@
+                                   @bind-Value="FilterActivity.Category"
                                    Class="customIcon-select"
                                    AdornmentIcon="@Icons.Material.Filled.Code">
                     @foreach (var category in CategoryList)
@@ -104,6 +104,8 @@
     [Parameter] public FilterUserDTO Filter { get; set; }
     [Parameter] public EventCallback<FilterUserDTO> FilterChanged { get; set; }
 
+    private FilterActivityDTO FilterActivity { get; set; } = new();
+
     private List<StbActivityResult> ActivityResult { get; set; } = [];
     private List<StbActivityType> ActivityType { get; set; } = [];
     private List<StbUser> Users { get; set; } = [];

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

@@ -149,17 +149,31 @@
             </MessageContent>
             <YesButton>
                 <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Error"
-                           StartIcon="@Icons.Material.Filled.DeleteForever">
+                           StartIcon="@Icons.Material.Filled.Check">
                     Cancella
                 </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.Filled.DeleteForever">
+                    Crea
+                </MudButton>
+            </YesButton>
+        </MudMessageBox>
     </DialogContent>
 </MudDialog>
 
 <SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
 
-<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel" @bind-ActivityModel:after="OnAfterChangeValue"/>
+<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel" @bind-ActivityModel:after="OnAfterChangeEsito"/>
+
+<AddMemo @bind-IsSheetVisible="OpenAddMemo" />
 
 @code {
     [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
@@ -186,12 +200,17 @@
     private bool VisibleOverlay { get; set; }
     private bool SuccessAnimation { get; set; }
 
-    private bool OpenEsito { get; set; } = false;
+    private bool OpenEsito { get; set; }
+    private bool OpenAddMemo { get; set; }
 
+    //MessageBox
     private MudMessageBox ConfirmDelete { get; set; }
+    private MudMessageBox ConfirmMemo { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
+        Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
+
         _ = LoadData();
 
         LabelSave = IsNew ? "Aggiungi" : null;
@@ -243,7 +262,6 @@
     private bool CheckPreSave()
     {
         Snackbar.Clear();
-        Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
 
         if (!ActivityModel.ActivityTypeId.IsNullOrEmpty()) return true;
         Snackbar.Add("Tipo attività obbligatorio!", Severity.Error);
@@ -317,9 +335,23 @@
         }
     }
 
+    private async Task OnAfterChangeEsito()
+    {
+        OnAfterChangeValue();
+
+        // var result = await ConfirmMemo.ShowAsync();
+
+        // if (result is true)
+        //     OpenAddMemo = !OpenAddMemo;
+    }
+
     private void OpenSelectEsito()
     {
-        if (!IsNew && (ActivityModel.UserName is null || !ActivityModel.UserName.Equals(UserSession.User.Username))) 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);
+            return;
+        }
 
         OpenEsito = !OpenEsito;
         StateHasChanged();

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

@@ -1,6 +1,3 @@
-@using salesbook.Shared.Core.Services
-@inject AppAuthenticationStateProvider AuthenticationStateProvider
-
 <div class="container container-modal">
     <div class="c-modal">
         <div class="exception-header mb-2">

salesbook.Shared/salesbook.Shared.csproj

@@ -14,11 +14,11 @@
         <PackageReference Include="AutoMapper" Version="14.0.0" />
         <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.2.2" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-        <PackageReference Include="IntegryApiClient.Core" Version="1.1.4" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.5" />
+        <PackageReference Include="IntegryApiClient.Core" Version="1.1.6" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.6" />
         <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
-        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.11.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.5" />
+        <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="MudBlazor.ThemeManager" Version="3.0.0" />
     </ItemGroup>

salesbook.Web/Program.cs

@@ -22,7 +22,8 @@ builder.Services.AddScoped<IManageDataService, ManageDataService>();
 builder.Services.AddScoped<AppAuthenticationStateProvider>();
 builder.Services.AddScoped<AuthenticationStateProvider>(provider => provider.GetRequiredService<AppAuthenticationStateProvider>());
 
-builder.Services.UseLoginAzienda("f0484398-1f8b-42f5-ab79-5282c164e1d8");
+const string appToken = "f0484398-1f8b-42f5-ab79-5282c164e1d8";
+builder.Services.UseIntegry(appToken: appToken, useLoginAzienda: true);
 
 builder.RootComponents.Add<Routes>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");

salesbook.Web/salesbook.Web.csproj

@@ -16,10 +16,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IntegryApiClient.Blazor" Version="1.1.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" />
+    <PackageReference Include="IntegryApiClient.Blazor" Version="1.1.6" />
+    <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" />
   </ItemGroup>
 
   <ItemGroup>