Compare commits
6
Commits
v1.2.3(9)
...
b2db0f2479
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b2db0f2479 | ||
|
|
df827216c3 | ||
|
|
817cd606b6 | ||
|
|
495f335b72 | ||
|
|
ed7c28feac | ||
|
|
f59c8d3aaf |
No files matched your search
@@ -30,8 +30,8 @@
|
|||||||
<ApplicationId>it.integry.SteUp</ApplicationId>
|
<ApplicationId>it.integry.SteUp</ApplicationId>
|
||||||
|
|
||||||
<!-- Versions -->
|
<!-- Versions -->
|
||||||
<ApplicationDisplayVersion>1.2.3</ApplicationDisplayVersion>
|
<ApplicationDisplayVersion>1.2.4</ApplicationDisplayVersion>
|
||||||
<ApplicationVersion>9</ApplicationVersion>
|
<ApplicationVersion>10</ApplicationVersion>
|
||||||
|
|
||||||
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
|
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
|
||||||
<!-- <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">-->
|
<!-- <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">-->
|
||||||
@@ -116,12 +116,12 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CommunityToolkit.Maui" Version="14.1.0" />
|
<PackageReference Include="CommunityToolkit.Maui" Version="14.1.0" />
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
||||||
<PackageReference Include="IntegryApiClient.MAUI" Version="2.0.1" />
|
<PackageReference Include="IntegryApiClient.MAUI" Version="2.6.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.7" />
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.8" />
|
||||||
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.51" />
|
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.51" />
|
||||||
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.51" />
|
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.51" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.51" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.51" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.7" />
|
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.8" />
|
||||||
<PackageReference Include="Sentry.Maui" Version="6.4.1" />
|
<PackageReference Include="Sentry.Maui" Version="6.4.1" />
|
||||||
<PackageReference Include="SkiaSharp" Version="3.119.2" />
|
<PackageReference Include="SkiaSharp" Version="3.119.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -896,29 +896,32 @@
|
|||||||
|
|
||||||
var modal = await WithChildDialog(() => Dialog.OpenSelectArt(articoli));
|
var modal = await WithChildDialog(() => Dialog.OpenSelectArt(articoli));
|
||||||
|
|
||||||
|
// Gli articoli si aggiungono sul thread della UI, come fanno le scansioni:
|
||||||
|
// toccare Scheda.Articoli da qui mentre arriva una lettura (o mentre la
|
||||||
|
// lista viene disegnata) puo' far perdere articoli.
|
||||||
await InvokeAsync(() =>
|
await InvokeAsync(() =>
|
||||||
{
|
{
|
||||||
OnLoading = false;
|
OnLoading = false;
|
||||||
TextLoading = null;
|
TextLoading = null;
|
||||||
|
|
||||||
StateHasChanged();
|
|
||||||
});
|
|
||||||
|
|
||||||
if (modal is { Canceled: false, Data: List<ArticoliInGrigliaDto> articoliSelezionati })
|
if (modal is { Canceled: false, Data: List<ArticoliInGrigliaDto> articoliSelezionati })
|
||||||
{
|
{
|
||||||
Scheda.Articoli.InsertRange(0, articoliSelezionati.ConvertAll(x => new SchedaArticolo
|
// Quelli gia' sparati non si aggiungono di nuovo.
|
||||||
|
Scheda.Articoli.InsertRange(0, articoliSelezionati
|
||||||
|
.DistinctBy(x => x.Barcode)
|
||||||
|
.Where(x => !ContainsBarcode(x.Barcode))
|
||||||
|
.Select(x => new SchedaArticolo
|
||||||
{
|
{
|
||||||
Barcode = x.Barcode,
|
Barcode = x.Barcode,
|
||||||
Descrizione = x.Descrizione
|
Descrizione = x.Descrizione
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
await InvokeAsync(() =>
|
|
||||||
{
|
|
||||||
RecalcDirty();
|
RecalcDirty();
|
||||||
|
}
|
||||||
|
|
||||||
StateHasChanged();
|
StateHasChanged();
|
||||||
});
|
});
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -984,7 +987,7 @@
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (value is null) return;
|
if (value is null) return;
|
||||||
if (Scheda.Articoli.Any(x => x.Barcode.Equals(value))) return;
|
if (ContainsBarcode(value)) return;
|
||||||
|
|
||||||
await InvokeAsync(() =>
|
await InvokeAsync(() =>
|
||||||
{
|
{
|
||||||
@@ -999,6 +1002,11 @@
|
|||||||
OnLoading = false;
|
OnLoading = false;
|
||||||
StateHasChanged();
|
StateHasChanged();
|
||||||
|
|
||||||
|
// Il controllo va ripetuto sul barcode restituito: il server puo' rispondere
|
||||||
|
// con un barcode diverso da quello letto (lo stesso gia' scelto dalla griglia),
|
||||||
|
// e due letture ravvicinate superano entrambe il controllo iniziale.
|
||||||
|
if (art != null && ContainsBarcode(art.Barcode)) return;
|
||||||
|
|
||||||
if (art != null)
|
if (art != null)
|
||||||
{
|
{
|
||||||
Scheda.Articoli.Insert(0, new SchedaArticolo
|
Scheda.Articoli.Insert(0, new SchedaArticolo
|
||||||
@@ -1032,6 +1040,8 @@
|
|||||||
|
|
||||||
private void OnErrorScan(string? value) => OnError(new Exception(value), value);
|
private void OnErrorScan(string? value) => OnError(new Exception(value), value);
|
||||||
|
|
||||||
|
private bool ContainsBarcode(string barcode) => Scheda.Articoli.Any(x => x.Barcode.Equals(barcode));
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private void OnError(Exception? e, string? errorMessage)
|
private void OnError(Exception? e, string? errorMessage)
|
||||||
|
|||||||
@@ -11,13 +11,13 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="IntegryApiClient.Core" Version="2.0.1" />
|
<PackageReference Include="IntegryApiClient.Core" Version="2.6.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.7" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.7" />
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
|
||||||
<PackageReference Include="MudBlazor" Version="9.0.0" />
|
<PackageReference Include="MudBlazor" Version="9.0.0" />
|
||||||
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="9.0.1" />
|
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="9.0.1" />
|
||||||
<PackageReference Include="Sentry" Version="6.4.1" />
|
<PackageReference Include="Sentry" Version="6.4.1" />
|
||||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.17.0" />
|
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.7" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.Maui.Essentials" Version="10.0.51" />
|
<PackageReference Include="Microsoft.Maui.Essentials" Version="10.0.51" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="IntegryApiClient.Blazor" Version="2.0.1" />
|
<PackageReference Include="IntegryApiClient.Blazor" Version="2.6.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.7" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.7" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.7" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.7" />
|
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.7" />
|
||||||
|
|||||||
Reference in new issue
Block a user