[#57 ] MainWindow: Use Task.Run()

[#57 ] AreaComAdminWindow: Use Task.Run()
BaseDataWindow: Use Cursors.Wait instead of Cursors.AppStarting
2025-04-24 15:20:46 +02:00 · 2025-04-24 15:20:46 +02:00 · 2025-04-24 15:20:46 +02:00 · 2025-04-24 15:20:46 +02:00 · 2025-04-24 15:20:46 +02:00 · 2025-04-24 14:35:40 +02:00
8 changed files with 54 additions and 28 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,22 @@ Changelog
 =========


+[v0.13.8][v0.13.8] (2025-02-21) {#v0.13.8}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.8-bugfixes}
+
+* Details im Lieferungen-Fenster (`DeliveryAdminWindow`) für die WG Weinland richtiggestellt (Lesweagen, Verhalten bei _Gerebelt gewogen_). (138dae715e, aa98909c0a)
+
+### Sonstiges {#v0.13.8-misc}
+
+* Abhängigkeiten aktualisiert. (fe0a7dab2a, 775bb08e95)
+
+[v0.13.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.8
+
+
+
+
 [v0.13.7][v0.13.7] (2025-01-21) {#v0.13.7}
 ------------------------------------------

--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@ -7,7 +7,7 @@
    <UseWPF>true</UseWPF>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.13.7</Version>
+    <Version>0.13.8</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
@ -26,20 +26,20 @@

  <ItemGroup>
    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="LinqKit" Version="1.3.7" />
-    <PackageReference Include="MailKit" Version="4.9.0" />
+    <PackageReference Include="LinqKit" Version="1.3.8" />
+    <PackageReference Include="MailKit" Version="4.11.0" />
    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
-    <PackageReference Include="NJsonSchema" Version="11.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
+    <PackageReference Include="NJsonSchema" Version="11.2.0" />
    <PackageReference Include="PdfiumViewer" Version="2.13.0" />
    <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
    <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.53" />
-    <PackageReference Include="System.IO.Ports" Version="9.0.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.1" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.55" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.4" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.4" />
  </ItemGroup>

 </Project>
--- a/Elwig/Helpers/ClientParameters.cs
+++ b/Elwig/Helpers/ClientParameters.cs
@ -23,6 +23,10 @@ namespace Elwig.Helpers {
        public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
        public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);

+        public bool HasBoxWeighing(string? zwstId) => IsWinzerkeller && (zwstId != "W");
+        public bool HasBoxWeighing(Branch? b) => HasBoxWeighing(b?.ZwstId);
+        public bool HasBoxWeighing() => HasBoxWeighing(App.ZwstId);
+
        public string NameToken;
        public string NameShort;
        public string Name;
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@ -310,19 +310,23 @@ namespace Elwig.Windows {
                UnsetDefaultValue(GerebeltGewogenInput);
            }

-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if (App.Client.HasBoxWeighing(ViewModel.Branch)) {
                LesewagenInput.IsEnabled = false;
                SetDefaultValue(LesewagenInput, false);
-                HandPickedInput.IsThreeState = false;
-                UnsetDefaultValue(HandPickedInput);
            } else {
                LesewagenInput.IsEnabled = true;
                UnsetDefaultValue(LesewagenInput);
+            }
+
+            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+                HandPickedInput.IsThreeState = false;
+                UnsetDefaultValue(HandPickedInput);
+            } else {
                HandPickedInput.IsThreeState = true;
                SetDefaultValue(HandPickedInput, null);
            }

-            if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
+            if (App.Client.IsMatzen || App.Client.IsWinzerkeller || App.Client.IsBaden || App.Client.IsWeinland) {
                GebundenInput.IsEnabled = false;
                SetDefaultValue(GebundenInput, null);
            } else {
@ -1380,7 +1384,7 @@ namespace Elwig.Windows {
        }

        private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
            }
            if (!ViewModel.IsReceipt || App.Client.HasNetWeighing(ViewModel.Branch)) {
@ -1390,7 +1394,7 @@ namespace Elwig.Windows {
        }

        private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
            }
            CheckBox_Changed(sender, evt);
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/5.0.0">
+<Project Sdk="WixToolset.Sdk/6">
  <PropertyGroup>
    <HarvestFileSuppressUniqueIds>false</HarvestFileSuppressUniqueIds>
    <HarvestFileGenerateGuidsNow>true</HarvestFileGenerateGuidsNow>
@ -37,4 +37,4 @@
    <None Include="Files\config.ini" />
    <None Include="Files\WinziPrint.exe" />
  </ItemGroup>
-</Project>
+</Project>
--- a/Setup/Bundle.wxs
+++ b/Setup/Bundle.wxs
@ -1,4 +1,6 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
  <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7"
          IconSourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico">
    <BootstrapperApplication>
--- a/Setup/Setup.wixproj
+++ b/Setup/Setup.wixproj
@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/5.0.0">
+<Project Sdk="WixToolset.Sdk/6">
  <PropertyGroup>
    <OutputType>Bundle</OutputType>
    <OutputName>Elwig</OutputName>
@ -13,7 +13,7 @@
  </Target>
  <ItemGroup>
    <ProjectReference Include="..\Installer\Installer.wixproj" />
-    <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.2" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.2" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.0" />
  </ItemGroup>
-</Project>
+</Project>
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@ -19,16 +19,16 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
    <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
Author	SHA1	Message	Date
Lorenz Stechauner	7e8630a039	[#57 ] MainWindow: Use Task.Run() All checks were successful Test / Run tests (push) Successful in 1m52s Details	2025-04-24 15:20:46 +02:00
Lorenz Stechauner	4786886a78	[#57 ] AreaComAdminWindow: Use Task.Run()	2025-04-24 15:20:46 +02:00
Lorenz Stechauner	102ac89c51	BaseDataWindow: Use Cursors.Wait instead of Cursors.AppStarting	2025-04-24 15:20:46 +02:00
Lorenz Stechauner	a8ae188622	[#57 ] DeliveryAdminWindow: Use Task.Run()	2025-04-24 15:20:46 +02:00
Lorenz Stechauner	335dc52315	[#57 ] MemberAdminWinodw: Use Task.Run()	2025-04-24 15:20:46 +02:00
Lorenz Stechauner	d1c07ee92a	Installer/Setup: Update to WiX 6 All checks were successful Test / Run tests (push) Successful in 2m43s Details	2025-04-24 14:35:40 +02:00
Lorenz Stechauner	4af2fa256e	Tests: Update dependencies	2025-04-24 14:31:36 +02:00
Lorenz Stechauner	bf0db37872	Elwig: Update dependencies	2025-04-24 14:31:27 +02:00
Lorenz Stechauner	3161351a30	Bump version to 0.13.8 All checks were successful Test / Run tests (push) Successful in 2m19s Details Deploy / Build and Deploy (push) Successful in 2m1s Details	2025-02-21 12:05:34 +01:00
Lorenz Stechauner	aa98909c0a	DeliveryAdminWindow: Fix Handlese/Gerebelt Gewogen input behaviour All checks were successful Test / Run tests (push) Successful in 1m51s Details	2025-02-20 17:06:40 +01:00
Lorenz Stechauner	775bb08e95	Elwig: Update dependencies All checks were successful Test / Run tests (push) Successful in 2m29s Details	2025-02-20 16:08:52 +01:00
Lorenz Stechauner	fe0a7dab2a	Tests: Update dependencies	2025-02-20 16:08:42 +01:00
Lorenz Stechauner	138dae715e	DeliveryAdminWindow: Allow Gr.Inzersdorf to select LesewagenInput	2025-02-20 15:56:26 +01:00