Installer: Fix typo

Elwig/Documents/DeliveryConfirmation.cshtml.cs

@@ -12,15 +12,14 @@ namespace Elwig.Documents {
         public string? Text = App.Client.TextDeliveryConfirmation;
         public Dictionary<string, (string, int, int, int, int)> MemberBins;
 
-        public DeliveryConfirmation(AppDbContext ctx, int year, Member m) :
+        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, IEnumerable<DeliveryPart>? deliveries = null) :
             base($"Anlieferungsbestätigung {year}", m) {
             Year = year;
             ShowDateAndLocation = true;
             UseBillingAddress = true;
             IncludeSender = true;
-            // FIXME footer in merged documents
-            //DocumentId = $"Anl.-Best. {Year}/{m.MgNr}";
-            Deliveries = ctx.DeliveryParts.FromSqlRaw($"""
+            DocumentId = $"Anl.-Best. {Year}/{m.MgNr}";
+            Deliveries = deliveries ?? ctx.DeliveryParts.FromSqlRaw($"""
                 SELECT p.*
                 FROM v_delivery v
                     JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)

Elwig/Documents/Document.cshtml.cs

@@ -3,14 +3,12 @@ using System.Threading.Tasks;
 using System.IO;
 using Elwig.Helpers;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using System.Linq;
 
 namespace Elwig.Documents {
     public abstract partial class Document : IDisposable {
 
         private TempFile? _pdfFile = null;
-        private string? _renderedHtml = null;
 
         public bool ShowFoldMarks = App.Config.Debug;
 
@@ -39,18 +37,6 @@ namespace Elwig.Documents {
             Date = DateTime.Today;
         }
 
-        [GeneratedRegex(@"</body>.*?</footer>\s*</div>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
-        private static partial Regex GeneratedDocumentHeaderRegex();
-        private static readonly Regex DocumentHeaderRegex = GeneratedDocumentHeaderRegex();
-
-        [GeneratedRegex(@"<style>.*?/style>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
-        private static partial Regex GeneratedHtmlStyleRegex();
-        private static readonly Regex HtmlStyleRegex = GeneratedHtmlStyleRegex();
-
-        [GeneratedRegex(@"<link[^>]*>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
-        private static partial Regex GeneratedHtmlLinkRegex();
-        private static readonly Regex HtmlLinkRegex = GeneratedHtmlLinkRegex();
-
         ~Document() {
             Dispose();
         }
@@ -61,34 +47,11 @@ namespace Elwig.Documents {
             GC.SuppressFinalize(this);
         }
 
-        public static async Task<Document> Merge(IEnumerable<Document> docs) {
-            string html = "";
-            var styles = new List<string>();
-            foreach (var d in docs) {
-                var h = await d.Render();
-                var s = HtmlStyleRegex.Matches(h).Select(m => m.Value).ToList();
-                var l = HtmlLinkRegex.Matches(h).Select(m => m.Value).ToList();
-                if (s.All(styles.Contains)) {
-                    h = HtmlStyleRegex.Replace(h, "");
-                } else {
-                    styles.AddRange(s);
-                }
-                if (l.All(styles.Contains)) {
-                    h = HtmlLinkRegex.Replace(h, "");
-                } else {
-                    styles.AddRange(l);
-                }
-                html += h;
-            }
-            html = DocumentHeaderRegex.Replace(html, "<div class='document-break'/>");
-            return new InternalDocument("Mehrere Dokumente") {
-                _renderedHtml = html,
-            };
+        public static Document Merge(IEnumerable<Document> docs) {
+            return new MergedDocument(docs);
         }
 
         private async Task<string> Render() {
-            if (_renderedHtml != null)
-                return _renderedHtml;
             string name;
             if (this is BusinessLetter) {
                 name = "BusinessLetter";
@@ -109,17 +72,39 @@ namespace Elwig.Documents {
         }
 
         private async Task<string> Render(string name) {
-            _renderedHtml = await Html.CompileRenderAsync(name, this);
-            return _renderedHtml;
+            return await Html.CompileRenderAsync(name, this); ;
         }
 
-        public async Task Generate() {
-            var pdf = new TempFile("pdf");
-            using (var tmpHtml = new TempFile("html")) {
-                await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
-                await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
+        public async Task Generate(IProgress<double>? progress = null) {
+            progress?.Report(0.0);
+            if (this is MergedDocument m) {
+                var pdf = new TempFile("pdf");
+                var tmpHtmls = new List<TempFile>();
+                var n = m.Documents.Count();
+                int i = 0;
+                foreach (var doc in m.Documents) {
+                    var tmpHtml = new TempFile("html");
+                    await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8);
+                    tmpHtmls.Add(tmpHtml);
+                    i++;
+                    progress?.Report(50.0 * i / n);
+                }
+                progress?.Report(50.0);
+                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, new Progress<double>(v => progress?.Report(50.0 + v / 2)));
+                foreach (var tmp in tmpHtmls) {
+                    tmp.Dispose();
+                }
+                _pdfFile = pdf;
+            } else {
+                var pdf = new TempFile("pdf");
+                using (var tmpHtml = new TempFile("html")) {
+                    await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
+                    progress?.Report(50.0);
+                    await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
+                }
+                _pdfFile = pdf;
             }
-            _pdfFile = pdf;
+            progress?.Report(100.0);
         }
 
         public void SaveTo(string pdfPath) {
@@ -137,8 +122,11 @@ namespace Elwig.Documents {
             Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.Name}" : ""));
         }
 
-        private class InternalDocument : Document {
-            public InternalDocument(string title) : base(title) { }
+        private class MergedDocument : Document {
+            public IEnumerable<Document> Documents;
+            public MergedDocument(IEnumerable<Document> docs) : base("Mehrere Dokumente") {
+                Documents = docs;
+            }
         }
     }
 }

Elwig/Documents/Pdf.cs

@@ -2,44 +2,57 @@ using System.Threading.Tasks;
 using Elwig.Helpers;
 using Elwig.Windows;
 using System.Diagnostics;
-using Balbarak.WeasyPrint;
 using System;
 using System.IO;
+using System.Collections.Generic;
+using System.Windows;
+using System.Text.RegularExpressions;
+using System.Linq;
 
 namespace Elwig.Documents {
     public static class Pdf {
 
         private static readonly string PdfToPrinter = App.ExePath + "PDFtoPrinter.exe";
-        private static readonly FilesManager WeasyPrintManager = new();
-        private static string? WeasyPrintPython = null;
-        private static string? WeasyPrintDir => WeasyPrintManager.FolderPath;
-        public static bool IsReady => WeasyPrintPython != null && WeasyPrintDir != null;
+        private static readonly string WinziPrint = App.ExePath + "WinziPrint.exe";
+        private static Process? WinziPrintProc;
+        public static bool IsReady => WinziPrintProc != null;
+
 
         public static async Task Init(Action evtHandler) {
-            if (!WeasyPrintManager.IsFilesExsited()) {
-                await WeasyPrintManager.InitFilesAsync();
-            }
-            WeasyPrintPython = Path.Combine(WeasyPrintManager.FolderPath, "python.exe");
+            var p = new Process() { StartInfo = new() {
+                FileName = WinziPrint,
+                Arguments = $"-p -e utf-8 -d \"{App.TempPath}\" -",
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                RedirectStandardInput = true,
+                RedirectStandardOutput = true
+            } };
+            p.Start();
+            WinziPrintProc = p;
             evtHandler();
         }
 
-        public static async Task Convert(string htmlPath, string pdfPath) {
-            var p = new Process() { StartInfo = new() {
-                FileName = WeasyPrintPython,
-                CreateNoWindow = true,
-                WorkingDirectory = WeasyPrintDir,
-                RedirectStandardError = true,
-            } };
-            p.StartInfo.EnvironmentVariables["PATH"] = "Scripts;gtk3;" + Environment.GetEnvironmentVariable("PATH");
-            p.StartInfo.ArgumentList.Add("scripts/weasyprint.exe");
-            p.StartInfo.ArgumentList.Add("-e");
-            p.StartInfo.ArgumentList.Add("utf8");
-            p.StartInfo.ArgumentList.Add(htmlPath);
-            p.StartInfo.ArgumentList.Add(pdfPath);
-            p.Start();
-            await p.WaitForExitAsync();
-            var stderr = await p.StandardError.ReadToEndAsync();
-            if (p.ExitCode != 0) throw new Exception(stderr);
+        public static async Task<IEnumerable<int>> Convert(string htmlPath, string pdfPath, IProgress<double>? progress = null) {
+            return await Convert(new string[] { htmlPath }, pdfPath, progress);
+        }
+
+        public static async Task<IEnumerable<int>> Convert(IEnumerable<string> htmlPath, string pdfPath, IProgress<double>? progress = null) {
+            if (WinziPrintProc == null) throw new InvalidOperationException("The WinziPrint process has not been initialized yet");
+            progress?.Report(0.0);
+            await WinziPrintProc.StandardInput.WriteLineAsync($"{string.Join(';', htmlPath)};{pdfPath}");
+            while (true) {
+                var line = await WinziPrintProc.StandardOutput.ReadLineAsync() ?? throw new IOException("Invalid response from WinziPrint");
+                if (line.StartsWith("error:")) {
+                    MessageBox.Show(line[6..].Trim(), "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    return Array.Empty<int>();
+                } else if (line.StartsWith("progress:")) {
+                    var parts = line[9..].Trim().Split('/').Select(int.Parse).ToArray();
+                    progress?.Report(100.0 * parts[0] / parts[1]);
+                } else if (line.StartsWith("success:")) {
+                    var m = Regex.Match(line, @"\(([0-9, ]+)\)");
+                    return m.Groups[1].Value.Split(", ").Select(int.Parse);
+                }
+            }
         }
 
         public static void Show(TempFile file, string title) {

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.4.1</Version>
+    <Version>0.4.3</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
@@ -16,7 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Balbarak.WeasyPrint" Version="2.0.2" />
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
     <PackageReference Include="ini-parser" Version="2.5.2" />
     <PackageReference Include="LinqKit" Version="1.2.4" />

Elwig/Helpers/Billing/Billing.cs

@@ -181,19 +181,30 @@ namespace Elwig.Helpers.Billing {
                     }
                 }
 
-                var changes = new List<(int, int, int, int)>();
+                var negChanges = new List<(int, int, int, int)>();
+                var posChanges = new List<(int, int, int, int)>();
                 foreach (var (did, dpnr, _, w) in fittingDeliveries) {
                     int v = Math.Min(needed, w);
                     needed -= v;
-                    changes.Add((did, dpnr, 1, v));
-                    changes.Add((did, dpnr, 2, w - v));
+                    posChanges.Add((did, dpnr, 1, v));
+                    negChanges.Add((did, dpnr, 2, w - v));
                     if (needed == 0) break;
                 }
 
                 using (var cmd = cnx.CreateCommand()) {
                     cmd.CommandText = $"""
                         INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
-                        VALUES {string.Join(",\n       ", changes.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                        VALUES {string.Join(",\n       ", posChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                        ON CONFLICT DO UPDATE
+                        SET value = value + excluded.value
+                        """;
+                    await cmd.ExecuteNonQueryAsync();
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                        VALUES {string.Join(",\n       ", negChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
                         ON CONFLICT DO UPDATE
                         SET value = excluded.value
                         """;

Elwig/Helpers/TempFile.cs

@@ -5,6 +5,7 @@ namespace Elwig.Helpers {
     public sealed class TempFile : IDisposable {
         private int Usages = 0;
         public string FilePath { get; private set; }
+        public string FileName => Path.GetFileName(FilePath);
 
         public TempFile() : this(null) { }
 

Elwig/Windows/DeliveryConfirmationsWindow.xaml

@@ -1,13 +1,12 @@
-<local:ContextWindow x:Class="Elwig.Dialogs.DeliveryConfirmationsDialog"
+<local:ContextWindow x:Class="Elwig.Dialogs.DeliveryConfirmationsWindow"
                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                      xmlns:local="clr-namespace:Elwig.Windows"
                      mc:Ignorable="d"
-                     ResizeMode="NoResize"
                      Loaded="Window_Loaded"
-                     Title="Anlieferungsbestätingungen - Elwig" Height="400" Width="600">
+                     Title="Anlieferungsbestätingungen - Elwig" Height="500" Width="800" MinHeight="400" MinWidth="600">
     <Grid>
         <GroupBox Header="Sortieren nach" Margin="10,10,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left">
             <StackPanel Margin="5,5,0,5">
@@ -24,6 +23,8 @@
         <TextBox x:Name="TextElement" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
                  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="200,10,10,10" Height="Auto"/>
 
+        <ProgressBar x:Name="ProgressBar" Margin="10,10,10,106" Height="27" Width="180"
+                     VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
         <Button x:Name="TestButton" Content="Stichprobe" FontSize="14" Width="180" Margin="10,10,10,74" Height="27" Tag="Print" IsEnabled="False"
                 Click="TestButton_Click"
                 VerticalAlignment="Bottom" HorizontalAlignment="Left"/>

Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs

@@ -10,17 +10,19 @@ using System.Windows;
 using System.Windows.Input;
 
 namespace Elwig.Dialogs {
-    public partial class DeliveryConfirmationsDialog : ContextWindow {
+    public partial class DeliveryConfirmationsWindow : ContextWindow {
 
         public readonly int Year;
 
-        public DeliveryConfirmationsDialog(int year) {
+        public DeliveryConfirmationsWindow(int year) {
             InitializeComponent();
             Year = year;
             Title = $"Anlieferungsbestätigungen - Lese {Year} - Elwig";
             TextElement.Text = App.Client.TextDeliveryConfirmation;
             if (!App.Config.Debug) {
                 TestButton.Visibility = Visibility.Hidden;
+                var m = ProgressBar.Margin;
+                ProgressBar.Margin = new(m.Left, m.Top, m.Right, m.Bottom - 32);
             }
         }
 
@@ -82,8 +84,21 @@ namespace Elwig.Dialogs {
                 list = list.Where((_, n) => n % 10 == r);
             }
 
-            using var doc = await Document.Merge(list.Select(m => new DeliveryConfirmation(Context, Year, m))); ;
-            await doc.Generate();
+            var deliveries = await Context.DeliveryParts.FromSqlRaw($"""
+                SELECT p.*
+                FROM v_delivery v
+                    JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
+                WHERE v.year = {Year}
+                ORDER BY v.sortid, v.abgewertet ASC,
+                         COALESCE(LENGTH(v.attributes), 0) ASC, attribute_prio DESC, COALESCE(v.attributes, '~'),
+                         v.kmw DESC, v.lsnr, v.dpnr
+                """)
+                .ToListAsync();
+
+            using var doc = Document.Merge(list.Select(m => new DeliveryConfirmation(Context, Year, m, deliveries.Where(d => d.Delivery.MgNr == m.MgNr).ToList()))); ;
+            await doc.Generate(new Progress<double>(v => {
+                ProgressBar.Value = v;
+            }));
             Mouse.OverrideCursor = null;
 
             if (mode < 2) {

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -317,7 +317,7 @@ namespace Elwig.Windows {
                         .ThenBy(m => m.MgNr);
                     break;
             }
-            using var doc = await Document.Merge((await members.ToListAsync()).Select(m => new Letterhead(m)));
+            using var doc = Document.Merge((await members.ToListAsync()).Select(m => new Letterhead(m)));
             await doc.Generate();
             Mouse.OverrideCursor = null;
             if (App.Config.Debug) {

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -51,8 +51,8 @@ namespace Elwig.Windows {
         private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;
-            var d = new DeliveryConfirmationsDialog(year);
-            d.Show();
+            var w = new DeliveryConfirmationsWindow(year);
+            w.Show();
         }
 
         private async void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {

Elwig/fetch-resources.bat

@@ -3,3 +3,4 @@
 mkdir "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"
+::copy /b /y ..\Installer\Files\*.exe "C:\Program Files\Elwig\"

Installer/MainComponents.wxs

@@ -7,9 +7,12 @@
       <Component Directory="ConfigFolder" Permanent="true" NeverOverwrite="true">
         <File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"/>
       </Component>
-	  <Component Directory="InstallFolder">
-	    <File Source="$(TargetDir)\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
-	  </Component>
+      <Component Directory="InstallFolder">
+        <File Source="$(ProjectDir)\Files\WinziPrint.exe" Id="WinziPrint.exe"/>
+      </Component>
+      <Component Directory="InstallFolder">
+        <File Source="$(TargetDir)\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
+      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>