diff --git a/salesbook.Maui/MauiProgram.cs b/salesbook.Maui/MauiProgram.cs index 5ea57b3..0c5db24 100644 --- a/salesbook.Maui/MauiProgram.cs +++ b/salesbook.Maui/MauiProgram.cs @@ -27,7 +27,7 @@ namespace salesbook.Maui var builder = MauiApp.CreateBuilder(); builder .UseMauiApp() - .UseIntegry(AppToken) + .UseIntegry(appToken: AppToken, useLoginAzienda: true) .UseMauiCommunityToolkit() .UseSentry(options => { diff --git a/salesbook.Maui/salesbook.Maui.csproj b/salesbook.Maui/salesbook.Maui.csproj index b47c286..37a152b 100644 --- a/salesbook.Maui/salesbook.Maui.csproj +++ b/salesbook.Maui/salesbook.Maui.csproj @@ -120,7 +120,7 @@ - + diff --git a/salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor b/salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor index e1433c2..c69fd8e 100644 --- a/salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor +++ b/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 @@ @foreach (var type in ActivityType) @@ -61,7 +61,7 @@ @foreach (var result in ActivityResult) @@ -79,7 +79,7 @@ @foreach (var category in CategoryList) @@ -104,6 +104,8 @@ [Parameter] public FilterUserDTO Filter { get; set; } [Parameter] public EventCallback FilterChanged { get; set; } + private FilterActivityDTO FilterActivity { get; set; } = new(); + private List ActivityResult { get; set; } = []; private List ActivityType { get; set; } = []; private List Users { get; set; } = []; diff --git a/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor b/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor index fd3934e..91c53a0 100644 --- a/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor +++ b/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor @@ -149,7 +149,7 @@ + StartIcon="@Icons.Material.Filled.Check"> Cancella @@ -339,10 +339,10 @@ { OnAfterChangeValue(); - var result = await ConfirmMemo.ShowAsync(); + // var result = await ConfirmMemo.ShowAsync(); - if (result is true) - OpenAddMemo = !OpenAddMemo; + // if (result is true) + // OpenAddMemo = !OpenAddMemo; } private void OpenSelectEsito() diff --git a/salesbook.Shared/salesbook.Shared.csproj b/salesbook.Shared/salesbook.Shared.csproj index 5385614..7cf8a8b 100644 --- a/salesbook.Shared/salesbook.Shared.csproj +++ b/salesbook.Shared/salesbook.Shared.csproj @@ -14,7 +14,7 @@ - + diff --git a/salesbook.Web/Program.cs b/salesbook.Web/Program.cs index 8e2e4fa..cbb65dc 100644 --- a/salesbook.Web/Program.cs +++ b/salesbook.Web/Program.cs @@ -22,7 +22,8 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(provider => provider.GetRequiredService()); -builder.Services.UseIntegry("f0484398-1f8b-42f5-ab79-5282c164e1d8"); +const string appToken = "f0484398-1f8b-42f5-ab79-5282c164e1d8"; +builder.Services.UseIntegry(appToken: appToken, useLoginAzienda: true); builder.RootComponents.Add("#app"); builder.RootComponents.Add("head::after"); diff --git a/salesbook.Web/salesbook.Web.csproj b/salesbook.Web/salesbook.Web.csproj index 90ffa15..45301e1 100644 --- a/salesbook.Web/salesbook.Web.csproj +++ b/salesbook.Web/salesbook.Web.csproj @@ -16,7 +16,7 @@ - +