MarcoE/TaskHybrid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: MarcoE:e614c83a5b67ad120c9603f874837cb0a5003eb4
Branches Tags
MarcoE:master MarcoE:develop MarcoE:feature/NativeNavigation
MarcoE:v2.2.0(24) MarcoE:v2.1.5(23) MarcoE:v2.1.4(22) MarcoE:v2.1.4(21) MarcoE:v2.1.3(20) MarcoE:v2.1.1(18) MarcoE:v2.1.0(17) MarcoE:v2.1.0(16) MarcoE:v2.1.0(15) MarcoE:v2.1.0(14) MarcoE:v2.0.3(10) MarcoE:v2.0.2(9) MarcoE:v2.0.2(8) MarcoE:V2.0.1(7) MarcoE:v2.0.0(6) MarcoE:v1.1.0 MarcoE:v1.0.1(4)
...
compare: MarcoE:v1.0.1(4)
Branches Tags
MarcoE:develop MarcoE:master MarcoE:feature/NativeNavigation
MarcoE:v2.2.0(24) MarcoE:v2.1.5(23) MarcoE:v2.1.4(22) MarcoE:v2.1.4(21) MarcoE:v2.1.3(20) MarcoE:v2.1.1(18) MarcoE:v2.1.0(17) MarcoE:v2.1.0(16) MarcoE:v2.1.0(15) MarcoE:v2.1.0(14) MarcoE:v2.0.3(10) MarcoE:v2.0.2(9) MarcoE:v2.0.2(8) MarcoE:V2.0.1(7) MarcoE:v2.0.0(6) MarcoE:v1.1.0 MarcoE:v1.0.1(4)

4 Commits
e614c83a5b ... v1.0.1(4)

Author SHA1 Message Date
MarcoE
691c132fb6 Finish v1.0.1(4) 2025-07-04 15:47:49 +02:00
MarcoE
5d292a12ef -> v1.0.1 (4) 2025-07-04 15:47:38 +02:00
MarcoE
60f7d14a72 Vario 2025-07-04 15:43:02 +02:00
MarcoE
5fe41f9445 Aggiornamento librerie 2025-07-03 16:59:44 +02:00
7 changed files with 30 additions and 27 deletions
Expand all files Collapse all files

2
salesbook.Maui/MauiProgram.cs
View File

@@ -27,7 +27,7 @@ namespace salesbook.Maui
var builder = MauiApp.CreateBuilder(); var builder = MauiApp.CreateBuilder();
builder builder
.UseMauiApp<App>() .UseMauiApp<App>()
.UseLoginAzienda(AppToken) .UseIntegry(appToken: AppToken, useLoginAzienda: true)
.UseMauiCommunityToolkit() .UseMauiCommunityToolkit()
.UseSentry(options => .UseSentry(options =>
{ {

18
salesbook.Maui/salesbook.Maui.csproj
View File

@@ -29,8 +29,8 @@
<ApplicationId>it.integry.salesbook</ApplicationId> <ApplicationId>it.integry.salesbook</ApplicationId>
<!-- Versions --> <!-- Versions -->
<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion> <ApplicationDisplayVersion>1.0.1</ApplicationDisplayVersion>
<ApplicationVersion>3</ApplicationVersion> <ApplicationVersion>4</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion> <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'"> <!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -118,14 +118,14 @@
</ItemGroup> </ItemGroup>
<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="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="IntegryApiClient.MAUI" Version="1.1.4" /> <PackageReference Include="IntegryApiClient.MAUI" Version="1.1.6" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.70" /> <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.81" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.70" /> <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.81" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.70" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.81" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
<PackageReference Include="Sentry.Maui" Version="5.11.2" /> <PackageReference Include="Sentry.Maui" Version="5.11.2" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" /> <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
</ItemGroup> </ItemGroup>

10
salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor
View File

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

8
salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor
View File

@@ -149,7 +149,7 @@
</MessageContent> </MessageContent>
<YesButton> <YesButton>
<MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Error" <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Error"
StartIcon="@Icons.Material.Filled.DeleteForever"> StartIcon="@Icons.Material.Filled.Check">
Cancella Cancella
</MudButton> </MudButton>
</YesButton> </YesButton>
@@ -339,10 +339,10 @@
{ {
OnAfterChangeValue(); OnAfterChangeValue();
var result = await ConfirmMemo.ShowAsync(); // var result = await ConfirmMemo.ShowAsync();
if (result is true) // if (result is true)
OpenAddMemo = !OpenAddMemo; // OpenAddMemo = !OpenAddMemo;
} }
private void OpenSelectEsito() private void OpenSelectEsito()

8
salesbook.Shared/salesbook.Shared.csproj
View File

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

3
salesbook.Web/Program.cs
View File

@@ -22,7 +22,8 @@ builder.Services.AddScoped<IManageDataService, ManageDataService>();
builder.Services.AddScoped<AppAuthenticationStateProvider>(); builder.Services.AddScoped<AppAuthenticationStateProvider>();
builder.Services.AddScoped<AuthenticationStateProvider>(provider => provider.GetRequiredService<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<Routes>("#app");
builder.RootComponents.Add<HeadOutlet>("head::after"); builder.RootComponents.Add<HeadOutlet>("head::after");

8
salesbook.Web/salesbook.Web.csproj
View File

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