Elwig: Bump version to 0.6.5

.gitea/workflows/deploy.yaml

@@ -0,0 +1,55 @@
+name: Deploy
+on:
+  push:
+    tags: ["v[0-9]+.[0-9]+.[0-9]+"]
+jobs:
+  deploy:
+    name: Build and Deploy
+    runs-on: windows-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Set APP_VERSION variable from tag
+        shell: powershell
+        run: |
+          $APP_VERSION = $env:GITHUB_REF -replace '^refs/tags/v', ''
+          Add-Content -Path $env:GITHUB_ENV -Value "APP_VERSION=$APP_VERSION"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Check version in project
+        shell: powershell
+        run: |
+          Select-String Elwig/Elwig.csproj -Pattern "<Version>"
+          $res = Select-String Elwig/Elwig.csproj -Pattern "<Version>${{ env.APP_VERSION }}</Version>"
+          if ($res -eq $null) {
+            exit 1
+          }
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.1
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v1
+      - name: Restore NuGet packages
+        shell: powershell
+        run: $(& nuget restore Elwig.sln; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Setup
+        shell: powershell
+        run: $(& msbuild -verbosity:quiet Setup/Setup.wixproj -property:Configuration=Release -property:Platform=x64; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Rename artifact
+        shell: powershell
+        run: Move-Item Setup/bin/x64/Release/Elwig.exe Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe
+      - name: Create release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          name: Elwig ${{ env.APP_VERSION }}
+          files: |-
+            Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe
+      - name: Upload to website
+        shell: powershell
+        run: |
+          $content = [System.IO.File]::ReadAllBytes("Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe")
+          Invoke-WebRequest `
+            -Uri "https://www.necronda.net/elwig/files/Elwig-${{ env.APP_VERSION }}.exe" `
+            -Method PUT `
+            -Body $content `
+            -Headers @{ Authorization = "${{ secrets.API_AUTHORIZATION }}" } `
+            -ContentType "application/octet-stream"

.gitea/workflows/test.yaml

@@ -0,0 +1,29 @@
+name: Test
+on:
+  push:
+    branches: ["**"]
+jobs:
+  test:
+    name: Run tests
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.1
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v1
+      - name: Restore NuGet packages
+        shell: powershell
+        run: $(& nuget restore Elwig.sln; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Elwig
+        shell: powershell
+        run: $(& msbuild -verbosity:quiet Elwig/Elwig.csproj -property:Configuration=Debug; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Tests
+        shell: powershell
+        run: $(& dotnet build Tests; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Run Tests
+        shell: powershell
+        run: |
+          $env:PATH += ";$(pwd)\Installer\Files"
+          $(& dotnet test Tests; $a=$lastexitcode) | findstr x*; exit $a

.gitignore

@@ -4,3 +4,5 @@ bin/
 .vs
 .idea
 Tests/Resources/Sql/Create.sql
+*.exe
+!WinziPrint.exe

Elwig/App.xaml.cs

@@ -141,26 +141,10 @@ namespace Elwig {
                     MessageBox.Show("Invalid branch name in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
                 } else {
-                    var entry = branches[Config.Branch.ToLower()];
-                    ZwstId = entry.Item1;
-                    BranchName = entry.Item2;
-                    BranchPlz = entry.Item3;
-                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
-                    BranchAddress = entry.Item5;
-                    BranchPhoneNr = entry.Item6;
-                    BranchFaxNr = entry.Item7;
-                    BranchMobileNr = entry.Item8;
+                    SetBranch(branches[Config.Branch.ToLower()]);
                 }
             } else if (branches.Count == 1) {
-                var entry = branches.First().Value;
-                ZwstId = entry.Item1;
-                BranchName = entry.Item2;
-                BranchPlz = entry.Item3;
-                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
-                BranchAddress = entry.Item5;
-                BranchPhoneNr = entry.Item6;
-                BranchFaxNr = entry.Item7;
-                BranchMobileNr = entry.Item8;
+                SetBranch(branches.First().Value);
             } else {
                 MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
@@ -169,6 +153,21 @@ namespace Elwig {
             base.OnStartup(evt);
         }
 
+        public static void SetBranch(Branch b) {
+            SetBranch((b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
+        }
+
+        private static void SetBranch((string, string, int?, string?, string?, string?, string?, string?) entry) {
+            ZwstId = entry.Item1;
+            BranchName = entry.Item2;
+            BranchPlz = entry.Item3;
+            BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
+            BranchAddress = entry.Item5;
+            BranchPhoneNr = entry.Item6;
+            BranchFaxNr = entry.Item7;
+            BranchMobileNr = entry.Item8;
+        }
+
         private void PrintingReadyChanged() {
             Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
         }

Elwig/Documents/DeliveryNote.cs

@@ -15,7 +15,7 @@ namespace Elwig.Documents {
         // 3 - full
         public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
-        public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
+        public DeliveryNote(Delivery d, AppDbContext? ctx = null) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
             Delivery = d;
@@ -27,7 +27,7 @@ namespace Elwig.Documents {
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
-            MemberBuckets = ctx.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
+            MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
         }
     }
 }

Elwig/Documents/MemberDataSheet.cshtml

@@ -63,8 +63,8 @@
                 <td colspan="5">
                     @if (Model.Member.BillingAddress != null) {
                         @Model.Member.BillingAddress.PostalDest.AtPlz?.Plz
-                        @Model.Member.BillingAddress.PostalDest.AtPlz?.Dest
-                        @("(")@Model.Member.BillingAddress.PostalDest.AtPlz?.Ort.Name@(")")
+                        @(" ")@Model.Member.BillingAddress.PostalDest.AtPlz?.Dest
+                        @(" (")@Model.Member.BillingAddress.PostalDest.AtPlz?.Ort.Name@(")")
                     }
                 </td>
             </tr>

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.6.4</Version>
+    <Version>0.6.5</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 15;
+        public static readonly int RequiredSchemaVersion = 16;
 
         private static int VersionOffset = 0;
 

Elwig/Helpers/Export/Ebics.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Security;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Export {
@@ -52,7 +53,7 @@ namespace Elwig.Helpers.Export {
                    <CreDtTm>{DateTime.UtcNow:o}</CreDtTm>
                    <NbOfTxs>{nbOfTxs}</NbOfTxs>
                    <CtrlSum>{Transaction.FormatAmount(ctrlSum)}</CtrlSum>
-                   <InitgPty><Nm>{App.Client.NameFull}</Nm></InitgPty>
+                   <InitgPty><Nm>{SecurityElement.Escape(App.Client.NameFull)}</Nm></InitgPty>
                   </GrpHdr>
                   <PmtInf>
                    <PmtInfId>{pmtInfId}</PmtInfId>
@@ -60,7 +61,7 @@ namespace Elwig.Helpers.Export {
                    <NbOfTxs>{nbOfTxs}</NbOfTxs>
                    <CtrlSum>{Transaction.FormatAmount(ctrlSum)}</CtrlSum>
                    <ReqdExctnDt>{(Version >= 8 ? "<Dt>" : "")}{Date:yyyy-MM-dd}{(Version >= 8 ? "</Dt>" : "")}</ReqdExctnDt>
-                   <Dbtr><Nm>{App.Client.NameFull}</Nm></Dbtr>
+                   <Dbtr><Nm>{SecurityElement.Escape(App.Client.NameFull)}</Nm></Dbtr>
                    <DbtrAcct><Id><IBAN>{App.Client.Iban!.Replace(" ", "")}</IBAN></Id></DbtrAcct>
                    <DbtrAgt><FinInstnId>{(Version >= 4 ? "<BICFI>" : "<BIC>")}{App.Client.Bic ?? "NOTPROVIDED"}{(Version >= 4 ? "</BICFI>" : "</BIC>")}</FinInstnId></DbtrAgt>
                 """);
@@ -76,15 +77,15 @@ namespace Elwig.Helpers.Export {
                         <PmtId><EndToEndId>{id}</EndToEndId></PmtId>
                         <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmount(tx.Amount)}</InstdAmt></Amt>
                         <Cdtr>
-                         <Nm>{a.Name[..Math.Min(140, a.Name.Length)]}</Nm>
+                         <Nm>{SecurityElement.Escape(a.Name[..Math.Min(140, a.Name.Length)])}</Nm>
                          <PstlAdr>
-                          <StrtNm>{a1?[..Math.Min(70, a1.Length)]}</StrtNm><BldgNb>{a2?[..Math.Min(16, a2.Length)]}</BldgNb>
-                          <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{a.PostalDest.AtPlz?.Ort.Name}</TwnNm>
+                          <StrtNm>{a1?[..Math.Min(70, a1.Length)]}</StrtNm><BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>
+                          <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{SecurityElement.Escape(a.PostalDest.AtPlz?.Ort.Name)}</TwnNm>
                           <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>
                          </PstlAdr>
                         </Cdtr>
                         <CdtrAcct><Id><IBAN>{tx.Member.Iban!}</IBAN></Id></CdtrAcct>
-                        <RmtInf><Ustrd>{info}</Ustrd></RmtInf>
+                        <RmtInf><Ustrd>{SecurityElement.Escape(info)}</Ustrd></RmtInf>
                        </CdtTrfTxInf>
                     """);
                 progress?.Report(100.0 * ++i / count);

Elwig/Helpers/Printing/Html.cs

@@ -8,7 +8,7 @@ namespace Elwig.Helpers.Printing {
         private static RazorLightEngine? Engine = null;
         public static bool IsReady => Engine != null;
 
-        public static async Task Init(Action evtHandler) {
+        public static async Task Init(Action? evtHandler = null) {
             var e = new RazorLightEngineBuilder()
                 .UseFileSystemProject(App.DataPath + "resources")
                 .UseMemoryCachingProvider()
@@ -24,7 +24,7 @@ namespace Elwig.Helpers.Printing {
             await e.CompileTemplateAsync("DeliveryConfirmation");
 
             Engine = e;
-            evtHandler();
+            evtHandler?.Invoke();
         }
 
         public static async Task<string> CompileRenderAsync(string key, object model) {

Elwig/Helpers/Printing/Pdf.cs

@@ -11,13 +11,20 @@ using System.Linq;
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
 
-        private static readonly string PdfToPrinter = App.ExePath + "PDFtoPrinter.exe";
-        private static readonly string WinziPrint = App.ExePath + "WinziPrint.exe";
+        private static readonly string PdfToPrinter = new string[] { App.ExePath }
+            .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
+            .Select(x => Path.Combine(x, "PDFtoPrinter.exe"))
+            .Where(x => File.Exists(x))
+            .FirstOrDefault() ?? throw new FileNotFoundException("PDFtoPrinter executable not found");
+        private static readonly string WinziPrint = new string[] { App.ExePath }
+            .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
+            .Select(x => Path.Combine(x, "WinziPrint.exe"))
+            .Where(x => File.Exists(x))
+            .FirstOrDefault() ?? throw new FileNotFoundException("WiniPrint executable not found");
         private static Process? WinziPrintProc;
         public static bool IsReady => WinziPrintProc != null;
 
-
-        public static async Task Init(Action evtHandler) {
+        public static async Task Init(Action? evtHandler = null) {
             var p = new Process() { StartInfo = new() {
                 FileName = WinziPrint,
                 CreateNoWindow = true,
@@ -33,7 +40,7 @@ namespace Elwig.Helpers.Printing {
             p.StartInfo.ArgumentList.Add("-");
             p.Start();
             WinziPrintProc = p;
-            evtHandler();
+            evtHandler?.Invoke();
         }
 
         public static async Task<IEnumerable<int>> Convert(string htmlPath, string pdfPath, bool doubleSided = false, IProgress<double>? progress = null) {

Elwig/Helpers/Weighing/ICommandScale.cs

@@ -0,0 +1,35 @@
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Weighing {
+    /// <summary>
+    /// Interface for controlling a a scale which responds to commands sent to it
+    /// </summary>
+    public interface ICommandScale : IScale {
+        /// <summary>
+        /// Get the current weight on the scale without performing a weighing process
+        /// </summary>
+        /// <returns>Result of the weighing process (probably without a weighing id)</returns>
+        Task<WeighingResult> GetCurrentWeight();
+
+        /// <summary>
+        /// Perform a weighing process
+        /// </summary>
+        /// <returns>Result of the weighing process (including a weighing id)</returns>
+        Task<WeighingResult> Weigh();
+
+        /// <summary>
+        /// Empty the scale container or grant clearance to do so
+        /// </summary>
+        Task Empty();
+
+        /// <summary>
+        /// Grant clearance to fill the scale container
+        /// </summary>
+        Task GrantFillingClearance();
+
+        /// <summary>
+        /// Revoke clearance to fill the scale container
+        /// </summary>
+        Task RevokeFillingClearance();
+    }
+}

Elwig/Helpers/Weighing/IEventScale.cs

@@ -0,0 +1,8 @@
+namespace Elwig.Helpers.Weighing {
+    /// <summary>
+    /// Interface for controlling a a scale which automatically sends weighing updates
+    /// </summary>
+    public interface IEventScale : IScale {
+
+    }
+}

Elwig/Helpers/Weighing/IScale.cs

@@ -1,9 +1,8 @@
 using System;
-using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Interface for controlling a industrial scale
+    /// Interface for controlling a industrial scale (industrial terminal, "IT")
     /// </summary>
     public interface IScale : IDisposable {
         /// <summary>
@@ -45,32 +44,5 @@ namespace Elwig.Helpers.Weighing {
         /// Where to log the requests and responses from the scale to
         /// </summary>
         string? LogPath { get; }
-
-        /// <summary>
-        /// Get the current weight on the scale without performing a weighing process
-        /// </summary>
-        /// <returns>Result of the weighing process (probably without a weighing id)</returns>
-        Task<WeighingResult> GetCurrentWeight();
-
-        /// <summary>
-        /// Perform a weighing process
-        /// </summary>
-        /// <returns>Result of the weighing process (including a weighing id)</returns>
-        Task<WeighingResult> Weigh();
-
-        /// <summary>
-        /// Empty the scale container or grant clearance to do so
-        /// </summary>
-        Task Empty();
-
-        /// <summary>
-        /// Grant clearance to fill the scale container
-        /// </summary>
-        Task GrantFillingClearance();
-
-        /// <summary>
-        /// Revoke clearance to fill the scale container
-        /// </summary>
-        Task RevokeFillingClearance();
     }
 }

Elwig/Helpers/Weighing/InvalidScale.cs

@@ -1,44 +1,19 @@
 using System;
-using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
-    public class InvalidScale : IScale {
+    public class InvalidScale(string id) : IScale {
 
         public string Manufacturer => "NONE";
         public string Model => "NONE";
-        public string ScaleId { get; private set; }
+        public string ScaleId => id;
         public int InternalScaleNr => 0;
         public bool IsReady => false;
         public bool HasFillingClearance => false;
         public int? WeightLimit => null;
         public string? LogPath => null;
 
-        public InvalidScale(string id) {
-            ScaleId = id;
-        }
-
         public void Dispose() {
             GC.SuppressFinalize(this);
         }
-
-        public Task<WeighingResult> Weigh() {
-            throw new NotImplementedException();
-        }
-
-        public Task<WeighingResult> GetCurrentWeight() {
-            throw new NotImplementedException();
-        }
-
-        public Task Empty() {
-            throw new NotImplementedException();
-        }
-
-        public Task GrantFillingClearance() {
-            throw new NotImplementedException();
-        }
-
-        public Task RevokeFillingClearance() {
-            throw new NotImplementedException();
-        }
     }
 }

Elwig/Helpers/Weighing/SchemberScale.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
-    // TODO implement SchemberScale
-    public class SchemberScale : IScale {
+    public class SchemberScale : IEventScale {
 
         public string Manufacturer => "Schember";
         public string Model => throw new NotImplementedException();
@@ -18,24 +16,7 @@ namespace Elwig.Helpers.Weighing {
             throw new NotImplementedException();
         }
 
-        public Task Empty() {
-            throw new NotImplementedException();
-        }
 
-        public Task<WeighingResult> GetCurrentWeight() {
-            throw new NotImplementedException();
-        }
 
-        public Task GrantFillingClearance() {
-            throw new NotImplementedException();
-        }
-
-        public Task RevokeFillingClearance() {
-            throw new NotImplementedException();
-        }
-
-        public Task<WeighingResult> Weigh() {
-            throw new NotImplementedException();
-        }
     }
 }

Elwig/Helpers/Weighing/SystecScale.cs

@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
-    public class SystecScale : IScale {
+    public class SystecScale : ICommandScale {
 
         protected enum Output { RTS, DTR, OUT1, OUT2 };
 

Elwig/Resources/Sql/15-16.sql

@@ -0,0 +1,9 @@
+-- schema version 15 to 16
+
+INSERT INTO AT_plz_dest (plz, okz, dest)
+VALUES (2560,  3388, 'Grillenberg');
+
+DELETE FROM AT_plz_dest WHERE (plz, okz) = (2561, 3388);
+
+UPDATE AT_ort SET kgnr = 23351 WHERE okz = 5280;
+UPDATE AT_ort SET kgnr = 4311 WHERE okz = 3388;

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -1,6 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Helpers.Export;
+using Elwig.Helpers.Weighing;
 using Elwig.Models.Entities;
 using LinqKit;
 using Microsoft.EntityFrameworkCore;
@@ -968,7 +969,8 @@ namespace Elwig.Windows {
             CancelCreatingButton.IsEnabled = false;
             try {
                 var s = App.Scales[index];
-                var res = await s.Weigh();
+                if (s is not ICommandScale cs) return;
+                var res = await cs.Weigh();
                 if ((res.Weight ?? 0) > 0 && res.FullWeighingId != null) {
                     WeightInput.Text = $"{res.Weight:N0}";
                     ScaleId = s.ScaleId;
@@ -1080,8 +1082,8 @@ namespace Elwig.Windows {
 
         private void EmptyScale() {
             var scale = App.Scales.Where(s => s.ScaleId == ScaleId).FirstOrDefault();
-            if (scale == null) return;
-            scale.Empty();
+            if (scale is not ICommandScale cs) return;
+            cs.Empty();
         }
 
         private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -160,7 +160,7 @@ namespace Elwig.Windows {
                         filter.RemoveAt(i--);
                     } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
                         filter[i] = e[1..^1];
-                    } else if (e.Length <= 2) {
+                    } else if (e.Length < 2) {
                         filter.RemoveAt(i--);
                     }
                 }

Elwig/Windows/TestWindow.xaml.cs

@@ -2,6 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Elwig.Helpers.Export;
+using Elwig.Helpers.Weighing;
 using Elwig.Models.Dtos;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -27,7 +28,8 @@ namespace Elwig.Windows {
 
         private async void WeighingButton1_Click(object sender, RoutedEventArgs evt) {
             try {
-                var res = await App.Scales[0].GetCurrentWeight();
+                if (App.Scales[0] is not ICommandScale cs) return;
+                var res = await cs.GetCurrentWeight();
                 Output.Text = res.ToString();
             } catch (Exception e) {
                 MessageBox.Show($"Beim Wiegen ist ein Fehler aufgetreten:\n\n{e.Message}", "Waagenfehler",
@@ -37,7 +39,8 @@ namespace Elwig.Windows {
 
         private async void WeighingButton2_Click(object sender, RoutedEventArgs evt) {
             try {
-                var res = await App.Scales[0].Weigh();
+                if (App.Scales[0] is not ICommandScale cs) return;
+                var res = await cs.Weigh();
                 Output.Text = res.ToString();
             } catch (Exception e) {
                 MessageBox.Show($"Beim Wiegen ist ein Fehler aufgetreten:\n\n{e.Message}", "Waagenfehler",

Installer/Installer.wixproj

@@ -25,8 +25,8 @@
     </Task>
   </UsingTask>
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
-    <Exec Command="curl -s -L &quot;http://www.columbia.edu/~em36/PDFtoPrinter.exe&quot; -z &quot;$(TargetDir)PDFtoPrinter.exe&quot; -o &quot;$(TargetDir)PDFtoPrinter.exe&quot;" />
-    <Exec Command="dotnet publish &quot;$(SolutionDir)Elwig\Elwig.csproj&quot; &quot;/p:PublishProfile=$(SolutionDir)\Elwig\Properties\PublishProfiles\FolderProfile.pubxml&quot;" />
+    <Exec Command="curl -s -L &quot;http://www.columbia.edu/~em36/PDFtoPrinter.exe&quot; -z &quot;$(ProjectDir)\Files\PDFtoPrinter.exe&quot; -o &quot;$(ProjectDir)\Files\PDFtoPrinter.exe&quot;" />
+    <Exec Command="dotnet publish &quot;$(ProjectDir)\..\Elwig\Elwig.csproj&quot; &quot;/p:PublishProfile=$(ProjectDir)\..\Elwig\Properties\PublishProfiles\FolderProfile.pubxml&quot;" />
     <GetFileVersion AssemblyPath="..\Elwig\bin\Publish\Elwig.exe">
       <Output TaskParameter="Version" PropertyName="ElwigFileVersion" />
     </GetFileVersion>

Installer/MainComponents.wxs

@@ -11,7 +11,7 @@
         <File Source="$(ProjectDir)\Files\WinziPrint.exe" Id="WinziPrint.exe"/>
       </Component>
       <Component Directory="InstallFolder">
-        <File Source="$(TargetDir)\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
+        <File Source="$(ProjectDir)\Files\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
       </Component>
     </ComponentGroup>
   </Fragment>

Setup/Bundle.wxs

@@ -1,25 +1,28 @@
 <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>
-      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />
-	</BootstrapperApplication>
-	  
-    <util:RegistrySearch Id="VCredistx86" Variable="VCredistx86" Result="exists" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x86,x86,14.36,bundle" />
-    <util:RegistrySearch Id="Webview2Machine" Variable="Webview2Machine" Result="exists" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" />
-    <util:RegistrySearch Id="Webview2User" Variable="Webview2User" Result="exists" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" />
+  <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7"
+          IconSourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico">
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.png"
+                                              SuppressOptionsUI="yes" ShowVersion="yes"/>
+    </BootstrapperApplication>
+
+    <util:RegistrySearch Id="VCredistx86" Variable="VCredistx86" Result="exists"
+                         Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x86,x86,14.36,bundle"/>
+    <util:RegistrySearch Id="Webview2Machine" Variable="Webview2Machine" Result="exists"
+                         Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"/>
+    <util:RegistrySearch Id="Webview2User" Variable="Webview2User" Result="exists"
+                         Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"/>
 
     <Chain>
-      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe" Cache="remove" Compressed="yes" PerMachine="yes"
-				  Permanent="yes" Vital="yes" SourceFile="$(TargetDir)VC_redist.x86.exe" InstallArguments="/install /passive /norestart" DetectCondition="VCredistx86">
-      </ExePackage>
-
-      <ExePackage Id="MicrosoftEdgeWebview2" DisplayName="Microsoft Edge Webview2 Runtime" Name="MicrosoftEdgeWebview2Setup.exe" Cache="remove"
-				  Compressed="yes" PerMachine="yes" Permanent ="yes" Vital ="no" SourceFile="$(TargetDir)MicrosoftEdgeWebview2Setup.exe" InstallArguments="/silent /install"
-				  UninstallArguments="/silent /uninstall" DetectCondition="Webview2Machine OR Webview2User" >
-      </ExePackage>
-
+      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe"
+                  SourceFile="$(ProjectDir)\Files\VC_redist.x86.exe"
+                  Cache="remove" Compressed="yes" PerMachine="yes" Permanent="yes" Vital="yes"
+                  InstallArguments="/install /passive /norestart" DetectCondition="VCredistx86"/>
+      <ExePackage Id="MicrosoftEdgeWebview2" DisplayName="Microsoft Edge Webview2 Runtime" Name="MicrosoftEdgeWebview2Setup.exe"
+                  SourceFile="$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe"
+                  Cache="remove" Compressed="yes" PerMachine="yes" Permanent ="yes" Vital="no"
+                  InstallArguments="/silent /install" UninstallArguments="/silent /uninstall" DetectCondition="Webview2Machine OR Webview2User"/>
       <MsiPackage Id="ElwigMsi" SourceFile="$(var.Installer.TargetDir)\Elwig.msi" Permanent="no" Compressed="yes" Vital="yes"/>
     </Chain>
-	  
   </Bundle>
 </Wix>

Setup/Setup.wixproj

@@ -5,8 +5,8 @@
     <Cultures>de-AT</Cultures>
   </PropertyGroup>
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
-    <Exec Command='curl -s -L "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -z "$(TargetDir)MicrosoftEdgeWebview2Setup.exe" -o "$(TargetDir)MicrosoftEdgeWebview2Setup.exe"' />
-    <Exec Command='curl -s -L "https://aka.ms/vs/17/release/vc_redist.x86.exe" -z "$(TargetDir)VC_redist.x86.exe" -o "$(TargetDir)VC_redist.x86.exe"' />
+    <Exec Command='curl -s -L "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -z "$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe" -o "$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe"' />
+    <Exec Command='curl -s -L "https://aka.ms/vs/17/release/vc_redist.x86.exe" -z "$(ProjectDir)\Files\VC_redist.x86.exe" -o "$(ProjectDir)\Files\VC_redist.x86.exe"' />
     <PropertyGroup>
       <DefineConstants>ElwigProjectDir=..\Elwig</DefineConstants>
     </PropertyGroup>

Tests/DatabaseSetup.cs

@@ -22,6 +22,7 @@ namespace Tests {
         public void Setup_2_Client() {
             using var ctx = new AppDbContext();
             App.Client = new ClientParameters(ctx);
+            App.SetBranch(ctx.Branches.Single());
         }
 
         [OneTimeSetUp]

Tests/DocumentTests/DeliveryNoteTest.cs

@@ -0,0 +1,30 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+
+namespace Tests.DocumentTests {
+    [TestFixture]
+    public class DeliveryNoteTest {
+
+        private readonly AppDbContext Context = new();
+
+        [Test]
+        public async Task Test_01_OneDeliveryPart() {
+            var d = await Context.Deliveries.FindAsync(2020, 1);
+            using var doc = new DeliveryNote(d!, Context);
+            var text = await Utils.GeneratePdfText(doc);
+            Assert.Multiple(() => {
+                Assert.That(text, Contains.Substring("""
+                MUSTERMANN Max
+                Winzerstraße 1
+                2223 Hohenruppersdorf
+                """));
+                Assert.That(text, Contains.Substring("1472583"));  // Betriebsnummer
+                Assert.That(text, Contains.Substring("pauschaliert"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Now:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring("Traubenübernahmeschein Nr. 20201001X001"));
+                // TODO
+                Assert.That(text, Contains.Substring("Ich bin der Text, der auf einem Traubenübernahmeschein steht!"));
+            });
+        }
+    }
+}

Tests/DocumentTests/Setup.cs

@@ -0,0 +1,37 @@
+using Elwig.Helpers;
+using System.Reflection;
+using Microsoft.Data.Sqlite;
+using Elwig.Helpers.Printing;
+
+namespace Tests.DocumentTests {
+    [SetUpFixture]
+    public class Setup {
+
+        private SqliteConnection? Connection;
+
+        [OneTimeSetUp]
+        public async Task SetupDatabase() {
+            Connection = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.DocumentInsert.sql");
+        }
+
+        [OneTimeTearDown]
+        public async Task TeardownDatabase() {
+            if (Connection == null) return;
+            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.DocumentDelete.sql");
+            await Connection.DisposeAsync();
+            Connection = null;
+        }
+
+        [OneTimeSetUp]
+        public async Task SetupPrinting() {
+            await Html.Init();
+            await Pdf.Init();
+        }
+
+        [OneTimeTearDown]
+        public void TeardownPrinting() {
+            // no teardown needed yet
+        }
+    }
+}

Tests/DocumentTests/Utils.cs

@@ -0,0 +1,20 @@
+using Elwig.Documents;
+using NReco.PdfRenderer;
+
+namespace Tests.DocumentTests {
+    public static class Utils {
+
+        private static readonly string FileName = Path.Combine(Path.GetTempPath(), "test_document.pdf");
+
+        public static async Task<string> GeneratePdfText(Document doc) {
+            await doc.Generate();
+            try {
+                doc.SaveTo(FileName);
+                var conv = new PdfToTextConverter { CustomArgs = "-raw " };
+                return conv.GenerateText(FileName);
+            } finally {
+                File.Delete(FileName);
+            }
+        }
+    }
+}

Tests/Resources/Sql/BillingDelete.sql

@@ -1,7 +1,7 @@
 -- deletes for HelperTests.BillingTest
 
 DELETE FROM credit;
-DELETE FROM payment_variant
+DELETE FROM payment_variant;
 DELETE FROM delivery;
 DELETE FROM area_commitment;
 DELETE FROM area_commitment_type;

Tests/Resources/Sql/DocumentDelete.sql

@@ -0,0 +1,5 @@
+-- deletes for DocumentTests
+
+DELETE FROM delivery;
+DELETE FROM season;
+DELETE FROM wine_attribute;

Tests/Resources/Sql/DocumentInsert.sql

@@ -0,0 +1,20 @@
+-- inserts for DocumentTests
+
+INSERT INTO wine_attribute (attrid, name, active, max_kg_per_ha, strict, fill_lower) VALUES
+('B', 'Bio',       TRUE, NULL, FALSE, 0),
+('K', 'Kabinett',  TRUE, NULL, FALSE, 0);
+
+INSERT INTO season (year, currency, min_kg_per_bs, max_kg_per_bs, penalty_per_kg, penalty_amount, penalty_none, start_date, end_date) VALUES
+(2020, 'EUR', 1000, 2000, NULL, NULL, NULL, NULL, NULL);
+
+INSERT INTO modifier (year, modid, ordering, name, abs, rel, standard, quick_select) VALUES
+(2020, 'S', 0, 'Geschädigte Trauben', NULL, -0.1, FALSE, FALSE),
+(2020, 'A', 0, 'Keine Voranmeldung', -1000, NULL, FALSE, FALSE);
+
+INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
+(101, 2020, 1, '2020-10-01', NULL, 'X', 1),
+(101, 2020, 2, '2020-10-01', NULL, 'X', 2),
+(101, 2020, 3, '2020-10-01', NULL, 'X', 3);
+
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, weight, kmw, qualid, hkid, kgnr, gerebelt, manual_weighing, spl_check, scale_id, weighing_id, weighing_reason) VALUES
+(2020, 1, 1, 'GV', NULL,  4000, 17, 'KAB', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL);

Tests/Resources/Sql/Insert.sql

@@ -1,31 +1,9 @@
 -- inserts for DatabaseSetup
 
-INSERT INTO client_parameter (param, value) VALUES
-('CLIENT_NAME_TOKEN', 'WGT'),
-('CLIENT_NAME_SHORT', 'WG Test'),
-('CLIENT_NAME', 'Winzergenossenschaft Test'),
-('CLIENT_NAME_SUFFIX', NULL),
-('CLIENT_NAME_TYPE', 'reg.Gen.m.b.H.'),
-('CLIENT_PLZ', '1234'),
-('CLIENT_ORT', 'Musterstadt'),
-('CLIENT_ADDRESS', 'Musterstraße 1'),
-('CLIENT_IBAN', 'AT12 3456 7890 1234 5678');
-
-INSERT INTO branch (zwstid, name) VALUES
-('X', 'Test');
-
-INSERT INTO wb_gl (glnr, name) VALUES
-(1, 'Matzner Hügel'),
-(2, 'Wolkersdorfer Hochleithen');
-
 INSERT INTO AT_gem (gkz, name) VALUES
 (30828, 'Hohenruppersdorf'),
 (31655, 'Wolkersdorf im Weinviertel');
 
-INSERT INTO wb_gem (gkz, hkid) VALUES
-(30828, 'WLWV'),
-(31655, 'WLWV');
-
 INSERT INTO AT_kg (kgnr, gkz, name) VALUES
 (06109, 30828, 'Hohenruppersdorf'),
 (15209, 31655, 'Münichsthal'),
@@ -34,14 +12,6 @@ INSERT INTO AT_kg (kgnr, gkz, name) VALUES
 (15216, 31655, 'Riedentahl'),
 (15224, 31655, 'Wolkersdorf');
 
-INSERT INTO wb_kg (kgnr, glnr) VALUES
-(06109, 1),
-(15209, 2),
-(15211, 2),
-(15212, 2),
-(15216, 2),
-(15224, 2);
-
 INSERT INTO AT_ort (okz, gkz, kgnr, name) VALUES
 (03524, 30828, 06109, 'Hohenruppersdorf'),
 (05092, 31655, 15211, 'Obersdorf'),
@@ -63,8 +33,43 @@ INSERT INTO AT_plz_dest (plz, okz, dest) VALUES
 (2122, 05136, 'Pfösing'),
 (2122, 05137, 'Riedenthal');
 
-INSERT INTO member (mgnr, given_name, family_name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban) VALUES
-(101, 'Max',       'Mustermann',  'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 1',    06109, 'AT123456789012345678'),
-(102, 'Wernhardt', 'Weinbauer',   'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 2',    06109, 'AT123456789012345678'),
-(103, 'Matthäus',  'Musterbauer', 'X', FALSE, FALSE, 40, 212005138, 'Brünner Straße 10', 15224, 'AT123456789012345678'),
-(104, 'Waltraud',  'Winzer',      'X', FALSE, FALSE, 40, 212005138, 'Wiener Straße 15',  15224, 'AT123456789012345678');
+INSERT INTO client_parameter (param, value) VALUES
+('CLIENT_NAME_TOKEN', 'WGT'),
+('CLIENT_NAME_SHORT', 'WG Test'),
+('CLIENT_NAME', 'Winzergenossenschaft Test'),
+('CLIENT_NAME_SUFFIX', NULL),
+('CLIENT_NAME_TYPE', 'reg.Gen.m.b.H.'),
+('CLIENT_PLZ', '2120'),
+('CLIENT_ORT', 'Wolkersdorf'),
+('CLIENT_ADDRESS', 'Genossenschaftsstraße 1'),
+('CLIENT_IBAN', 'AT12 3456 7890 1234 5678'),
+('TEXT_DELIVERYNOTE', 'Ich bin der Text, der auf einem Traubenübernahmeschein steht!');
+
+INSERT INTO branch (zwstid, name, country, postal_dest, address) VALUES
+('X', 'Test', 40, 212005138, 'Genossenschaftsstraße 1');
+
+INSERT INTO wb_gl (glnr, name) VALUES
+(1, 'Matzner Hügel'),
+(2, 'Wolkersdorfer Hochleithen');
+
+INSERT INTO wb_gem (gkz, hkid) VALUES
+(30828, 'WLWV'),
+(31655, 'WLWV');
+
+INSERT INTO wb_kg (kgnr, glnr) VALUES
+(06109, 1),
+(15209, 2),
+(15211, 2),
+(15212, 2),
+(15216, 2),
+(15224, 2);
+
+INSERT INTO member (mgnr, given_name, family_name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban, lfbis_nr) VALUES
+(101, 'Max',       'Mustermann',  'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 1',    06109, 'AT123456789012345678', '1472583'),
+(102, 'Wernhardt', 'Weinbauer',   'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 2',    06109, 'AT123456789012345678', '4725836'),
+(103, 'Matthäus',  'Musterbauer', 'X', FALSE, FALSE, 40, 212005138, 'Brünner Straße 10', 15224, 'AT123456789012345678', '7258369'),
+(104, 'Waltraud',  'Winzer',      'X', FALSE, FALSE, 40, 212005138, 'Wiener Straße 15',  15224, 'AT123456789012345678', '2583691');
+
+INSERT INTO member_billing_address (mgnr, name, country, postal_dest, address) VALUES
+(102, 'W&B Weinbauer GesbR',          40, 222303524, 'Winzerstraße 2'),
+(104, 'Weinbau Waltraud Winzer GmbH', 40, 212205137, 'Hauptstraße 1');

Tests/Tests.csproj

@@ -4,9 +4,9 @@
     <TargetFramework>net8.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,10 +19,11 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NReco.PdfRenderer" Version="1.5.3" />
     <PackageReference Include="NUnit" Version="4.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Tests/fetch-resources.bat

@@ -1 +1 @@
-curl -s -L "https://www.necronda.net/elwig/files/create.sql?v=15" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl -s -L "https://www.necronda.net/elwig/files/create.sql?v=16" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"