Compare commits
	
		
			34 Commits
		
	
	
		
			b76d43a5ff
			...
			v0.2.1
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e9e4c75edd | |||
| ff1a4e7182 | |||
| 1e9cad6de7 | |||
| 62fe087598 | |||
| 7f01b85878 | |||
| a659d07db2 | |||
| b2a78907cf | |||
| 7bcf532b26 | |||
| 595f9a049c | |||
| 80ed90941d | |||
| 77cee53f2d | |||
| 1a673f4b3a | |||
| 5ad8c88319 | |||
| 30aaa64f59 | |||
| 352bf840c3 | |||
| 898cece0d3 | |||
| 0b05cc4e10 | |||
| 74fa08e95d | |||
| bc6148624c | |||
| f5f00a7739 | |||
| 2de4739e9d | |||
| 47e8ab7e62 | |||
| 8a678509c5 | |||
| de53bfdd2b | |||
| f9d95a48f2 | |||
| be734b880f | |||
| 1c45e95ef3 | |||
| 7086a72fab | |||
| 540236f878 | |||
| aab95ee444 | |||
| 2b7d19199a | |||
| 28b424fe65 | |||
| 324c5db94e | |||
| faaeefe6ce | 
@@ -84,8 +84,8 @@ namespace Elwig {
 | 
			
		||||
 | 
			
		||||
            var list = new List<IScale>();
 | 
			
		||||
            foreach (var s in Config.Scales) {
 | 
			
		||||
                try {
 | 
			
		||||
                var id = s[0];
 | 
			
		||||
                try {
 | 
			
		||||
                    var type = s[1]?.ToLower();
 | 
			
		||||
                    var model = s[2];
 | 
			
		||||
                    var cnx = s[3];
 | 
			
		||||
@@ -99,6 +99,7 @@ namespace Elwig {
 | 
			
		||||
                        throw new ArgumentException($"Invalid scale type: \"{type}\"");
 | 
			
		||||
                    }
 | 
			
		||||
                } catch (Exception e) {
 | 
			
		||||
                    list.Add(new InvalidScale(id));
 | 
			
		||||
                    MessageBox.Show($"Unable to create scale {s[0]}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
@@ -137,11 +138,6 @@ namespace Elwig {
 | 
			
		||||
            base.OnStartup(evt);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        protected override void OnExit(ExitEventArgs evt) {
 | 
			
		||||
            Utils.RunBackground("PDF Close", () => Documents.Pdf.Close());
 | 
			
		||||
            base.OnExit(evt);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void PrintingReadyChanged() {
 | 
			
		||||
            Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -9,24 +9,21 @@ namespace Elwig.Dialogs {
 | 
			
		||||
        public int Weight = 0;
 | 
			
		||||
        public string? Reason = null;
 | 
			
		||||
 | 
			
		||||
        public ManualWeighingDialog() {
 | 
			
		||||
        public ManualWeighingDialog(string? reason = null) {
 | 
			
		||||
            InitializeComponent();
 | 
			
		||||
            ReasonInput.Text = reason;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            DialogResult = true;
 | 
			
		||||
            Weight = int.Parse(WeightInput.Text);
 | 
			
		||||
            Reason = Regex.Replace(ReasonInput.Text, @"\s+", " ").Trim();
 | 
			
		||||
            if (Reason == "") {
 | 
			
		||||
                Reason = null;
 | 
			
		||||
            } else if (!Reason.EndsWith(".") || !Reason.EndsWith("!") || !Reason.EndsWith("?")) {
 | 
			
		||||
                Reason += ".";
 | 
			
		||||
            }
 | 
			
		||||
            if (Reason == "") Reason = null;
 | 
			
		||||
            Close();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void UpdateButtons() {
 | 
			
		||||
            ConfirmButton.IsEnabled = WeightInput.Text.Length > 0 && ReasonInput.Text.Trim().Length > 0;
 | 
			
		||||
            ConfirmButton.IsEnabled = WeightInput.Text.Length > 0;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
@inherits TemplatePage<Elwig.Documents.BusinessDocument>
 | 
			
		||||
@model Elwig.Documents.BusinessDocument
 | 
			
		||||
@{ Layout = "Document"; }
 | 
			
		||||
 | 
			
		||||
<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-businessdocument.css" />
 | 
			
		||||
<div class="info-wrapper">
 | 
			
		||||
    <div class="address-wrapper">
 | 
			
		||||
        <div class="sender">
 | 
			
		||||
@@ -15,6 +15,4 @@
 | 
			
		||||
    </div>
 | 
			
		||||
    <aside>@Raw(Model.Aside)</aside>
 | 
			
		||||
</div>
 | 
			
		||||
<main>
 | 
			
		||||
@RenderBody()
 | 
			
		||||
</main>
 | 
			
		||||
 
 | 
			
		||||
@@ -5,15 +5,16 @@ namespace Elwig.Documents {
 | 
			
		||||
 | 
			
		||||
        public Member Member;
 | 
			
		||||
        public bool IncludeSender = false;
 | 
			
		||||
        public string Aside { get; set; }
 | 
			
		||||
        public string? Location { get; set; }
 | 
			
		||||
        public bool UseBillingAddress = false;
 | 
			
		||||
        public string Aside;
 | 
			
		||||
        public string? Location;
 | 
			
		||||
 | 
			
		||||
        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
 | 
			
		||||
            Member = m;
 | 
			
		||||
            Location = App.BranchName;
 | 
			
		||||
            IncludeSender = includeSender;
 | 
			
		||||
            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
 | 
			
		||||
            Aside = $"<table><colgroup><col span='1' style='width: 2.25cm;'/><col span='1' style='width: 100%;'/></colgroup>" +
 | 
			
		||||
            Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
 | 
			
		||||
                $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
 | 
			
		||||
                $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
 | 
			
		||||
                $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
 | 
			
		||||
@@ -24,10 +25,11 @@ namespace Elwig.Documents {
 | 
			
		||||
        public string Address {
 | 
			
		||||
            get {
 | 
			
		||||
                var b = Member.BillingAddress;
 | 
			
		||||
                var plz = (b == null) ? Member.PostalDest.AtPlz : b.PostalDest.AtPlz;
 | 
			
		||||
                if (b != null) {
 | 
			
		||||
                if (b != null && UseBillingAddress) {
 | 
			
		||||
                    var plz = b.PostalDest.AtPlz;
 | 
			
		||||
                    return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
 | 
			
		||||
                } else {
 | 
			
		||||
                    var plz = Member.PostalDest.AtPlz;
 | 
			
		||||
                    return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,8 @@
 | 
			
		||||
@inherits TemplatePage<Elwig.Documents.BusinessLetter>
 | 
			
		||||
@model Elwig.Documents.BusinessLetter
 | 
			
		||||
@{ Layout = "BusinessDocument"; }
 | 
			
		||||
 | 
			
		||||
<main>
 | 
			
		||||
<p>Sehr geehrtes Mitglied,</p>
 | 
			
		||||
<p>nein.</p>
 | 
			
		||||
<p>Mit freundlichen Grüßen<br/>Ihre Winzergenossenschaft</p>
 | 
			
		||||
</main>
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										86
									
								
								Elwig/Documents/CreditNote.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										86
									
								
								Elwig/Documents/CreditNote.cshtml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,86 @@
 | 
			
		||||
@using RazorLight
 | 
			
		||||
@inherits TemplatePage<Elwig.Documents.CreditNote>
 | 
			
		||||
@model Elwig.Documents.CreditNote
 | 
			
		||||
@{ Layout = "BusinessDocument"; }
 | 
			
		||||
<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-creditnote.css"/>
 | 
			
		||||
@{
 | 
			
		||||
    var bucketNum = Model.BucketNames.Length;
 | 
			
		||||
}
 | 
			
		||||
<main>
 | 
			
		||||
    <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
 | 
			
		||||
    <h1>@Model.Title</h1>
 | 
			
		||||
    <table class="credit">
 | 
			
		||||
        <colgroup>
 | 
			
		||||
            <col style="width: 24mm;"/>
 | 
			
		||||
            <col style="width: 6mm;"/>
 | 
			
		||||
            <col style="width: 31mm;"/>
 | 
			
		||||
            <col style="width: 15mm;"/>
 | 
			
		||||
            <col style="width: 8mm;"/>
 | 
			
		||||
            <col style="width: 10mm;"/>
 | 
			
		||||
            <col style="width: 12mm;"/>
 | 
			
		||||
            <col style="width: 10mm;"/>
 | 
			
		||||
            <col style="width: 12mm;"/>
 | 
			
		||||
            <col style="width: 15mm;"/>
 | 
			
		||||
            <col style="width: 17mm;"/>
 | 
			
		||||
        </colgroup>
 | 
			
		||||
        <thead>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th rowspan="3" style="text-align: left;">Lieferschein-Nr.</th>
 | 
			
		||||
                <th rowspan="3">Pos.</th>
 | 
			
		||||
                <th rowspan="3" style="text-align: left;">Sorte</th>
 | 
			
		||||
                <th rowspan="3" style="text-align: left;">Attribut(e)</th>
 | 
			
		||||
                <th rowspan="2" colspan="2">Gradation</th>
 | 
			
		||||
                <th colspan="2">Zu-/Abschläge</th>
 | 
			
		||||
                <th colspan="2">@Raw(string.Join("<br/>", Model.BucketNames))</th>
 | 
			
		||||
                <th rowspan="2">Betrag</th>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th>Abs.</th>
 | 
			
		||||
                <th>Rel.</th>
 | 
			
		||||
                <th>Gewicht</th>
 | 
			
		||||
                <th>Preis</th>
 | 
			
		||||
            </tr>
 | 
			
		||||
            <tr>
 | 
			
		||||
                <th>[°Oe]</th>
 | 
			
		||||
                <th>[°KMW]</th>
 | 
			
		||||
                <th>[@Model.CurrencySymbol/kg]</th>
 | 
			
		||||
                <th>[%]</th>
 | 
			
		||||
                <th>[kg]</th>
 | 
			
		||||
                <th>[@Model.CurrencySymbol/kg]</th>
 | 
			
		||||
                <th>[@Model.CurrencySymbol]</th>
 | 
			
		||||
            </tr>
 | 
			
		||||
        </thead>
 | 
			
		||||
        <tbody>
 | 
			
		||||
            @{
 | 
			
		||||
                string FormatRow(int? weight, decimal? amount) {
 | 
			
		||||
                    var w = weight == null || weight == 0 ? "-" : $"{weight:N0}";
 | 
			
		||||
                    return $"<td class='weight'>{w}</td><td class='amount'>{amount?.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)))}</td>";
 | 
			
		||||
                }
 | 
			
		||||
                string? last = null;
 | 
			
		||||
            }
 | 
			
		||||
            @foreach (var part in Model.Parts) {
 | 
			
		||||
                var pmt = part.Payment;
 | 
			
		||||
                var abs = pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
 | 
			
		||||
                var rel = pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
 | 
			
		||||
                <tr class="first @(bucketNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
 | 
			
		||||
                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
 | 
			
		||||
                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
 | 
			
		||||
                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
 | 
			
		||||
                    <td rowspan="@bucketNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
 | 
			
		||||
                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
 | 
			
		||||
                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
 | 
			
		||||
                    <td rowspan="@bucketNum" class="abs">@abs</td>
 | 
			
		||||
                    <td rowspan="@bucketNum" class="rel">@rel</td>
 | 
			
		||||
                    @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
 | 
			
		||||
                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
 | 
			
		||||
                </tr>
 | 
			
		||||
                @for (int i = 1; i < bucketNum; i++) {
 | 
			
		||||
                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
 | 
			
		||||
                        @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
 | 
			
		||||
                    </tr>
 | 
			
		||||
                }
 | 
			
		||||
                last = part.SortId;
 | 
			
		||||
            }
 | 
			
		||||
        </tbody>
 | 
			
		||||
    </table>
 | 
			
		||||
</main>
 | 
			
		||||
							
								
								
									
										39
									
								
								Elwig/Documents/CreditNote.cshtml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								Elwig/Documents/CreditNote.cshtml.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,39 @@
 | 
			
		||||
using Elwig.Helpers;
 | 
			
		||||
using Elwig.Models;
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Documents {
 | 
			
		||||
    public class CreditNote : BusinessDocument {
 | 
			
		||||
 | 
			
		||||
        public Credit Credit;
 | 
			
		||||
        public string? Text;
 | 
			
		||||
        public string CurrencySymbol;
 | 
			
		||||
        public string[] BucketNames;
 | 
			
		||||
        public int Precision;
 | 
			
		||||
        public IEnumerable<DeliveryPart> Parts;
 | 
			
		||||
 | 
			
		||||
        public CreditNote(Credit c, AppDbContext ctx) : base($"Traubengutschrift Nr. {c.TgId} – {c.Payment.Variant.Name}", c.Member) {
 | 
			
		||||
            UseBillingAddress = true;
 | 
			
		||||
            Credit = c;
 | 
			
		||||
            Aside = Aside.Replace("</table>", "") +
 | 
			
		||||
                $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
 | 
			
		||||
                $"<tr><th>TG-Nr.</th><td>{c.TgId}</td></tr>" +
 | 
			
		||||
                $"<tr><th>Überw. am</th><td>{c.Payment.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
 | 
			
		||||
                $"<tr><th>Datum/Zeit</th><td>{c.ModifiedTimestamp:dd.MM.yyyy} / {c.ModifiedTimestamp:HH:mm}</td></tr>" +
 | 
			
		||||
                $"</tbody></table>";
 | 
			
		||||
            Text = App.Client.TextDeliveryNote;
 | 
			
		||||
            DocumentId = $"Tr.-Gutschr. {c.TgId}";
 | 
			
		||||
            CurrencySymbol = c.Payment.Variant.Season.Currency.Symbol ?? c.Payment.Variant.Season.Currency.Code;
 | 
			
		||||
            BucketNames = c.Payment.Variant.BucketNames;
 | 
			
		||||
            Precision = c.Payment.Variant.Season.Precision;
 | 
			
		||||
            Parts = ctx.DeliveryParts.FromSql($"""
 | 
			
		||||
                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, v.mgnr) = ({c.Year}, {c.Member.MgNr})
 | 
			
		||||
                ORDER BY sortid, LENGTH(attributes) DESC, attributes, kmw DESC, date, time, dpnr
 | 
			
		||||
                """).ToList();
 | 
			
		||||
        }
 | 
			
		||||
    }}
 | 
			
		||||
@@ -2,7 +2,8 @@
 | 
			
		||||
@inherits TemplatePage<Elwig.Documents.DeliveryNote>
 | 
			
		||||
@model Elwig.Documents.DeliveryNote
 | 
			
		||||
@{ Layout = "BusinessDocument"; }
 | 
			
		||||
 | 
			
		||||
<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
 | 
			
		||||
<main>
 | 
			
		||||
<div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
 | 
			
		||||
<h1>@Model.Title</h1>
 | 
			
		||||
@{
 | 
			
		||||
@@ -11,38 +12,49 @@
 | 
			
		||||
<script>
 | 
			
		||||
    document.addEventListener("DOMContentLoaded", () => {
 | 
			
		||||
        const hidden = document.getElementsByClassName("hidden")[0];
 | 
			
		||||
        const bottom = hidden.offsetTop + hidden.offsetHeight;
 | 
			
		||||
        const cm = bottom * 2.54 / 96 * window.devicePixelRatio;
 | 
			
		||||
 | 
			
		||||
        if (cm > 25.75) {
 | 
			
		||||
            // force page break
 | 
			
		||||
        const table = document.getElementsByClassName("delivery")[0];
 | 
			
		||||
        const stats = document.getElementById("delivery-stats");
 | 
			
		||||
        const mm = px2mm(0, hidden.offsetTop + hidden.offsetHeight);
 | 
			
		||||
        const heightTable = px2mm(table.offsetTop, hidden.offsetTop + hidden.offsetHeight);
 | 
			
		||||
 | 
			
		||||
        if (mm >= heightA4 - heightFooter) {
 | 
			
		||||
            if (heightTable + 10 >= heightMain) {
 | 
			
		||||
                // force page break in table
 | 
			
		||||
                const tblOff = px2mm(0, table.offsetTop);
 | 
			
		||||
                let last = null;
 | 
			
		||||
                for (const tr of table.getElementsByTagName("tr")) {
 | 
			
		||||
                    if (!tr.classList.contains("main")) continue;
 | 
			
		||||
                    const mm2 = tblOff + px2mm(0, tr.offsetTop);
 | 
			
		||||
                    if (mm2 >= heightA4 - heightFooter) {
 | 
			
		||||
                        last.classList.add("page-break");
 | 
			
		||||
                        break;
 | 
			
		||||
                    }
 | 
			
		||||
                    last = tr;
 | 
			
		||||
                }
 | 
			
		||||
            } else {
 | 
			
		||||
                // force page break
 | 
			
		||||
                const hr = document.createElement("hr");
 | 
			
		||||
                hr.classList.add("page-break");
 | 
			
		||||
                table.before(hr);
 | 
			
		||||
 | 
			
		||||
            const stats = document.getElementById("delivery-stats");
 | 
			
		||||
            stats.getElementsByTagName("table")[0].classList.add("expanded");
 | 
			
		||||
            hr.before(stats);
 | 
			
		||||
 | 
			
		||||
                const p = document.createElement("p");
 | 
			
		||||
                p.innerText = "Siehe nächste Seite."
 | 
			
		||||
            stats.before(p);
 | 
			
		||||
                hr.before(p);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    });
 | 
			
		||||
</script>
 | 
			
		||||
<table class="delivery">
 | 
			
		||||
    <colgroup>
 | 
			
		||||
        <col style="width: 1cm;"/>
 | 
			
		||||
        <col style="width: 25%;"/>
 | 
			
		||||
        <col style="width: 25%;"/>
 | 
			
		||||
        <col style="width: 25%;"/>
 | 
			
		||||
        <col style="width: 25%;"/>
 | 
			
		||||
        <col style="width: 3cm;"/>
 | 
			
		||||
        <col style="width: 1.25cm;"/>
 | 
			
		||||
        <col style="width: 1.25cm;"/>
 | 
			
		||||
        <col style="width: 1.5cm;"/>
 | 
			
		||||
        <col style="width: 10.00mm;"/>
 | 
			
		||||
        <col style="width: 21.25mm;"/>
 | 
			
		||||
        <col style="width: 21.25mm;"/>
 | 
			
		||||
        <col style="width: 21.25mm;"/>
 | 
			
		||||
        <col style="width: 21.25mm;"/>
 | 
			
		||||
        <col style="width: 30.00mm;"/>
 | 
			
		||||
        <col style="width: 12.50mm;"/>
 | 
			
		||||
        <col style="width: 12.50mm;"/>
 | 
			
		||||
        <col style="width: 15.00mm;"/>
 | 
			
		||||
    </colgroup>
 | 
			
		||||
    <thead>
 | 
			
		||||
        <tr>
 | 
			
		||||
@@ -105,13 +117,13 @@
 | 
			
		||||
    <div id="delivery-stats">
 | 
			
		||||
        <table class="delivery-stats">
 | 
			
		||||
            <colgroup>
 | 
			
		||||
                <col style="width: 100%;"/>
 | 
			
		||||
                <col style="width: 2cm;"/>
 | 
			
		||||
                <col style="width: 2cm;"/>
 | 
			
		||||
                <col style="width: 2cm;"/>
 | 
			
		||||
                <col style="width: 2cm;"/>
 | 
			
		||||
                <col style="width: 2cm;"/>
 | 
			
		||||
                <col style="width: 2cm;"/>
 | 
			
		||||
                <col style="width: 45mm;"/>
 | 
			
		||||
                <col style="width: 20mm;"/>
 | 
			
		||||
                <col style="width: 20mm;"/>
 | 
			
		||||
                <col style="width: 20mm;"/>
 | 
			
		||||
                <col style="width: 20mm;"/>
 | 
			
		||||
                <col style="width: 20mm;"/>
 | 
			
		||||
                <col style="width: 20mm;"/>
 | 
			
		||||
            </colgroup>
 | 
			
		||||
            <thead>
 | 
			
		||||
                <tr>
 | 
			
		||||
@@ -152,6 +164,7 @@
 | 
			
		||||
        </table>
 | 
			
		||||
    </div>
 | 
			
		||||
}
 | 
			
		||||
</main>
 | 
			
		||||
@for (int i = 0; i < 2; i++) {
 | 
			
		||||
    <div class="@(i == 0 ? "hidden" : "bottom")">
 | 
			
		||||
        @if (Model.Text != null) {
 | 
			
		||||
 
 | 
			
		||||
@@ -10,6 +10,7 @@ namespace Elwig.Documents {
 | 
			
		||||
        public IEnumerable<(string, string, int, int, int)> MemberBuckets;
 | 
			
		||||
 | 
			
		||||
        public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
 | 
			
		||||
            UseBillingAddress = true;
 | 
			
		||||
            Delivery = d;
 | 
			
		||||
            Aside = Aside.Replace("</table>", "") +
 | 
			
		||||
                $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
 | 
			
		||||
 
 | 
			
		||||
@@ -1,26 +1,31 @@
 | 
			
		||||
@using RazorLight
 | 
			
		||||
@inherits TemplatePage<Elwig.Documents.Document>
 | 
			
		||||
@model Elwig.Documents.Document
 | 
			
		||||
 | 
			
		||||
<!DOCTYPE html>
 | 
			
		||||
<html lang="de-AT">
 | 
			
		||||
<head>
 | 
			
		||||
    <title>@Model.Title</title>
 | 
			
		||||
    <meta name="author" value="@Model.Author"/>
 | 
			
		||||
    <meta charset="UTF-8"/>
 | 
			
		||||
    <script>
 | 
			
		||||
        window.PagedConfig = { auto: false };
 | 
			
		||||
        if (!navigator.webdriver) {
 | 
			
		||||
            window.addEventListener("beforeprint", async () => { await window.PagedPolyfill.preview(); });
 | 
			
		||||
            window.addEventListener("afterprint", () => { location.reload(); });
 | 
			
		||||
        const heightA4 = 297, widhtA4 = 210, heightFooter = 35, heightHeader = 25;
 | 
			
		||||
        const heightMain = heightA4 - heightFooter - heightHeader;
 | 
			
		||||
        function px2mm(px1, px2) {
 | 
			
		||||
            return (px2 - px1 + 1) * 2.54 / 96 * window.devicePixelRatio * 10;
 | 
			
		||||
        }
 | 
			
		||||
    </script>
 | 
			
		||||
    <script src="@Raw(Model.DataPath)\resources\paged.polyfill.js"></script>
 | 
			
		||||
    <link rel="stylesheet" href="@Raw(Model.DataPath)\resources\style.css" />
 | 
			
		||||
    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style.css"/>
 | 
			
		||||
    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-page.css"/>
 | 
			
		||||
</head>
 | 
			
		||||
<body>
 | 
			
		||||
    @if (Model.ShowFoldMarks) {
 | 
			
		||||
        <div class="m1"></div>
 | 
			
		||||
        <div class="m2"></div>
 | 
			
		||||
        <div class="m3"></div>
 | 
			
		||||
        <div class="m1 r"></div>
 | 
			
		||||
        <div class="m2 r"></div>
 | 
			
		||||
        <div class="m3 r"></div>
 | 
			
		||||
    }
 | 
			
		||||
    <div class="footer-wrapper">
 | 
			
		||||
        <div class="pre-footer">
 | 
			
		||||
            <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
 | 
			
		||||
 
 | 
			
		||||
@@ -8,11 +8,22 @@ namespace Elwig.Documents {
 | 
			
		||||
 | 
			
		||||
        private TempFile? PdfFile = null;
 | 
			
		||||
 | 
			
		||||
        public bool ShowFoldMarks = App.Config.Debug;
 | 
			
		||||
        public string DataPath;
 | 
			
		||||
        public int CurrentNextSeason;
 | 
			
		||||
        public string? DocumentId;
 | 
			
		||||
        public string Title;
 | 
			
		||||
        public string Author;
 | 
			
		||||
        public string Header;
 | 
			
		||||
        public string Footer;
 | 
			
		||||
        public DateTime Date;
 | 
			
		||||
 | 
			
		||||
        public Document(string title) {
 | 
			
		||||
            var c = App.Client;
 | 
			
		||||
            DataPath = App.DataPath;
 | 
			
		||||
            CurrentNextSeason = Utils.CurrentNextSeason;
 | 
			
		||||
            Title = title;
 | 
			
		||||
            Author = App.Client.NameFull;
 | 
			
		||||
            Header = $"<h1>{c.Name}</h1>";
 | 
			
		||||
            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
 | 
			
		||||
                .Item(c.NameFull).NextLine()
 | 
			
		||||
@@ -33,33 +44,30 @@ namespace Elwig.Documents {
 | 
			
		||||
            GC.SuppressFinalize(this);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public string DataPath { get; set; }
 | 
			
		||||
        public int CurrentNextSeason { get; set; }
 | 
			
		||||
        public string Title { get; set; }
 | 
			
		||||
        public string Header { get; set; }
 | 
			
		||||
        public string Footer { get; set; }
 | 
			
		||||
        public DateTime Date { get; set; }
 | 
			
		||||
        public string? DocumentId { get; set; }
 | 
			
		||||
 | 
			
		||||
        private async Task<string> Render() {
 | 
			
		||||
        private Task<string> Render() {
 | 
			
		||||
            string name;
 | 
			
		||||
            if (this is BusinessLetter) {
 | 
			
		||||
                name = "BusinessLetter";
 | 
			
		||||
            } else if (this is DeliveryNote) {
 | 
			
		||||
                name = "DeliveryNote";
 | 
			
		||||
            } else if (this is CreditNote) {
 | 
			
		||||
                name = "CreditNote";
 | 
			
		||||
            } else {
 | 
			
		||||
                throw new InvalidOperationException("Invalid document object");
 | 
			
		||||
            }
 | 
			
		||||
            return await Html.CompileRenderAsync(name, this);
 | 
			
		||||
            return Render(name);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private Task<string> Render(string name) {
 | 
			
		||||
            return 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());
 | 
			
		||||
                await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
 | 
			
		||||
                await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
 | 
			
		||||
            }
 | 
			
		||||
            Pdf.UpdateMetadata(pdf.FilePath, Title, App.Client.NameFull);
 | 
			
		||||
            PdfFile = pdf;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -18,6 +18,7 @@ namespace Elwig.Documents {
 | 
			
		||||
            await e.CompileTemplateAsync("BusinessDocument");
 | 
			
		||||
            await e.CompileTemplateAsync("BusinessLetter");
 | 
			
		||||
            await e.CompileTemplateAsync("DeliveryNote");
 | 
			
		||||
            await e.CompileTemplateAsync("CreditNote");
 | 
			
		||||
 | 
			
		||||
            Engine = e;
 | 
			
		||||
            evtHandler();
 | 
			
		||||
 
 | 
			
		||||
@@ -1,64 +1,45 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using System.Windows;
 | 
			
		||||
using PdfSharp.Pdf.IO;
 | 
			
		||||
using PuppeteerSharp;
 | 
			
		||||
using Elwig.Helpers;
 | 
			
		||||
using Elwig.Windows;
 | 
			
		||||
using System.Diagnostics;
 | 
			
		||||
using Balbarak.WeasyPrint;
 | 
			
		||||
using System;
 | 
			
		||||
using System.IO;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Documents {
 | 
			
		||||
    public static class Pdf {
 | 
			
		||||
 | 
			
		||||
        private static readonly string Chromium = @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe";
 | 
			
		||||
        private static readonly string PdfToPrinter = App.ExePath + "PDFtoPrinter.exe";
 | 
			
		||||
        private static IBrowser? Browser = null;
 | 
			
		||||
        public static bool IsReady => Browser != null;
 | 
			
		||||
        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;
 | 
			
		||||
 | 
			
		||||
        public static async Task Init(Action evtHandler) {
 | 
			
		||||
            Browser = await Puppeteer.LaunchAsync(new LaunchOptions {
 | 
			
		||||
                Headless = true,
 | 
			
		||||
                ExecutablePath = Chromium,
 | 
			
		||||
                // paged.js uses XHRs to load styles, so this is needed
 | 
			
		||||
                Args = new[] { "--allow-file-access-from-files" },
 | 
			
		||||
            });
 | 
			
		||||
            if (!WeasyPrintManager.IsFilesExsited()) {
 | 
			
		||||
                await WeasyPrintManager.InitFilesAsync();
 | 
			
		||||
            }
 | 
			
		||||
            WeasyPrintPython = Path.Combine(WeasyPrintManager.FolderPath, "python.exe");
 | 
			
		||||
            evtHandler();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public static async Task Close() {
 | 
			
		||||
            if (Browser == null) return;
 | 
			
		||||
            await Browser.CloseAsync();
 | 
			
		||||
            Browser = null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public static async Task Convert(string htmlPath, string pdfPath) {
 | 
			
		||||
            if (Browser == null) throw new InvalidOperationException("The puppeteer engine has not been initialized yet");
 | 
			
		||||
            using var page = await Browser.NewPageAsync();
 | 
			
		||||
            page.Console += OnConsole;
 | 
			
		||||
            await page.GoToAsync($"file://{htmlPath}");
 | 
			
		||||
            await page.EvaluateFunctionAsync("async () => { await window.PagedPolyfill.preview(); }");
 | 
			
		||||
            await page.PdfAsync(pdfPath, new() {
 | 
			
		||||
                PreferCSSPageSize = true,
 | 
			
		||||
                //Format = PaperFormat.A4,
 | 
			
		||||
                DisplayHeaderFooter = false,
 | 
			
		||||
                MarginOptions = new() {
 | 
			
		||||
                    Top = "0mm",
 | 
			
		||||
                    Right = "0mm",
 | 
			
		||||
                    Bottom = "0mm",
 | 
			
		||||
                    Left = "0mm",
 | 
			
		||||
                },
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private static void OnConsole(object? sender, ConsoleEventArgs e) {
 | 
			
		||||
            MessageBox.Show(e.Message.Text);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public static void UpdateMetadata(string path, string title, string author) {
 | 
			
		||||
            using var doc = PdfReader.Open(path);
 | 
			
		||||
            doc.Info.Title = title;
 | 
			
		||||
            doc.Info.Author = author;
 | 
			
		||||
            doc.Save(path);
 | 
			
		||||
            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 void Show(TempFile file, string title) {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										131
									
								
								Elwig/Documents/style-businessdocument.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										131
									
								
								Elwig/Documents/style-businessdocument.css
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,131 @@
 | 
			
		||||
 | 
			
		||||
.address-wrapper, aside, main {
 | 
			
		||||
    overflow: hidden;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.spacing {
 | 
			
		||||
    height: 20mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.info-wrapper {
 | 
			
		||||
    width: 100%;
 | 
			
		||||
    height: 45mm;
 | 
			
		||||
    margin: 0 0 2mm 0;
 | 
			
		||||
    position: relative;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address-wrapper {
 | 
			
		||||
    height: 45mm;
 | 
			
		||||
    width: 85mm;
 | 
			
		||||
    margin: 0;
 | 
			
		||||
    padding: 5mm;
 | 
			
		||||
    position: absolute;
 | 
			
		||||
    left: -5mm;
 | 
			
		||||
    top: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address-wrapper .sender {
 | 
			
		||||
    height: 4em;
 | 
			
		||||
    font-size: 8pt;
 | 
			
		||||
    padding: 1em 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
address {
 | 
			
		||||
    height: 5em;
 | 
			
		||||
    white-space: pre-line;
 | 
			
		||||
    font-size: 12pt;
 | 
			
		||||
    font-style: normal;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside {
 | 
			
		||||
    height: 40mm;
 | 
			
		||||
    width: 75mm;
 | 
			
		||||
    margin: 0;
 | 
			
		||||
    position: absolute;
 | 
			
		||||
    left: 100mm;
 | 
			
		||||
    top: 5mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table {
 | 
			
		||||
    border-collapse: collapse;
 | 
			
		||||
    border: 0.5pt solid #808080;
 | 
			
		||||
    width: 65mm;
 | 
			
		||||
    margin-right: 10mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table thead:not(:first-child) tr {
 | 
			
		||||
    border-top: 0.5pt solid #808080;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table thead th {
 | 
			
		||||
    background-color: #E0E0E0;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table tbody th,
 | 
			
		||||
aside table tbody td {
 | 
			
		||||
    text-align: left;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table tbody th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main {
 | 
			
		||||
    margin: 2em 0 1em 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main > *:first-child {
 | 
			
		||||
    margin-top: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper h1, .main-wrapper p {
 | 
			
		||||
    font-size: 12pt;
 | 
			
		||||
    margin: 1em 0;
 | 
			
		||||
    text-align: justify;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper p {
 | 
			
		||||
    widows: 3;
 | 
			
		||||
    orphans: 3;
 | 
			
		||||
    hyphens: manual;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper .date {
 | 
			
		||||
    margin-bottom: 2em;
 | 
			
		||||
    text-align: right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper h1 {
 | 
			
		||||
    margin-bottom: 2em;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper p.comment {
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper .hidden {
 | 
			
		||||
    break-before: avoid;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper .bottom {
 | 
			
		||||
    bottom: 0;
 | 
			
		||||
    position: absolute;
 | 
			
		||||
    width: 165mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper .signatures {
 | 
			
		||||
    width: 100%;
 | 
			
		||||
    display: flex;
 | 
			
		||||
    justify-content: space-around;
 | 
			
		||||
    margin: 20mm 0 2mm 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.main-wrapper .signatures > * {
 | 
			
		||||
    width: 50mm;
 | 
			
		||||
    border-top: 0.5pt solid black;
 | 
			
		||||
    padding-top: 1mm;
 | 
			
		||||
    text-align: center;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										64
									
								
								Elwig/Documents/style-creditnote.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										64
									
								
								Elwig/Documents/style-creditnote.css
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,64 @@
 | 
			
		||||
 | 
			
		||||
table.credit {
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit th,
 | 
			
		||||
table.credit td {
 | 
			
		||||
    padding: 0 0.25mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit thead {
 | 
			
		||||
    font-size: 8pt
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit thead th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
    font-style: italic;
 | 
			
		||||
    vertical-align: bottom;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit td {
 | 
			
		||||
    vertical-align: top;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit .oe,
 | 
			
		||||
table.credit .kmw {
 | 
			
		||||
    text-align: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit .dpnr {
 | 
			
		||||
    text-align: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit .amount,
 | 
			
		||||
table.credit .weight {
 | 
			
		||||
    text-align: right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit .rel,
 | 
			
		||||
table.credit .abs {
 | 
			
		||||
    text-align: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit .amount.sum {
 | 
			
		||||
    vertical-align: bottom;
 | 
			
		||||
    padding-bottom: 1mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit tbody tr:not(.first):not(.last) {
 | 
			
		||||
    break-before: avoid;
 | 
			
		||||
    break-after: avoid;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit tbody tr.first td {
 | 
			
		||||
    padding-top: 1mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit tbody tr.last td {
 | 
			
		||||
    padding-bottom: 1mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.credit tbody tr.new {
 | 
			
		||||
    border-top: 0.5pt solid black;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										95
									
								
								Elwig/Documents/style-deliverynote.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										95
									
								
								Elwig/Documents/style-deliverynote.css
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,95 @@
 | 
			
		||||
 | 
			
		||||
table.delivery {
 | 
			
		||||
    margin-bottom: 5mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr:not(.main) {
 | 
			
		||||
    break-before: avoid;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
    font-style: italic;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery th.main {
 | 
			
		||||
    text-align: left;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.main td {
 | 
			
		||||
    font-weight: bold;
 | 
			
		||||
    padding-top: 2mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tbody tr:not(.main) td {
 | 
			
		||||
    font-size: 8pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.tight:not(.first) td {
 | 
			
		||||
    padding-top: 0;
 | 
			
		||||
    padding-bottom: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.tight.first td {
 | 
			
		||||
    padding-bottom: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* FIXME update version of WeasyPrint
 | 
			
		||||
table.delivery tr.tight:has(+ tr:not(.tight)) td {
 | 
			
		||||
padding-bottom: 0.5mm !important;
 | 
			
		||||
}
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
table.delivery tr.sum {
 | 
			
		||||
    border-top: 0.5pt solid black;
 | 
			
		||||
    break-before: avoid;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.sum td {
 | 
			
		||||
    padding-top: 1mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats {
 | 
			
		||||
    font-size: 8pt;
 | 
			
		||||
    break-inside: avoid;
 | 
			
		||||
    break-after: avoid;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats.expanded th,
 | 
			
		||||
table.delivery-stats.expanded td {
 | 
			
		||||
    padding: 0.25mm 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats:not(.expanded) th,
 | 
			
		||||
table.delivery-stats:not(.expanded) td {
 | 
			
		||||
    padding: 0.125mm 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats:not(.expanded) tr.optional {
 | 
			
		||||
    display: none;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats thead th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
    font-style: italic;
 | 
			
		||||
    text-align: right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats thead th:first-child {
 | 
			
		||||
    text-align: left;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats.expanded tbody {
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats td {
 | 
			
		||||
    text-align: right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats tbody th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
    font-style: italic;
 | 
			
		||||
    text-align: left;
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										71
									
								
								Elwig/Documents/style-page.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								Elwig/Documents/style-page.css
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,71 @@
 | 
			
		||||
 | 
			
		||||
.m1, .m2, .m3 {
 | 
			
		||||
    height: 0;
 | 
			
		||||
    width: 10mm;
 | 
			
		||||
    position: fixed;
 | 
			
		||||
    left: -25mm;
 | 
			
		||||
    border-top: 0.5pt solid black;
 | 
			
		||||
}
 | 
			
		||||
.m1.r, .m2.r, .m3.r {
 | 
			
		||||
    left: initial;
 | 
			
		||||
    right: -20mm;
 | 
			
		||||
}
 | 
			
		||||
.m1 {top: 80mm;}
 | 
			
		||||
.m2 {top: 123.5mm;}
 | 
			
		||||
.m3 {top: 185mm;}
 | 
			
		||||
 | 
			
		||||
.page-break {
 | 
			
		||||
    break-before: page;
 | 
			
		||||
}
 | 
			
		||||
hr.page-break {
 | 
			
		||||
    display: none;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@page {
 | 
			
		||||
    size: A4;
 | 
			
		||||
    margin: 25mm 20mm 35mm 25mm;
 | 
			
		||||
 | 
			
		||||
    @bottom-center {
 | 
			
		||||
        content: element(page-footer);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media screen {
 | 
			
		||||
    body, header, .footer-wrapper {
 | 
			
		||||
        width: 210mm;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    header, .address-wrapper, aside, main {
 | 
			
		||||
        border: 1px solid lightgray;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .m1, .m2, .m3 {
 | 
			
		||||
        display: none;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    header {
 | 
			
		||||
        top: 0;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .spacing {
 | 
			
		||||
        height: 45mm;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .main-wrapper {
 | 
			
		||||
        margin: 0 20mm 40mm 25mm;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    .footer-wrapper {
 | 
			
		||||
        position: fixed;
 | 
			
		||||
        bottom: 0;
 | 
			
		||||
        left: 0;
 | 
			
		||||
        right: 0;
 | 
			
		||||
        background: white;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media print {
 | 
			
		||||
    .page::after {
 | 
			
		||||
        content: "Seite " counter(page) " von " counter(pages) !important;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -12,20 +12,19 @@ body {
 | 
			
		||||
    margin: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.m1, .m2, .m3 {
 | 
			
		||||
    height: 0;
 | 
			
		||||
    width: 1cm;
 | 
			
		||||
    position: fixed;
 | 
			
		||||
    left: 0;
 | 
			
		||||
    border-top: 1pt solid black;
 | 
			
		||||
table {
 | 
			
		||||
    width: 100%;
 | 
			
		||||
    border-collapse: collapse;
 | 
			
		||||
    table-layout: fixed;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.m1 {top: 105mm;}
 | 
			
		||||
.m2 {top: 148.5mm;}
 | 
			
		||||
.m3 {top: 210mm;}
 | 
			
		||||
table td,
 | 
			
		||||
table th {
 | 
			
		||||
    padding: 0.5mm 1mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
header, .address-wrapper, aside, main {
 | 
			
		||||
    overflow: hidden;
 | 
			
		||||
table th {
 | 
			
		||||
    text-align: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
header {
 | 
			
		||||
@@ -36,142 +35,27 @@ header {
 | 
			
		||||
    left: 0;
 | 
			
		||||
    right: 0;
 | 
			
		||||
    text-align: center;
 | 
			
		||||
    overflow: hidden;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
header h1 {
 | 
			
		||||
    font-size: 18pt;
 | 
			
		||||
    margin-top: 1cm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.spacing {
 | 
			
		||||
    height: 20mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.info-wrapper {
 | 
			
		||||
    width: 100%;
 | 
			
		||||
    height: 45mm;
 | 
			
		||||
    margin: 0 0 8.46mm 0;
 | 
			
		||||
    position: relative;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address-wrapper {
 | 
			
		||||
    height: 45mm;
 | 
			
		||||
    width: 85mm;
 | 
			
		||||
    margin: 0;
 | 
			
		||||
    padding: 5mm;
 | 
			
		||||
    position: absolute;
 | 
			
		||||
    left: 20mm;
 | 
			
		||||
    top: 0;
 | 
			
		||||
    display: flex;
 | 
			
		||||
    flex-direction: column;
 | 
			
		||||
    justify-content: flex-end;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.address-wrapper .sender {
 | 
			
		||||
    flex: 17.7mm 1 1;
 | 
			
		||||
    font-size: 8pt;
 | 
			
		||||
    display: flex;
 | 
			
		||||
    flex-direction: column;
 | 
			
		||||
    justify-content: flex-end;
 | 
			
		||||
    padding-bottom: 2mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
address {
 | 
			
		||||
    flex: 27.3mm 1 1;
 | 
			
		||||
    white-space: pre-line;
 | 
			
		||||
    font-size: 12pt;
 | 
			
		||||
    font-style: normal;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table td,
 | 
			
		||||
table th {
 | 
			
		||||
    padding: 0.5mm 1mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside {
 | 
			
		||||
    height: 40mm;
 | 
			
		||||
    width: 75mm;
 | 
			
		||||
    margin: 0;
 | 
			
		||||
    position: absolute;
 | 
			
		||||
    left: 125mm;
 | 
			
		||||
    top: 5mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table {
 | 
			
		||||
    border-collapse: collapse;
 | 
			
		||||
    border: 1pt solid #808080;
 | 
			
		||||
    width: calc(100% - 1cm);
 | 
			
		||||
    margin-right: 1cm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table thead:not(:first-child) tr {
 | 
			
		||||
    border-top: 1pt solid #808080;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table thead th {
 | 
			
		||||
    background-color: #E0E0E0;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table tbody th,
 | 
			
		||||
aside table tbody td {
 | 
			
		||||
    text-align: left;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
aside table tbody th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main {
 | 
			
		||||
    margin: 8.46mm 20mm 4.23mm 25mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main :first-child {
 | 
			
		||||
    margin-top: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main h1, main p {
 | 
			
		||||
    font-size: 12pt;
 | 
			
		||||
    margin: 1em 0;
 | 
			
		||||
    text-align: justify;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main p {
 | 
			
		||||
    widows: 3;
 | 
			
		||||
    orphans: 3;
 | 
			
		||||
    hyphens: auto;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main .date {
 | 
			
		||||
    margin-bottom: 2em;
 | 
			
		||||
    text-align: right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main h1 {
 | 
			
		||||
    margin-bottom: 2em;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main p.comment {
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
    margin-top: 10mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.footer-wrapper {
 | 
			
		||||
    padding: 0 20mm 0 25mm;
 | 
			
		||||
    position: running(page-footer);
 | 
			
		||||
    bottom: 0;
 | 
			
		||||
    left: 0;
 | 
			
		||||
    right: 0;
 | 
			
		||||
    width: 165mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.pre-footer {
 | 
			
		||||
    margin: 4.23mm 0;
 | 
			
		||||
    margin: 1em 0;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
    display: flex;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.pre-footer > * {
 | 
			
		||||
    flex: 5cm 1 1;
 | 
			
		||||
    display: inline-block;
 | 
			
		||||
    width: 33%;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.pre-footer .date {
 | 
			
		||||
@@ -185,183 +69,27 @@ main p.comment {
 | 
			
		||||
 | 
			
		||||
.pre-footer .page {
 | 
			
		||||
    text-align: right;
 | 
			
		||||
    float: right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.pre-fotter .page::after {
 | 
			
		||||
.pre-footer .page::after {
 | 
			
		||||
    content: "Seite 1 von 1";
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
footer {
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
    border-top: 1pt solid black;
 | 
			
		||||
    border-top: 0.5pt solid black;
 | 
			
		||||
    height: 25mm;
 | 
			
		||||
    padding-top: 1mm;
 | 
			
		||||
    text-align: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table {
 | 
			
		||||
    width: 100%;
 | 
			
		||||
    border-collapse: collapse;
 | 
			
		||||
    table-layout: fixed;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery {
 | 
			
		||||
    margin-bottom: 5mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
    font-style: italic;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery th.main {
 | 
			
		||||
    text-align: left;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.main td {
 | 
			
		||||
    font-weight: bold;
 | 
			
		||||
    padding-top: 2mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tbody tr:not(.main) td {
 | 
			
		||||
    font-size: 8pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.tight:not(.first) td {
 | 
			
		||||
    padding-top: 0;
 | 
			
		||||
    padding-bottom: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.tight.first td {
 | 
			
		||||
    padding-bottom: 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.tight:has(+ tr:not(.tight)) td {
 | 
			
		||||
    padding-bottom: 0.5mm !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.sum {
 | 
			
		||||
    border-top: 1pt solid black;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery tr.sum td {
 | 
			
		||||
    padding-top: 1mm;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats {
 | 
			
		||||
    font-size: 8pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats.expanded th,
 | 
			
		||||
table.delivery-stats.expanded td {
 | 
			
		||||
    padding: 0.25mm 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats:not(.expanded) th,
 | 
			
		||||
table.delivery-stats:not(.expanded) td {
 | 
			
		||||
    padding: 0.125mm 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats:not(.expanded) tr.optional {
 | 
			
		||||
    display: none;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats thead th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
    font-style: italic;
 | 
			
		||||
    text-align: right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats thead th:first-child {
 | 
			
		||||
    text-align: left;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats.expanded tbody {
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats td {
 | 
			
		||||
    text-align: right;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
table.delivery-stats tbody th {
 | 
			
		||||
    font-weight: normal;
 | 
			
		||||
    font-style: italic;
 | 
			
		||||
    text-align: left;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.hidden {
 | 
			
		||||
    visibility: hidden;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main .bottom {
 | 
			
		||||
    bottom: 0;
 | 
			
		||||
    position: absolute;
 | 
			
		||||
    width: calc(100% - 25mm - 20mm);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main .signatures {
 | 
			
		||||
    width: 100%;
 | 
			
		||||
    display: flex;
 | 
			
		||||
    justify-content: space-around;
 | 
			
		||||
    margin: 20mm 0 2mm 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main .signatures > * {
 | 
			
		||||
    width: 5cm;
 | 
			
		||||
    border-top: 1pt solid black;
 | 
			
		||||
    padding-top: 1mm;
 | 
			
		||||
    text-align: center;
 | 
			
		||||
    font-size: 10pt;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
hr {
 | 
			
		||||
    border: none;
 | 
			
		||||
    border-top: 1pt solid black;
 | 
			
		||||
    border-top: 0.5pt solid black;
 | 
			
		||||
    margin: 5mm 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
hr.page-break {
 | 
			
		||||
    display: none;
 | 
			
		||||
    break-after: page;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@page {
 | 
			
		||||
    size: A4;
 | 
			
		||||
    margin: 25mm 0 35mm 0;
 | 
			
		||||
    @bottom-center {
 | 
			
		||||
        content: element(page-footer);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media screen {
 | 
			
		||||
    body, header, .footer-wrapper {
 | 
			
		||||
        width: 210mm;
 | 
			
		||||
    }
 | 
			
		||||
    header, .address-wrapper, aside, main {
 | 
			
		||||
        border: 1pt solid lightgray;
 | 
			
		||||
    }
 | 
			
		||||
    .m1, .m2, .m3 {display: none;}
 | 
			
		||||
    header {top: 0;}
 | 
			
		||||
    .spacing {height: 45mm;}
 | 
			
		||||
    .main-wrapper {
 | 
			
		||||
        margin-bottom: 40mm;
 | 
			
		||||
    }
 | 
			
		||||
    .footer-wrapper {
 | 
			
		||||
        position: fixed;
 | 
			
		||||
        bottom: 0;
 | 
			
		||||
        left: 0;
 | 
			
		||||
        right: 0;
 | 
			
		||||
        background: white;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@media print {
 | 
			
		||||
    .page::after {
 | 
			
		||||
        content: "Seite " counter(page) " von " counter(pages);
 | 
			
		||||
    }
 | 
			
		||||
    .footer-wrapper {
 | 
			
		||||
        display: none;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@
 | 
			
		||||
    <UseWPF>true</UseWPF>
 | 
			
		||||
    <PreserveCompilationContext>true</PreserveCompilationContext>
 | 
			
		||||
    <ApplicationIcon>elwig.ico</ApplicationIcon>
 | 
			
		||||
    <Version>0.1.0</Version>
 | 
			
		||||
    <Version>0.2.1</Version>
 | 
			
		||||
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
 | 
			
		||||
  </PropertyGroup>
 | 
			
		||||
 | 
			
		||||
@@ -16,14 +16,13 @@
 | 
			
		||||
  </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="Microsoft.AspNetCore.Razor.Language" Version="6.0.21" />
 | 
			
		||||
    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
 | 
			
		||||
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
 | 
			
		||||
    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
 | 
			
		||||
    <PackageReference Include="PdfSharp" Version="1.50.5147" />
 | 
			
		||||
    <PackageReference Include="PuppeteerSharp" Version="11.0.2" />
 | 
			
		||||
    <PackageReference Include="RazorLight" Version="2.3.1" />
 | 
			
		||||
    <PackageReference Include="ScottPlot.WPF" Version="4.1.67" />
 | 
			
		||||
    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
 | 
			
		||||
 
 | 
			
		||||
@@ -43,6 +43,8 @@ namespace Elwig.Helpers {
 | 
			
		||||
        public DbSet<DeliveryPartAttr> DeliveryPartAttributes { get; private set; }
 | 
			
		||||
        public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; }
 | 
			
		||||
        public DbSet<PaymentVar> PaymentVariants { get; private set; }
 | 
			
		||||
        public DbSet<PaymentMember> MemberPayments { get; private set; }
 | 
			
		||||
        public DbSet<Credit> Credits { get; private set; }
 | 
			
		||||
 | 
			
		||||
        private readonly StreamWriter? LogFile = null;
 | 
			
		||||
        public static DateTime LastWriteTime => File.GetLastWriteTime(App.Config.DatabaseFile);
 | 
			
		||||
 
 | 
			
		||||
@@ -1,14 +1,10 @@
 | 
			
		||||
using Newtonsoft.Json.Linq;
 | 
			
		||||
using ScottPlot;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Diagnostics.Contracts;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using System.Windows.Markup;
 | 
			
		||||
using System.Text.Json.Nodes;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Models {
 | 
			
		||||
namespace Elwig.Helpers.Billing {
 | 
			
		||||
    public class Graph : ICloneable {
 | 
			
		||||
 | 
			
		||||
        public string Type { get; set; }
 | 
			
		||||
@@ -30,7 +26,7 @@ namespace Elwig.Models {
 | 
			
		||||
            DataY = DataGen.Zeros(MaxX - MinX + 1);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public Graph(string type, int num, JToken graphData, string contracts, int minX, int maxX) {
 | 
			
		||||
        public Graph(string type, int num, JsonObject graphData, string contracts, int minX, int maxX) {
 | 
			
		||||
            Type = type;
 | 
			
		||||
            Num = num;
 | 
			
		||||
            Contracts =  contracts;
 | 
			
		||||
@@ -52,8 +48,8 @@ namespace Elwig.Models {
 | 
			
		||||
            DataY = dataY;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void ParseGraphData(JToken graphData) {
 | 
			
		||||
            var GraphPoints = graphData.Children().OfType<JProperty>().ToDictionary(p => int.Parse(p.Name[..^2]), p => (double)p.Value);
 | 
			
		||||
        private void ParseGraphData(JsonObject graphData) {
 | 
			
		||||
            var GraphPoints = graphData.ToDictionary(p => int.Parse(p.Key[..^2]), p => (double)p.Value?.AsValue());
 | 
			
		||||
 | 
			
		||||
            if (GraphPoints.Keys.Count < 1) {
 | 
			
		||||
                return;
 | 
			
		||||
@@ -99,19 +95,19 @@ namespace Elwig.Models {
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public JObject ToJson() {
 | 
			
		||||
            JObject graph = new();
 | 
			
		||||
        public JsonObject ToJson() {
 | 
			
		||||
            JsonObject graph = new();
 | 
			
		||||
 | 
			
		||||
            if (DataY[0] != DataY[1]) {
 | 
			
		||||
                graph.Add(new JProperty(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4)));
 | 
			
		||||
                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4)));
 | 
			
		||||
            }
 | 
			
		||||
            for (int i = 1; i < DataX.Length - 1; i++) {
 | 
			
		||||
                if (Math.Round(DataY[i] - DataY[i - 1], 4) != Math.Round(DataY[i + 1] - DataY[i], 4)) {
 | 
			
		||||
                    graph.Add(new JProperty(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4)));
 | 
			
		||||
                    graph.Add(new KeyValuePair<string, JsonNode?>(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4)));
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            if (DataY[^1] != DataY[^2]) {
 | 
			
		||||
                graph.Add(new JProperty(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4)));
 | 
			
		||||
                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4)));
 | 
			
		||||
            }
 | 
			
		||||
            return graph;
 | 
			
		||||
        }
 | 
			
		||||
							
								
								
									
										32
									
								
								Elwig/Helpers/Billing/Transaction.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										32
									
								
								Elwig/Helpers/Billing/Transaction.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,32 @@
 | 
			
		||||
using Elwig.Models;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Billing {
 | 
			
		||||
    public class Transaction {
 | 
			
		||||
 | 
			
		||||
        public readonly Member Member;
 | 
			
		||||
        public readonly long AmountCent;
 | 
			
		||||
        public readonly string Currency;
 | 
			
		||||
        public readonly int Nr;
 | 
			
		||||
 | 
			
		||||
        public Transaction(Member m, decimal amount, string currency, int nr) {
 | 
			
		||||
            Member = m;
 | 
			
		||||
            AmountCent = (long)Math.Round(amount * 100);
 | 
			
		||||
            Currency = currency;
 | 
			
		||||
            Nr = nr;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public static IEnumerable<Transaction> FromPaymentVariant(PaymentVar variant) {
 | 
			
		||||
            var last = variant.Season.PaymentVariants.Where(v => v.TransferDate != null).OrderBy(v => v.TransferDate).LastOrDefault();
 | 
			
		||||
            var dict = last?.MemberPayments.ToDictionary(m => m.MgNr, m => m.Amount) ?? new();
 | 
			
		||||
            return variant.Credits
 | 
			
		||||
                .OrderBy(c => c.MgNr)
 | 
			
		||||
                .Select(c => new Transaction(c.Member, c.Amount, variant.Season.CurrencyCode, c.TgNr))
 | 
			
		||||
                .ToList();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public static string FormatAmountCent(long cents) => $"{cents / 100}.{cents % 100:00}";
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -11,6 +11,9 @@ namespace Elwig.Helpers {
 | 
			
		||||
 | 
			
		||||
        public bool IsMatzen => Client == Type.Matzen;
 | 
			
		||||
        public bool IsWinzerkeller => Client == Type.Winzerkeller;
 | 
			
		||||
        public bool IsWolkersdorf => Client == Type.Winzerkeller && App.ZwstId == "W";
 | 
			
		||||
        public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
 | 
			
		||||
        public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
 | 
			
		||||
 | 
			
		||||
        public string NameToken;
 | 
			
		||||
        public string NameShort;
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,6 @@
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.IO;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using IniParser;
 | 
			
		||||
using IniParser.Model;
 | 
			
		||||
 | 
			
		||||
@@ -9,6 +8,7 @@ namespace Elwig.Helpers {
 | 
			
		||||
    public class Config {
 | 
			
		||||
 | 
			
		||||
        private readonly string FileName;
 | 
			
		||||
        public bool Debug;
 | 
			
		||||
        public string DatabaseFile = App.DataPath + "database.sqlite3";
 | 
			
		||||
        public string? DatabaseLog = null;
 | 
			
		||||
        public string? Branch = null;
 | 
			
		||||
@@ -25,7 +25,7 @@ namespace Elwig.Helpers {
 | 
			
		||||
            var parser = new FileIniDataParser();
 | 
			
		||||
            IniData? ini = null;
 | 
			
		||||
            try {
 | 
			
		||||
                ini = parser.ReadFile(FileName, Encoding.UTF8);
 | 
			
		||||
                ini = parser.ReadFile(FileName, Utils.UTF8);
 | 
			
		||||
            } catch {}
 | 
			
		||||
 | 
			
		||||
            if (ini == null || !ini.TryGetKey("database.file", out string db)) {
 | 
			
		||||
@@ -50,6 +50,13 @@ namespace Elwig.Helpers {
 | 
			
		||||
                Branch = branch;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (ini == null || !ini.TryGetKey("general.debug", out string debug)) {
 | 
			
		||||
                Debug = false;
 | 
			
		||||
            } else {
 | 
			
		||||
                debug = debug.ToLower();
 | 
			
		||||
                Debug = debug == "1" || debug == "true" || debug == "yes" || debug == "on";
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            ScaleList.Clear();
 | 
			
		||||
            Scales = ScaleList;
 | 
			
		||||
            if (ini != null) {
 | 
			
		||||
@@ -70,9 +77,10 @@ namespace Elwig.Helpers {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public void Write() {
 | 
			
		||||
            using var file = new StreamWriter(FileName, false, Encoding.UTF8);
 | 
			
		||||
            using var file = new StreamWriter(FileName, false, Utils.UTF8);
 | 
			
		||||
            file.Write($"\r\n[general]\r\n");
 | 
			
		||||
            if (Branch != null) file.Write($"branch = {Branch}\r\n");
 | 
			
		||||
            if (Debug) file.Write("debug = true\r\n");
 | 
			
		||||
            file.Write($"\r\n[database]\r\nfile = {DatabaseFile}\r\n");
 | 
			
		||||
            if (DatabaseLog != null) file.Write($"log = {DatabaseLog}\r\n");
 | 
			
		||||
            foreach (var s in ScaleList) {
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,67 @@
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using System;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Export {
 | 
			
		||||
    public class Bki {
 | 
			
		||||
 | 
			
		||||
    using Row = Tuple<(string?, string?, string?, string?, string, int, string, int), (string, int, string, string, string, int, string, double, double)>;
 | 
			
		||||
 | 
			
		||||
    public class Bki : Csv<Row> {
 | 
			
		||||
 | 
			
		||||
        private readonly string _clientData;
 | 
			
		||||
 | 
			
		||||
        public Bki(string filename) : base(filename, ';', Encoding.Latin1) {
 | 
			
		||||
            Header = """
 | 
			
		||||
                EDV-Liste zum automatischen Einlesen in die Weindatenbank;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 | 
			
		||||
                ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 | 
			
		||||
                Stammdaten;;;;;;;;;;;;;;Transportschein;;;;;;;;;;;;;;;;
 | 
			
		||||
                Empfänger:;;;;;;;Versender:;;;;;;;;;;;;;;;;;;;;;;;
 | 
			
		||||
                Betriebsnr;Name od. Firmenname;Vorname;Straße;Hausnr;Plz;Ort;Betriebsnr;Name od. Firmenname;Vorname;Straße;Hausnr;Plz;Ort;Datum der Lieferung;Menge in kg;Art;Weiß;Rot;Sorte1;Sorte2;Sorte3;Qualitätsstufe;Jahrgang;Herkunft;°KMW;°Oe;Vollablieferer;Ha Gesamt;Ha Ertragsfähig;Flächenbindung in Ha für AMA
 | 
			
		||||
                """;
 | 
			
		||||
            var c = App.Client;
 | 
			
		||||
            var (a1, a2) = Utils.SplitAddress(c.Address);
 | 
			
		||||
            _clientData = $"{c.LfbisNr};{c.NameFull};;{a1};{a2};{c.Plz};{c.Ort}";
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public async Task ExportAsync(int year) {
 | 
			
		||||
            using var cnx = await AppDbContext.ConnectAsync();
 | 
			
		||||
            using var cmd = cnx.CreateCommand();
 | 
			
		||||
            cmd.CommandText = $"""
 | 
			
		||||
                SELECT lfbis_nr, family_name, name, billing_name, address, plz, ort, area,
 | 
			
		||||
                       date, weight, type, sortid, qualid, year, hkid, kmw, oe
 | 
			
		||||
                FROM v_bki_delivery
 | 
			
		||||
                WHERE year = {year}
 | 
			
		||||
                """;
 | 
			
		||||
            var r = await cmd.ExecuteReaderAsync();
 | 
			
		||||
            List<Row> rows = new();
 | 
			
		||||
            while (await r.ReadAsync()) {
 | 
			
		||||
                rows.Add(new(
 | 
			
		||||
                    (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetInt32(7)),
 | 
			
		||||
                    (r.GetString(8), r.GetInt32(9), r.GetString(10), r.GetString(11), r.GetString(12), r.GetInt32(13), r.GetString(14), r.GetDouble(15), r.GetDouble(16))
 | 
			
		||||
                ));
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            await ExportAsync(rows);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public void Export(int year) {
 | 
			
		||||
            ExportAsync(year).GetAwaiter().GetResult();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public override string FormatRow(Row row) {
 | 
			
		||||
            var (member, delivery) = row;
 | 
			
		||||
            var (lfBisNr, familyName, name, billingName, address, plz, ort, area) = member;
 | 
			
		||||
            var (date, weight, type, sortid, qualid, year, hkid, kmw, oe) = delivery;
 | 
			
		||||
 | 
			
		||||
            var (n1, n2) = billingName == null ? (familyName, name) : Utils.SplitName(billingName, familyName);
 | 
			
		||||
            var (a1, a2) = Utils.SplitAddress(address);
 | 
			
		||||
            var memberData = $"{lfBisNr};{n1};{n2};{a1};{a2};{plz};{ort}";
 | 
			
		||||
            var deliveryData = $"{string.Join(".", date.Split("-").Reverse())};{weight};TB;{(type == "W" ? "J" : "")};{(type == "R" ? "J" : "")};{sortid};;;{qualid};{year};{hkid};{kmw:0.0};{oe:0}";
 | 
			
		||||
            var vollData = $"N;;;{area / 10_000.0}";
 | 
			
		||||
 | 
			
		||||
            return $"{_clientData};{memberData};{deliveryData};{vollData}";
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,61 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.IO;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Export {
 | 
			
		||||
    public class Csv {
 | 
			
		||||
    public abstract class Csv<T> : IExporter<T> {
 | 
			
		||||
 | 
			
		||||
        public static string FileExtension => "csv";
 | 
			
		||||
 | 
			
		||||
        private readonly StreamWriter _writer;
 | 
			
		||||
        protected readonly char Separator;
 | 
			
		||||
        protected string? Header;
 | 
			
		||||
 | 
			
		||||
        public Csv(string filename, char separator = ';') : this(filename, separator, Utils.UTF8) { }
 | 
			
		||||
 | 
			
		||||
        public Csv(string filename, char separator, Encoding encoding) {
 | 
			
		||||
            _writer = new StreamWriter(filename, false, encoding);
 | 
			
		||||
            Separator = separator;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public void Dispose() {
 | 
			
		||||
            GC.SuppressFinalize(this);
 | 
			
		||||
            _writer.Dispose();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public ValueTask DisposeAsync() {
 | 
			
		||||
            GC.SuppressFinalize(this);
 | 
			
		||||
            return _writer.DisposeAsync();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public async Task ExportAsync(IEnumerable<T> data, IProgress<double>? progress = null) {
 | 
			
		||||
            progress?.Report(0.0);
 | 
			
		||||
            int count = data.Count() + 2, i = 0;
 | 
			
		||||
 | 
			
		||||
            if (Header != null) await _writer.WriteLineAsync(Header);
 | 
			
		||||
            progress?.Report(100.0 * ++i / count);
 | 
			
		||||
 | 
			
		||||
            foreach (var row in data) {
 | 
			
		||||
                await _writer.WriteLineAsync(FormatRow(row));
 | 
			
		||||
                progress?.Report(100.0 * ++i / count);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            await _writer.FlushAsync();
 | 
			
		||||
            progress?.Report(100.0);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public void Export(IEnumerable<T> data, IProgress<double>? progress = null) {
 | 
			
		||||
            ExportAsync(data, progress).GetAwaiter().GetResult();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public string FormatRow(IEnumerable row) {
 | 
			
		||||
            return string.Join(Separator, row);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public abstract string FormatRow(T row);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,15 +1,109 @@
 | 
			
		||||
using Elwig.Helpers.Billing;
 | 
			
		||||
using Elwig.Models;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.IO;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Export {
 | 
			
		||||
    public class Ebics : IBankingProvider {
 | 
			
		||||
    public class Ebics : IBankingExporter {
 | 
			
		||||
 | 
			
		||||
        public string FileExtension => "xml";
 | 
			
		||||
        public static string FileExtension => "xml";
 | 
			
		||||
 | 
			
		||||
        public Task Export(string filename, int avnr, IEnumerable<Member> members) {
 | 
			
		||||
            throw new NotImplementedException();
 | 
			
		||||
        private readonly StreamWriter _writer;
 | 
			
		||||
        private readonly DateOnly _date;
 | 
			
		||||
        private readonly int _year;
 | 
			
		||||
        private readonly string _name;
 | 
			
		||||
        private readonly int _nr;
 | 
			
		||||
 | 
			
		||||
        public Ebics(PaymentVar variant, string filename) {
 | 
			
		||||
            _writer = new(filename, false, Utils.UTF8);
 | 
			
		||||
            _date = variant.TransferDate ?? DateOnly.Parse("2021-01-10"); //throw new ArgumentException("TransferDate has to be set in PaymentVar");
 | 
			
		||||
            _year = variant.Year;
 | 
			
		||||
            _name = variant.Name;
 | 
			
		||||
            _nr = variant.AvNr;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public void Dispose() {
 | 
			
		||||
            GC.SuppressFinalize(this);
 | 
			
		||||
            _writer.Dispose();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public ValueTask DisposeAsync() {
 | 
			
		||||
            GC.SuppressFinalize(this);
 | 
			
		||||
            return _writer.DisposeAsync();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public void Export(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) {
 | 
			
		||||
            ExportAsync(transactions, progress).GetAwaiter().GetResult();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public async Task ExportAsync(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) {
 | 
			
		||||
            progress?.Report(0.0);
 | 
			
		||||
            var nbOfTxs = transactions.Count();
 | 
			
		||||
            int count = nbOfTxs + 2, i = 0;
 | 
			
		||||
            var ctrlSum = Transaction.FormatAmountCent(transactions.Sum(tx => tx.AmountCent));
 | 
			
		||||
            var msgId = $"ELWIG-{App.Client.NameToken}-{_year}-AV{_nr:00}";
 | 
			
		||||
            var pmtInfId = $"{msgId}-1";
 | 
			
		||||
 | 
			
		||||
            await _writer.WriteLineAsync($"""
 | 
			
		||||
                <?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
                <Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09"
 | 
			
		||||
                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 | 
			
		||||
                          xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09 pain.001.001.09.xsd">
 | 
			
		||||
                  <CstmrCdtTrfInitn>
 | 
			
		||||
                    <GrpHdr>
 | 
			
		||||
                      <MsgId>{msgId}</MsgId>
 | 
			
		||||
                      <CreDtTm>{DateTime.UtcNow:o}</CreDtTm>
 | 
			
		||||
                      <NbOfTxs>{nbOfTxs}</NbOfTxs>
 | 
			
		||||
                      <CtrlSum>{ctrlSum}</CtrlSum>
 | 
			
		||||
                      <InitgPty><Nm>{App.Client.NameFull}</Nm></InitgPty>
 | 
			
		||||
                    </GrpHdr>
 | 
			
		||||
                    <PmtInf>
 | 
			
		||||
                      <PmtInfId>{pmtInfId}</PmtInfId>
 | 
			
		||||
                      <PmtMtd>TRF</PmtMtd>
 | 
			
		||||
                      <NbOfTxs>{nbOfTxs}</NbOfTxs>
 | 
			
		||||
                      <CtrlSum>{ctrlSum}</CtrlSum>
 | 
			
		||||
                      <ReqdExctnDt><Dt>{_date:yyyy-MM-dd}</Dt></ReqdExctnDt>
 | 
			
		||||
                      <Dbtr><Nm>{App.Client.NameFull}</Nm></Dbtr>
 | 
			
		||||
                      <DbtrAcct><Id><IBAN>{App.Client.Iban?.Replace(" ", "")}</IBAN></Id></DbtrAcct>
 | 
			
		||||
                      <DbtrAgt><FinInstnId><BICFI>{App.Client.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></DbtrAgt>
 | 
			
		||||
                """);
 | 
			
		||||
            progress?.Report(100.0 * ++i / count);
 | 
			
		||||
 | 
			
		||||
            foreach (var tx in transactions) {
 | 
			
		||||
                var a = (IAddress?)tx.Member.BillingAddress ?? tx.Member;
 | 
			
		||||
                var (a1, a2) = Utils.SplitAddress(a.Address);
 | 
			
		||||
                var id = $"ELWIG-{App.Client.NameToken}-{_year}-TG{tx.Nr:0000}";
 | 
			
		||||
                var info = $"{_name} - Traubengutschrift {_year}/{tx.Nr:000}";
 | 
			
		||||
                await _writer.WriteLineAsync($"""
 | 
			
		||||
                          <CdtTrfTxInf>
 | 
			
		||||
                            <PmtId><EndToEndId>{id}</EndToEndId></PmtId>
 | 
			
		||||
                            <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmountCent(tx.AmountCent)}</InstdAmt></Amt>
 | 
			
		||||
                            <Cdtr>
 | 
			
		||||
                              <Nm>{a.Name}</Nm>
 | 
			
		||||
                              <PstlAdr>
 | 
			
		||||
                                <StrtNm>{a1}</StrtNm><BldgNb>{a2}</BldgNb>
 | 
			
		||||
                                <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{a.PostalDest.AtPlz?.Ort.Name}</TwnNm>
 | 
			
		||||
                                <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>
 | 
			
		||||
                              </PstlAdr>
 | 
			
		||||
                            </Cdtr>
 | 
			
		||||
                            <CdtrAcct><Id><IBAN>{tx.Member.Iban}</IBAN></Id><CdtrAcct>
 | 
			
		||||
                            <CdtrAgt><FinInstnId><BICFI>{tx.Member.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></CdtrAgt>
 | 
			
		||||
                            <RmtInf><Ustrd>{info}</Ustrd></RmtInf>
 | 
			
		||||
                          </CdtTrfTxInf>
 | 
			
		||||
                    """);
 | 
			
		||||
                progress?.Report(100.0 * ++i / count);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            await _writer.WriteLineAsync("""
 | 
			
		||||
                    </PmtInf>
 | 
			
		||||
                  </CstmrCdtTrfInitn>
 | 
			
		||||
                </Document>
 | 
			
		||||
                """);
 | 
			
		||||
            await _writer.FlushAsync();
 | 
			
		||||
            progress?.Report(100.0);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,14 +1,14 @@
 | 
			
		||||
using Elwig.Models;
 | 
			
		||||
using Elwig.Helpers.Billing;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Export {
 | 
			
		||||
    public class Elba : IBankingProvider {
 | 
			
		||||
    public class Elba : Csv<Transaction>, IBankingExporter {
 | 
			
		||||
 | 
			
		||||
        public string FileExtension => "elba";
 | 
			
		||||
        public static new string FileExtension => "elba";
 | 
			
		||||
 | 
			
		||||
        public Task Export(string filename, int avnr, IEnumerable<Member> members) {
 | 
			
		||||
        public Elba(string filename) : base(filename) { }
 | 
			
		||||
 | 
			
		||||
        public override string FormatRow(Transaction row) {
 | 
			
		||||
            throw new NotImplementedException();
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										8
									
								
								Elwig/Helpers/Export/IBankingExporter.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								Elwig/Helpers/Export/IBankingExporter.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,8 @@
 | 
			
		||||
using Elwig.Helpers.Billing;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Export {
 | 
			
		||||
    /// <summary>
 | 
			
		||||
    /// Interface for exporting banking data
 | 
			
		||||
    /// </summary>
 | 
			
		||||
    public interface IBankingExporter : IExporter<Transaction> { }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,24 +0,0 @@
 | 
			
		||||
using Elwig.Models;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Export {
 | 
			
		||||
    /// <summary>
 | 
			
		||||
    /// Interface for exporting banking data
 | 
			
		||||
    /// </summary>
 | 
			
		||||
    public interface IBankingProvider {
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// The default file extension of the exported files to be used (whithout a preceding ".")
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        string FileExtension { get; }
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// Export the member payment data of the given payment variant to the given file.
 | 
			
		||||
        /// (The amount of the last payed variant is deducted from the calculated amount.)
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        /// <param name="filename">The file to export the data to</param>
 | 
			
		||||
        /// <param name="avnr">The number of the payment variant to export</param>
 | 
			
		||||
        /// <param name="members">The members whose data to include in the export</param>
 | 
			
		||||
        Task Export(string filename, int avnr, IEnumerable<Member> members);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										26
									
								
								Elwig/Helpers/Export/IExporter.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								Elwig/Helpers/Export/IExporter.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,26 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Export {
 | 
			
		||||
    public interface IExporter<T> : IDisposable, IAsyncDisposable {
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// The default file extension of the exported files to be used (whithout a preceding ".")
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        static abstract string FileExtension { get; }
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// Export the given data to the given file.
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        /// <param name="data">The data to be exported</param>
 | 
			
		||||
        /// <param name="progress">The progress object to report to</param>
 | 
			
		||||
        void Export(IEnumerable<T> data, IProgress<double>? progress = null);
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// Asynchronosly export the given data to the given file.
 | 
			
		||||
        /// </summary>
 | 
			
		||||
        /// <param name="data">The data to be exported</param>
 | 
			
		||||
        /// <param name="progress">The progress object to report to</param>
 | 
			
		||||
        Task ExportAsync(IEnumerable<T> data, IProgress<double>? progress = null);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										9
									
								
								Elwig/Helpers/IAddress.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								Elwig/Helpers/IAddress.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,9 @@
 | 
			
		||||
using Elwig.Models;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers {
 | 
			
		||||
    public interface IAddress {
 | 
			
		||||
        string Name { get; }
 | 
			
		||||
        string Address { get; }
 | 
			
		||||
        PostalDest PostalDest { get; }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -15,6 +15,8 @@ using Elwig.Models;
 | 
			
		||||
namespace Elwig.Helpers {
 | 
			
		||||
    public static partial class Utils {
 | 
			
		||||
 | 
			
		||||
        public static readonly Encoding UTF8 = new UTF8Encoding(false, true);
 | 
			
		||||
 | 
			
		||||
        public static int CurrentYear => DateTime.Now.Year;
 | 
			
		||||
        public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
 | 
			
		||||
        public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 7 ? 1 : 0);
 | 
			
		||||
@@ -25,6 +27,7 @@ namespace Elwig.Helpers {
 | 
			
		||||
        public static readonly Regex PartialDateRegex = GeneratedPartialDateRegex();
 | 
			
		||||
        public static readonly Regex FromToRegex = GeneratedFromToRegex();
 | 
			
		||||
        public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
 | 
			
		||||
        public static readonly Regex AddressRegex = GeneratedAddressRegex();
 | 
			
		||||
 | 
			
		||||
        [GeneratedRegex("^serial://([A-Za-z0-9]+):([0-9]+)(,([5-9]),([NOEMSnoems]),(0|1|1\\.5|2|))?$", RegexOptions.Compiled)]
 | 
			
		||||
        private static partial Regex GeneratedSerialRegex();
 | 
			
		||||
@@ -41,6 +44,9 @@ namespace Elwig.Helpers {
 | 
			
		||||
        [GeneratedRegex(@"^([0-9]{1,2}:[0-9]{2})?-([0-9]{1,2}:[0-9]{2})?$", RegexOptions.Compiled)]
 | 
			
		||||
        private static partial Regex GeneratedFromToTimeRegex();
 | 
			
		||||
 | 
			
		||||
        [GeneratedRegex(@"^(.*?) +([0-9].*)$", RegexOptions.Compiled)]
 | 
			
		||||
        private static partial Regex GeneratedAddressRegex();
 | 
			
		||||
 | 
			
		||||
        private static readonly ushort[] Crc16ModbusTable = {
 | 
			
		||||
            0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
 | 
			
		||||
            0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
 | 
			
		||||
@@ -213,8 +219,8 @@ namespace Elwig.Helpers {
 | 
			
		||||
                .Sum();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public static (int, string?)? ShowManualWeighingDialog() {
 | 
			
		||||
            var d = new ManualWeighingDialog();
 | 
			
		||||
        public static (int, string?)? ShowManualWeighingDialog(string? reason = null) {
 | 
			
		||||
            var d = new ManualWeighingDialog(reason);
 | 
			
		||||
            return d.ShowDialog() == true ? (d.Weight, d.Reason) : null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@@ -292,5 +298,30 @@ namespace Elwig.Helpers {
 | 
			
		||||
        public static string GenerateLsNr(Delivery d) => GenerateLsNr(d.Date, d.ZwstId, d.LNr);
 | 
			
		||||
 | 
			
		||||
        public static string GenerateLsNr(DateOnly date, string zwstid, int lnr) => $"{date:yyyyMMdd}{zwstid}{lnr:000}";
 | 
			
		||||
 | 
			
		||||
        public static (string, string?) SplitAddress(string address) {
 | 
			
		||||
            var m = AddressRegex.Match(address);
 | 
			
		||||
            return (m.Groups[1].Value, m.Groups[2].Value);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public static (string, string?) SplitName(string fullName, string? familyName) {
 | 
			
		||||
            if (familyName == null || familyName == "") return (fullName, null);
 | 
			
		||||
            var p0 = fullName.ToLower().IndexOf(familyName.ToLower());
 | 
			
		||||
            if (p0 == -1) return (fullName, null);
 | 
			
		||||
            var p1 = fullName.IndexOf(" und ");
 | 
			
		||||
            var p2 = fullName.ToLower().LastIndexOf(" und ");
 | 
			
		||||
            if (p1 != p2) {
 | 
			
		||||
                if (p0 > p1) {
 | 
			
		||||
                    // A und B familyName [und ...]
 | 
			
		||||
                    return (fullName[p0..^0], fullName[0..(p0 - 1)]);
 | 
			
		||||
                } else {
 | 
			
		||||
                    // familyName und ... A und B
 | 
			
		||||
                    var p3 = fullName.LastIndexOf(' ', p2 - 1);
 | 
			
		||||
                    return (fullName[0..p3], fullName[(p3 + 1)..^0]);
 | 
			
		||||
                }
 | 
			
		||||
            } else {
 | 
			
		||||
                return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										44
									
								
								Elwig/Helpers/Weighing/InvalidScale.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								Elwig/Helpers/Weighing/InvalidScale.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,44 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Helpers.Weighing {
 | 
			
		||||
    public class InvalidScale : IScale {
 | 
			
		||||
 | 
			
		||||
        public string Manufacturer => "NONE";
 | 
			
		||||
        public string Model => "NONE";
 | 
			
		||||
        public string ScaleId { get; private set; }
 | 
			
		||||
        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();
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,9 +1,10 @@
 | 
			
		||||
using Elwig.Helpers;
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using System.ComponentModel.DataAnnotations.Schema;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Models {
 | 
			
		||||
    [Table("member_billing_address"), PrimaryKey("MgNr")]
 | 
			
		||||
    public class BillingAddr {
 | 
			
		||||
    public class BillingAddr : IAddress {
 | 
			
		||||
        [Column("mgnr")]
 | 
			
		||||
        public int MgNr { get; set; }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										104
									
								
								Elwig/Models/Credit.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										104
									
								
								Elwig/Models/Credit.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,104 @@
 | 
			
		||||
using Elwig.Helpers;
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using System;
 | 
			
		||||
using System.ComponentModel.DataAnnotations.Schema;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Models {
 | 
			
		||||
    [Table("credit"), PrimaryKey("Year", "TgNr"), Index("Year", "AvNr", "MgNr", IsUnique = true)]
 | 
			
		||||
    public class Credit {
 | 
			
		||||
        [Column("year")]
 | 
			
		||||
        public int Year { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("tgnr")]
 | 
			
		||||
        public int TgNr { get; set; }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public string TgId => $"{Year}/{TgNr:000}";
 | 
			
		||||
 | 
			
		||||
        [Column("mgnr")]
 | 
			
		||||
        public int MgNr { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("avnr")]
 | 
			
		||||
        public int AvNr { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("net_amount")]
 | 
			
		||||
        public long NetAmountValue { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal NetAmount {
 | 
			
		||||
            get => Utils.DecFromDb(NetAmountValue, 2);
 | 
			
		||||
            set => NetAmountValue = Utils.DecToDb(value, 2);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("prev_net_amount")]
 | 
			
		||||
        public long? PrevNetAmountValue { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? PrevNetAmount {
 | 
			
		||||
            get => PrevNetAmountValue != null ? Utils.DecFromDb(PrevNetAmountValue.Value, 2) : null;
 | 
			
		||||
            set => PrevNetAmountValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("vat")]
 | 
			
		||||
        public double VatValue { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal Vat {
 | 
			
		||||
            get => (decimal)VatValue;
 | 
			
		||||
            set => VatValue = (double)value;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("vat_amount")]
 | 
			
		||||
        public long VatAmountValue { get; private set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal VatAmount {
 | 
			
		||||
            get => Utils.DecFromDb(VatAmountValue, 2);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("gross_amount")]
 | 
			
		||||
        public long GrossAmountValue { get; private set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal GrossAmount {
 | 
			
		||||
            get => Utils.DecFromDb(GrossAmountValue, 2);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("modifiers")]
 | 
			
		||||
        public long? ModifiersValue { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Modifiers {
 | 
			
		||||
            get => ModifiersValue != null ? Utils.DecFromDb(ModifiersValue.Value, 2) : null;
 | 
			
		||||
            set => ModifiersValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("prev_modifiers")]
 | 
			
		||||
        public long? PrevModifiersValue { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? PrevModifiers {
 | 
			
		||||
            get => PrevModifiersValue != null ? Utils.DecFromDb(PrevModifiersValue.Value, 2) : null;
 | 
			
		||||
            set => PrevModifiersValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("amount")]
 | 
			
		||||
        public long AmountValue { get; private set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal Amount {
 | 
			
		||||
            get => Utils.DecFromDb(AmountValue, 2);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("ctime")]
 | 
			
		||||
        public long CTime { get; private set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 | 
			
		||||
 | 
			
		||||
        [Column("mtime")]
 | 
			
		||||
        public long MTime { get; private set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("Year, AvNr, MgNr")]
 | 
			
		||||
        public virtual PaymentMember Payment { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("Year, AvNr")]
 | 
			
		||||
        public virtual PaymentVar Variant { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("MgNr")]
 | 
			
		||||
        public virtual Member Member { get; private set; }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -19,12 +19,8 @@ namespace Elwig.Models {
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public DateOnly Date {
 | 
			
		||||
            get {
 | 
			
		||||
                return DateOnly.ParseExact(DateString, "yyyy-MM-dd");
 | 
			
		||||
            }
 | 
			
		||||
            set {
 | 
			
		||||
                DateString = value.ToString("yyyy-MM-dd");
 | 
			
		||||
            }
 | 
			
		||||
            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
 | 
			
		||||
            set => DateString = value.ToString("yyyy-MM-dd");
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("time")]
 | 
			
		||||
@@ -32,19 +28,13 @@ namespace Elwig.Models {
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public TimeOnly? Time {
 | 
			
		||||
            get {
 | 
			
		||||
                return (TimeString == null) ? null : TimeOnly.ParseExact(TimeString, "HH:mm:ss");
 | 
			
		||||
            }
 | 
			
		||||
            set {
 | 
			
		||||
                TimeString = value?.ToString("HH:mm:ss");
 | 
			
		||||
            }
 | 
			
		||||
            get => (TimeString == null) ? null : TimeOnly.ParseExact(TimeString, "HH:mm:ss");
 | 
			
		||||
            set => TimeString = value?.ToString("HH:mm:ss");
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public DateTime DateTime {
 | 
			
		||||
            get {
 | 
			
		||||
                return Date.ToDateTime(Time ?? TimeOnly.MinValue);
 | 
			
		||||
            }
 | 
			
		||||
            get => Date.ToDateTime(Time ?? TimeOnly.MinValue);
 | 
			
		||||
            set {
 | 
			
		||||
                Date = DateOnly.FromDateTime(value);
 | 
			
		||||
                Time = TimeOnly.FromDateTime(value);
 | 
			
		||||
@@ -72,6 +62,9 @@ namespace Elwig.Models {
 | 
			
		||||
        [Column("comment")]
 | 
			
		||||
        public string? Comment { get; set; }
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("Year")]
 | 
			
		||||
        public virtual Season Season { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [InverseProperty("Delivery")]
 | 
			
		||||
        public virtual ISet<DeliveryPart> Parts { get; private set; }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -30,15 +30,10 @@ namespace Elwig.Models {
 | 
			
		||||
 | 
			
		||||
        [Column("kmw")]
 | 
			
		||||
        public double Kmw { get; set; }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public double Oe {
 | 
			
		||||
            get {
 | 
			
		||||
                return Utils.KmwToOe(Kmw);
 | 
			
		||||
            }
 | 
			
		||||
            set {
 | 
			
		||||
                Kmw = Utils.OeToKmw(value);
 | 
			
		||||
            }
 | 
			
		||||
            get => Utils.KmwToOe(Kmw);
 | 
			
		||||
            set => Kmw = Utils.OeToKmw(value);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("qualid")]
 | 
			
		||||
@@ -107,6 +102,10 @@ namespace Elwig.Models {
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier).OrderBy(m => m.Ordering);
 | 
			
		||||
 | 
			
		||||
        [InverseProperty("DeliveryPart")]
 | 
			
		||||
        public virtual PaymentDeliveryPart? Payment { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@ using System.Linq;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Models {
 | 
			
		||||
    [Table("member"), PrimaryKey("MgNr")]
 | 
			
		||||
    public class Member {
 | 
			
		||||
    public class Member : IAddress {
 | 
			
		||||
        [Column("mgnr")]
 | 
			
		||||
        public int MgNr { get; set; }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										158
									
								
								Elwig/Models/PaymentDeliveryPart.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										158
									
								
								Elwig/Models/PaymentDeliveryPart.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,158 @@
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.ComponentModel.DataAnnotations.Schema;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Models {
 | 
			
		||||
    [Table("payment_delivery_part"), PrimaryKey("Year", "DId", "DPNr", "AvNr")]
 | 
			
		||||
    public class PaymentDeliveryPart {
 | 
			
		||||
        [Column("year")]
 | 
			
		||||
        public int Year { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("did")]
 | 
			
		||||
        public int DId { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("dpnr")]
 | 
			
		||||
        public int DPNr { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("avnr")]
 | 
			
		||||
        public int AvNr { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("mod_abs")]
 | 
			
		||||
        public long ModAbsValue { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal ModAbs {
 | 
			
		||||
            get => Variant.Season.DecFromDb(ModAbsValue);
 | 
			
		||||
            set => ModAbsValue = Variant.Season.DecToDb(value);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("mod_rel")]
 | 
			
		||||
        public double ModRelValue { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal ModRel {
 | 
			
		||||
            get => (decimal)ModRelValue;
 | 
			
		||||
            set => ModRelValue = (double)value;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_1")]
 | 
			
		||||
        public int? Bucket1 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_2")]
 | 
			
		||||
        public int? Bucket2 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_3")]
 | 
			
		||||
        public int? Bucket3 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_4")]
 | 
			
		||||
        public int? Bucket4 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_5")]
 | 
			
		||||
        public int? Bucket5 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_6")]
 | 
			
		||||
        public int? Bucket6 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_7")]
 | 
			
		||||
        public int? Bucket7 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_8")]
 | 
			
		||||
        public int? Bucket8 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("bucket_9")]
 | 
			
		||||
        public int? Bucket9 { get; set; }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public int[] Buckets => (new int?[] { Bucket1, Bucket2, Bucket3, Bucket4, Bucket5, Bucket6, Bucket7, Bucket8, Bucket9 })
 | 
			
		||||
            .Where(b => b != null).Select(b => b.Value).ToArray();
 | 
			
		||||
 | 
			
		||||
        [Column("price_1")]
 | 
			
		||||
        public long? Price1Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price1 {
 | 
			
		||||
            get => Price1Value != null ? Variant.Season.DecFromDb(Price1Value.Value) : null;
 | 
			
		||||
            set => Price1Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("price_2")]
 | 
			
		||||
        public long? Price2Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price2 {
 | 
			
		||||
			get => Price2Value != null ? Variant.Season.DecFromDb(Price2Value.Value) : null;
 | 
			
		||||
			set => Price2Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
        [Column("price_3")]
 | 
			
		||||
        public long? Price3Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price3 {
 | 
			
		||||
			get => Price3Value != null ? Variant.Season.DecFromDb(Price3Value.Value) : null;
 | 
			
		||||
			set => Price3Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
        [Column("price_4")]
 | 
			
		||||
        public long? Price4Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price4 {
 | 
			
		||||
			get => Price4Value != null ? Variant.Season.DecFromDb(Price4Value.Value) : null;
 | 
			
		||||
			set => Price4Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
        [Column("price_5")]
 | 
			
		||||
        public long? Price5Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price5 {
 | 
			
		||||
			get => Price5Value != null ? Variant.Season.DecFromDb(Price5Value.Value) : null;
 | 
			
		||||
			set => Price5Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
        [Column("price_6")]
 | 
			
		||||
        public long? Price6Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price6 {
 | 
			
		||||
			get => Price6Value != null ? Variant.Season.DecFromDb(Price6Value.Value) : null;
 | 
			
		||||
			set => Price6Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
        [Column("price_7")]
 | 
			
		||||
        public long? Price7Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price7 {
 | 
			
		||||
			get => Price7Value != null ? Variant.Season.DecFromDb(Price7Value.Value) : null;
 | 
			
		||||
			set => Price7Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
        [Column("price_8")]
 | 
			
		||||
        public long? Price8Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price8 {
 | 
			
		||||
			get => Price8Value != null ? Variant.Season.DecFromDb(Price8Value.Value) : null;
 | 
			
		||||
			set => Price8Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
        [Column("price_9")]
 | 
			
		||||
        public long? Price9Value { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Price9 {
 | 
			
		||||
			get => Price9Value != null ? Variant.Season.DecFromDb(Price9Value.Value) : null;
 | 
			
		||||
			set => Price9Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
        [Column("amount")]
 | 
			
		||||
        public long? AmountValue { get; set; }
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal? Amount {
 | 
			
		||||
            get => AmountValue != null ? Variant.Season.DecFromDb(AmountValue.Value) : null;
 | 
			
		||||
            set => AmountValue = value != null ? Variant.Season.DecToDb(value.Value) : null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal[] Prices => (new decimal?[] { Price1, Price2, Price3, Price4, Price5, Price6, Price7, Price8, Price9 })
 | 
			
		||||
            .Where(p => p != null).Select(p => p.Value).ToArray();
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("Year, AvNr")]
 | 
			
		||||
        public virtual PaymentVar Variant { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("Year, DId, DPNr")]
 | 
			
		||||
        public virtual DeliveryPart DeliveryPart { get; private set; }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										34
									
								
								Elwig/Models/PaymentMember.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								Elwig/Models/PaymentMember.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,34 @@
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using System.ComponentModel.DataAnnotations.Schema;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Models {
 | 
			
		||||
    [Table("payment_member"), PrimaryKey("Year", "AvNr", "MgNr")]
 | 
			
		||||
    public class PaymentMember {
 | 
			
		||||
        [Column("year")]
 | 
			
		||||
        public int Year { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("avnr")]
 | 
			
		||||
        public int AvNr { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("mgnr")]
 | 
			
		||||
        public int MgNr { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("amount")]
 | 
			
		||||
        public long AmountValue { get; set; }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public decimal Amount {
 | 
			
		||||
            get => Variant.Season.DecFromDb(AmountValue);
 | 
			
		||||
            set => AmountValue = Variant.Season.DecToDb(value);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("Year, AvNr")]
 | 
			
		||||
        public virtual PaymentVar Variant { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("MgNr")]
 | 
			
		||||
        public virtual Member Member { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [InverseProperty("Payment")]
 | 
			
		||||
        public virtual Credit? Credit { get; private set; }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -1,6 +1,8 @@
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.ComponentModel.DataAnnotations.Schema;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Models {
 | 
			
		||||
    [Table("payment_variant"), PrimaryKey("Year", "AvNr")]
 | 
			
		||||
@@ -19,12 +21,17 @@ namespace Elwig.Models {
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public DateOnly Date {
 | 
			
		||||
            get {
 | 
			
		||||
                return DateOnly.ParseExact(DateString, "yyyy-MM-dd");
 | 
			
		||||
            }
 | 
			
		||||
            set {
 | 
			
		||||
                DateString = value.ToString("yyyy-MM-dd");
 | 
			
		||||
            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
 | 
			
		||||
            set => DateString = value.ToString("yyyy-MM-dd");
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("transfer_date")]
 | 
			
		||||
        public string? TransferDateString { get; set; }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public DateOnly? TransferDate {
 | 
			
		||||
            get => TransferDateString != null ? DateOnly.ParseExact(TransferDateString, "yyyy-MM-dd") : null;
 | 
			
		||||
            set => TransferDateString = value?.ToString("yyyy-MM-dd");
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Column("test_variant")]
 | 
			
		||||
@@ -60,10 +67,23 @@ namespace Elwig.Models {
 | 
			
		||||
        [Column("bucket_9_name")]
 | 
			
		||||
        public string? Bucket9Name { get; set; }
 | 
			
		||||
 | 
			
		||||
        [NotMapped]
 | 
			
		||||
        public string[] BucketNames => (new string?[] { Bucket1Name, Bucket2Name, Bucket3Name, Bucket4Name, Bucket5Name, Bucket6Name, Bucket7Name, Bucket8Name, Bucket9Name })
 | 
			
		||||
			.Where(n => n != null).Select(n => n ?? "").ToArray();
 | 
			
		||||
 | 
			
		||||
        [Column("comment")]
 | 
			
		||||
        public string? Comment { get; set; }
 | 
			
		||||
 | 
			
		||||
        [Column("data")]
 | 
			
		||||
        public string Data { get; set; }
 | 
			
		||||
 | 
			
		||||
        [ForeignKey("Year")]
 | 
			
		||||
        public virtual Season Season { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [InverseProperty("Variant")]
 | 
			
		||||
        public virtual ISet<PaymentMember> MemberPayments { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [InverseProperty("Variant")]
 | 
			
		||||
        public virtual ISet<Credit> Credits { get; private set; }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -48,6 +48,12 @@ namespace Elwig.Models {
 | 
			
		||||
        [InverseProperty("Season")]
 | 
			
		||||
        public virtual ISet<Modifier> Modifiers { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [InverseProperty("Season")]
 | 
			
		||||
        public virtual ISet<PaymentVar> PaymentVariants { get; private set; }
 | 
			
		||||
 | 
			
		||||
        [InverseProperty("Season")]
 | 
			
		||||
        public virtual ISet<Delivery> Deliveries { get; private set; }
 | 
			
		||||
 | 
			
		||||
        public decimal DecFromDb(long value) {
 | 
			
		||||
            return Utils.DecFromDb(value, Precision);
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -18,6 +18,9 @@ namespace Elwig.Models {
 | 
			
		||||
 | 
			
		||||
        public string CommentFormat => (Comment != null) ? $" ({Comment})" : "";
 | 
			
		||||
 | 
			
		||||
        public bool IsRed => Type == "R";
 | 
			
		||||
        public bool IsWhite => Type == "W";
 | 
			
		||||
 | 
			
		||||
        public override string ToString() {
 | 
			
		||||
            return Name;
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -32,6 +32,7 @@ namespace Elwig.Windows {
 | 
			
		||||
                LockContext = IsEditing;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        protected bool DoShowWarningWindows = true;
 | 
			
		||||
        protected bool IsClosing { get; private set; }
 | 
			
		||||
 | 
			
		||||
        private TextBox[] TextBoxInputs;
 | 
			
		||||
@@ -81,6 +82,14 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void OnClosing(object? sender, CancelEventArgs evt) {
 | 
			
		||||
            if ((IsCreating || IsEditing) && HasChanged) {
 | 
			
		||||
                var r = System.Windows.MessageBox.Show("Soll das Fenster wirklich geschlossen werden?", "Schlie<69>en best<73>tigen",
 | 
			
		||||
                    MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
 | 
			
		||||
                if (r != MessageBoxResult.Yes) {
 | 
			
		||||
                    evt.Cancel = true;
 | 
			
		||||
                    return;
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            IsClosing = true;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@@ -292,12 +301,20 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        protected bool HasChanged =>
 | 
			
		||||
            IsEditing && (
 | 
			
		||||
                !IsValid ||
 | 
			
		||||
                TextBoxInputs.Any(InputHasChanged) ||
 | 
			
		||||
                ComboBoxInputs.Any(InputHasChanged) ||
 | 
			
		||||
                CheckComboBoxInputs.Any(InputHasChanged) ||
 | 
			
		||||
                CheckBoxInputs.Any(InputHasChanged) ||
 | 
			
		||||
            RadioButtonInputs.Any(InputHasChanged);
 | 
			
		||||
                RadioButtonInputs.Any(InputHasChanged)
 | 
			
		||||
            ) || IsCreating && (
 | 
			
		||||
                TextBoxInputs.Any(i => InputIsNotDefault(i) || (!i.IsReadOnly && i.Text != "")) ||
 | 
			
		||||
                ComboBoxInputs.Any(i => InputIsNotDefault(i) || (i.IsEnabled && i.SelectedItem != null)) ||
 | 
			
		||||
                CheckComboBoxInputs.Any(i => InputIsNotDefault(i) || i.SelectedItem != null) ||
 | 
			
		||||
                CheckBoxInputs.Any(InputIsNotDefault) ||
 | 
			
		||||
                RadioButtonInputs.Any(InputIsNotDefault)
 | 
			
		||||
            );
 | 
			
		||||
 | 
			
		||||
        protected void UpdatePlz(TextBox plzInput, ComboBox ortInput) {
 | 
			
		||||
            var plzInputValid = GetInputValid(plzInput);
 | 
			
		||||
@@ -363,7 +380,7 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        protected bool InputLostFocus(TextBox input, ValidationResult res, string? msg = null) {
 | 
			
		||||
            if (!res.IsValid && !IsClosing && (IsEditing || IsCreating))
 | 
			
		||||
            if (DoShowWarningWindows && !res.IsValid && !IsClosing && (IsEditing || IsCreating))
 | 
			
		||||
                System.Windows.MessageBox.Show(res.ErrorContent.ToString(), msg ?? res.ErrorContent.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning);
 | 
			
		||||
            return res.IsValid;
 | 
			
		||||
        }
 | 
			
		||||
@@ -396,7 +413,7 @@ namespace Elwig.Windows {
 | 
			
		||||
            UpdateButtons();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        protected void TextBox_TextChanged(object sender, RoutedEventArgs evt) {
 | 
			
		||||
        protected void TextBox_TextChanged(object sender, RoutedEventArgs? evt) {
 | 
			
		||||
            var input = (TextBox)sender;
 | 
			
		||||
            if (SenderIsRequired(input) && input.Text.Length == 0) {
 | 
			
		||||
                ValidateInput(input, false);
 | 
			
		||||
 
 | 
			
		||||
@@ -6,7 +6,7 @@
 | 
			
		||||
        xmlns:local="clr-namespace:Elwig.Windows"
 | 
			
		||||
        mc:Ignorable="d"
 | 
			
		||||
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
 | 
			
		||||
        Title="Flächenbindugen - Elwig" Height="480" Width="850"
 | 
			
		||||
        Title="Flächenbindungen - Elwig" Height="480" Width="850"
 | 
			
		||||
        Loaded="Window_Loaded">
 | 
			
		||||
    <Window.Resources>
 | 
			
		||||
        <Style TargetType="Label">
 | 
			
		||||
 
 | 
			
		||||
@@ -1,21 +1,17 @@
 | 
			
		||||
using System;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.ComponentModel;
 | 
			
		||||
using System.Diagnostics;
 | 
			
		||||
using System.Diagnostics.Contracts;
 | 
			
		||||
using System.Drawing;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text.Json.Nodes;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using System.Windows;
 | 
			
		||||
using System.Windows.Controls;
 | 
			
		||||
using System.Windows.Data;
 | 
			
		||||
using System.Windows.Documents;
 | 
			
		||||
using System.Windows.Input;
 | 
			
		||||
using Elwig.Helpers;
 | 
			
		||||
using Elwig.Helpers.Billing;
 | 
			
		||||
using Elwig.Models;
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using Microsoft.EntityFrameworkCore.ChangeTracking;
 | 
			
		||||
using Newtonsoft.Json.Linq;
 | 
			
		||||
using ScottPlot;
 | 
			
		||||
using ScottPlot.Plottable;
 | 
			
		||||
 | 
			
		||||
@@ -69,14 +65,14 @@ namespace Elwig.Windows {
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            PaymentVar paymentVar = paymentVars[0];
 | 
			
		||||
            var data = JToken.Parse(paymentVar.Data);
 | 
			
		||||
            var data = JsonNode.Parse(paymentVar.Data).AsObject();
 | 
			
		||||
 | 
			
		||||
            var auszahlungsSorten = data["AuszahlungSorten"];
 | 
			
		||||
            var auszahlungsSorten = data["AuszahlungSorten"]?.AsObject();
 | 
			
		||||
            if (auszahlungsSorten == null) {
 | 
			
		||||
                return;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            var Graphs = auszahlungsSorten["Kurven"];
 | 
			
		||||
            var Graphs = auszahlungsSorten["Kurven"]?.AsArray();
 | 
			
		||||
 | 
			
		||||
            if (Graphs == null) {
 | 
			
		||||
                return;
 | 
			
		||||
@@ -86,7 +82,7 @@ namespace Elwig.Windows {
 | 
			
		||||
 | 
			
		||||
            int i = 1;
 | 
			
		||||
            foreach (var graph in Graphs) {
 | 
			
		||||
                GraphsList.Add(new Graph("Oe", i, graph, ParseContracts(auszahlungsSorten, i - 1), 50, 140));
 | 
			
		||||
                GraphsList.Add(new Graph("Oe", i, graph?.AsObject(), ParseContracts(auszahlungsSorten, i - 1), 50, 140));
 | 
			
		||||
                i++;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
@@ -98,17 +94,15 @@ namespace Elwig.Windows {
 | 
			
		||||
            RefreshInputs();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private String ParseContracts(JToken auszahlungsSorten, int num) {
 | 
			
		||||
        private String ParseContracts(JsonObject auszahlungsSorten, int num) {
 | 
			
		||||
            List<string> contracts = new();
 | 
			
		||||
 | 
			
		||||
            foreach (var sorte in auszahlungsSorten.Children().OfType<JToken>()) {
 | 
			
		||||
                if (((JProperty)sorte).Name == "Kurven") {
 | 
			
		||||
                    continue;
 | 
			
		||||
                }
 | 
			
		||||
                foreach (var attribut in sorte.Values().OfType<JToken>()) {
 | 
			
		||||
                    foreach (var bindung in attribut.Values().OfType<JProperty>()) {
 | 
			
		||||
                        if ((int)(bindung).Value == num) {
 | 
			
		||||
                            contracts.Add($"{((JProperty)sorte).Name}/{((JProperty)attribut).Name}/{bindung.Name}");
 | 
			
		||||
            foreach (var sorte in auszahlungsSorten) {
 | 
			
		||||
                if (sorte.Key == "Kurven") continue;
 | 
			
		||||
                foreach (var attribut in sorte.Value.AsObject()) {
 | 
			
		||||
                    foreach (var bindung in attribut.Value.AsObject()) {
 | 
			
		||||
                        if ((int)bindung.Value.AsValue() == num) {
 | 
			
		||||
                            contracts.Add($"{sorte.Key}/{attribut.Key}/{bindung.Key}");
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
@@ -125,15 +119,14 @@ namespace Elwig.Windows {
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            PaymentVar paymentVar = paymentVars[0];
 | 
			
		||||
            var data = JToken.Parse(paymentVar.Data);
 | 
			
		||||
            var data = JsonNode.Parse(paymentVar.Data).AsObject();
 | 
			
		||||
 | 
			
		||||
            var auszahlungsSorten = data["AuszahlungSorten"];
 | 
			
		||||
            var auszahlungsSorten = data["AuszahlungSorten"]?.AsObject();
 | 
			
		||||
            if (auszahlungsSorten == null) {
 | 
			
		||||
                return false;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            var Graphs = auszahlungsSorten["Kurven"];
 | 
			
		||||
 | 
			
		||||
            var Graphs = auszahlungsSorten["Kurven"]?.AsObject();
 | 
			
		||||
            if (Graphs == null) {
 | 
			
		||||
                return false;
 | 
			
		||||
            }
 | 
			
		||||
@@ -141,26 +134,24 @@ namespace Elwig.Windows {
 | 
			
		||||
            int i = 1;
 | 
			
		||||
            foreach (var graph in Graphs) {
 | 
			
		||||
                if (i == num) {
 | 
			
		||||
                    graph.Remove();
 | 
			
		||||
                    Graphs.Remove(graph.Key);
 | 
			
		||||
                    break;
 | 
			
		||||
                }
 | 
			
		||||
                i++;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            foreach (var sorte in auszahlungsSorten.Children().OfType<JToken>()) {
 | 
			
		||||
                if (((JProperty)sorte).Name == "Kurven") {
 | 
			
		||||
                    continue;
 | 
			
		||||
                }
 | 
			
		||||
                foreach (var attribut in sorte.Values().OfType<JToken>()) {
 | 
			
		||||
                    List<JProperty> itemsToRemove = new();
 | 
			
		||||
                    foreach (var bindung in attribut.Values().OfType<JProperty>()) {
 | 
			
		||||
                        if ((int)bindung.Value == num - 1) {
 | 
			
		||||
                            itemsToRemove.Add(bindung);
 | 
			
		||||
                        } else if ((int)bindung.Value > num - 1) {
 | 
			
		||||
                            bindung.Value = (int)bindung.Value - 1;
 | 
			
		||||
            foreach (var sorte in auszahlungsSorten) {
 | 
			
		||||
                if (sorte.Key == "Kurven") continue;
 | 
			
		||||
                foreach (var attribut in sorte.Value.AsObject()) {
 | 
			
		||||
                    var bindungen = attribut.Value.AsObject();
 | 
			
		||||
                    foreach (var bindung in bindungen) {
 | 
			
		||||
                        int v = (int)bindung.Value;
 | 
			
		||||
                        if (v == num - 1) {
 | 
			
		||||
                            bindungen.Remove(bindung.Key);
 | 
			
		||||
                        } else if (v > num - 1) {
 | 
			
		||||
                            bindungen[bindung.Key] = v - 1;
 | 
			
		||||
                        }
 | 
			
		||||
                    }
 | 
			
		||||
                    itemsToRemove.ForEach(i => i.Remove());
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
@@ -671,23 +662,22 @@ namespace Elwig.Windows {
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            PaymentVar paymentVar = paymentVars[0];
 | 
			
		||||
            var data = JToken.Parse(paymentVar.Data);
 | 
			
		||||
            var data = JsonNode.Parse(paymentVar.Data).AsObject();
 | 
			
		||||
 | 
			
		||||
            var auszahlungsSorten = data["AuszahlungSorten"];
 | 
			
		||||
            if (auszahlungsSorten == null) {
 | 
			
		||||
                return null;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            var Graphs = auszahlungsSorten["Kurven"];
 | 
			
		||||
 | 
			
		||||
            var Graphs = auszahlungsSorten["Kurven"].AsArray();
 | 
			
		||||
            if (Graphs == null) {
 | 
			
		||||
                return null;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (IsEditing) {
 | 
			
		||||
                ((JArray)Graphs)[g.Num - 1] = g.ToJson();
 | 
			
		||||
                Graphs[g.Num - 1] = g.ToJson();
 | 
			
		||||
            } else if(IsCreating) {
 | 
			
		||||
                ((JArray)Graphs).Add(g.ToJson());
 | 
			
		||||
                Graphs.Add(g.ToJson());
 | 
			
		||||
            } else {
 | 
			
		||||
                return null;
 | 
			
		||||
            }
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,7 @@
 | 
			
		||||
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 | 
			
		||||
        xmlns:local="clr-namespace:Elwig.Windows"
 | 
			
		||||
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
 | 
			
		||||
        Title="Lieferungsverwaltung - Elwig" Height="720" Width="1100" MinHeight="700" MinWidth="1000"
 | 
			
		||||
        Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="700" MinWidth="1000"
 | 
			
		||||
        Loaded="Window_Loaded">
 | 
			
		||||
    <Window.Resources>
 | 
			
		||||
        <Style TargetType="Label">
 | 
			
		||||
@@ -65,8 +65,7 @@
 | 
			
		||||
                          Click="Menu_Print_PrintDeliveryNote_Click"/>
 | 
			
		||||
            </MenuItem>
 | 
			
		||||
            <MenuItem Header="Exportieren">
 | 
			
		||||
                <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"
 | 
			
		||||
                          Click="Menu_Export_Bki_Click"/>
 | 
			
		||||
                <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"/>
 | 
			
		||||
            </MenuItem>
 | 
			
		||||
            <MenuItem Header="Werkzeuge">
 | 
			
		||||
                <MenuItem Header="Alle Lieferscheine überprüfen"/>
 | 
			
		||||
@@ -161,10 +160,10 @@
 | 
			
		||||
 | 
			
		||||
                <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
 | 
			
		||||
                <TextBox x:Name="MgNrInput" Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
 | 
			
		||||
                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
 | 
			
		||||
                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus" KeyUp="Input_KeyUp"/>
 | 
			
		||||
                <ComboBox x:Name="MemberInput" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
 | 
			
		||||
                          ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
 | 
			
		||||
                          SelectionChanged="MemberInput_SelectionChanged"/>
 | 
			
		||||
                          SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 | 
			
		||||
 | 
			
		||||
                <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
 | 
			
		||||
                <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
 | 
			
		||||
@@ -210,15 +209,15 @@
 | 
			
		||||
 | 
			
		||||
                <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
 | 
			
		||||
                <TextBox x:Name="SortIdInput" Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
 | 
			
		||||
                         TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus"/>
 | 
			
		||||
                         TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus"  KeyUp="Input_KeyUp"/>
 | 
			
		||||
                <ComboBox x:Name="WineVarietyInput" Grid.Row="1" Grid.Column="1" Margin="41,10,10,10"
 | 
			
		||||
                          ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name" 
 | 
			
		||||
                          SelectionChanged="WineVarietyInput_SelectionChanged"/>
 | 
			
		||||
                          SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 | 
			
		||||
 | 
			
		||||
                <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
 | 
			
		||||
                <xctk:CheckComboBox x:Name="AttributesInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
 | 
			
		||||
                                    DisplayMemberPath="Name" Delimiter=", " AllItemsSelectedContent="Alle"
 | 
			
		||||
                                    ItemSelectionChanged="AttributesInput_SelectionChanged"/>
 | 
			
		||||
                                    ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 | 
			
		||||
            </Grid>
 | 
			
		||||
        </GroupBox>
 | 
			
		||||
 | 
			
		||||
@@ -247,7 +246,7 @@
 | 
			
		||||
                          SelectionChanged="WineQualityLevelInput_SelectionChanged"/>
 | 
			
		||||
 | 
			
		||||
                <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
 | 
			
		||||
                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0,75,10,10" Grid.Column="1"/>
 | 
			
		||||
                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
 | 
			
		||||
            </Grid>
 | 
			
		||||
        </GroupBox>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,10 @@
 | 
			
		||||
using Elwig.Documents;
 | 
			
		||||
using Elwig.Helpers;
 | 
			
		||||
using Elwig.Helpers.Export;
 | 
			
		||||
using Elwig.Models;
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using Microsoft.EntityFrameworkCore.ChangeTracking;
 | 
			
		||||
using Microsoft.Win32;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
@@ -23,6 +25,7 @@ namespace Elwig.Windows {
 | 
			
		||||
        private List<string> TextFilter = new();
 | 
			
		||||
        private readonly RoutedCommand CtrlF = new();
 | 
			
		||||
 | 
			
		||||
        private string? LastScaleError = null;
 | 
			
		||||
        private string? ManualWeighingReason = null;
 | 
			
		||||
        private string? ScaleId = null;
 | 
			
		||||
        private string? WeighingId = null;
 | 
			
		||||
@@ -58,6 +61,8 @@ namespace Elwig.Windows {
 | 
			
		||||
            SearchInput.TextChanged -= SearchInput_TextChanged;
 | 
			
		||||
            SeasonInput.Value = Utils.CurrentLastSeason;
 | 
			
		||||
 | 
			
		||||
            DoShowWarningWindows = false;
 | 
			
		||||
 | 
			
		||||
            if (IsReceipt) {
 | 
			
		||||
                Title = "Übernahme - Elwig";
 | 
			
		||||
                TodayOnlyInput.IsChecked = true;
 | 
			
		||||
@@ -87,13 +92,13 @@ namespace Elwig.Windows {
 | 
			
		||||
            AllSeasonsInput.IsChecked = true;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async void Window_Loaded(object sender, RoutedEventArgs evt) {
 | 
			
		||||
        private void Window_Loaded(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            OnSecondPassed(null, null);
 | 
			
		||||
            Timer.Start();
 | 
			
		||||
            LockInputs();
 | 
			
		||||
            if (IsReceipt) {
 | 
			
		||||
                NewDeliveryButton_Click(null, null);
 | 
			
		||||
                if ((await Context.Seasons.FindAsync(Utils.CurrentYear)) == null) {
 | 
			
		||||
                if ((Context.Seasons.Find(Utils.CurrentYear)) == null) {
 | 
			
		||||
                    MessageBox.Show("Die Saison für das aktuelle Jahr wurde noch nicht erstellt. Neue Lieferungen können nicht abgespeichert werden.",
 | 
			
		||||
                        "Saison noch nicht erstellt", MessageBoxButton.OK, MessageBoxImage.Error);
 | 
			
		||||
                }
 | 
			
		||||
@@ -102,20 +107,36 @@ namespace Elwig.Windows {
 | 
			
		||||
 | 
			
		||||
        private async void Menu_Print_ShowDeliveryNote_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            if (DeliveryList.SelectedItem is not Delivery d) return;
 | 
			
		||||
            Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
            using var doc = new DeliveryNote(d, Context);
 | 
			
		||||
            await doc.Generate();
 | 
			
		||||
            doc.Show();
 | 
			
		||||
            Mouse.OverrideCursor = null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async void Menu_Print_PrintDeliveryNote_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            if (DeliveryList.SelectedItem is not Delivery d) return;
 | 
			
		||||
            Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
            using var doc = new DeliveryNote(d, Context);
 | 
			
		||||
            await doc.Generate();
 | 
			
		||||
            Mouse.OverrideCursor = null;
 | 
			
		||||
            await doc.Print();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void Menu_Export_Bki_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            // TODO export Traubentransportscheinliste
 | 
			
		||||
        private async void Menu_Export_Bki_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            if (sender is not MenuItem m) return;
 | 
			
		||||
            var year = int.Parse(m.Header.ToString()?.Split(" ")[^1] ?? Utils.CurrentLastSeason.ToString());
 | 
			
		||||
            var d = new SaveFileDialog() {
 | 
			
		||||
                FileName = $"{App.Client.NameToken}-Traubentransportscheinliste-{year}",
 | 
			
		||||
                DefaultExt = Bki.FileExtension,
 | 
			
		||||
                Title = $"Traubentransportscheinliste (BKI) speichern unter - Elwig"
 | 
			
		||||
            };
 | 
			
		||||
            if (d.ShowDialog() == true) {
 | 
			
		||||
                Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
                using var file = new Bki(d.FileName);
 | 
			
		||||
                await file.ExportAsync(year);
 | 
			
		||||
                Mouse.OverrideCursor = null;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void OnSecondPassed(object? sender, EventArgs? evt) {
 | 
			
		||||
@@ -127,11 +148,16 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void InitialInputs() {
 | 
			
		||||
            LastScaleError = null;
 | 
			
		||||
            WeighingId = null;
 | 
			
		||||
            ScaleId = null;
 | 
			
		||||
            ManualWeighingReason = null;
 | 
			
		||||
 | 
			
		||||
            ClearOriginalValues();
 | 
			
		||||
            ClearDefaultValues();
 | 
			
		||||
 | 
			
		||||
            HandPickedInput.IsChecked = null;
 | 
			
		||||
            if (App.Client.IsMatzen) {
 | 
			
		||||
            if (App.Client.IsMatzen || App.Client.IsWolkersdorf) {
 | 
			
		||||
                GerebeltGewogenInput.IsChecked = true;
 | 
			
		||||
                GerebeltGewogenInput.IsEnabled = false;
 | 
			
		||||
                SetDefaultValue(GerebeltGewogenInput);
 | 
			
		||||
@@ -141,6 +167,8 @@ namespace Elwig.Windows {
 | 
			
		||||
                UnsetDefaultValue(GerebeltGewogenInput);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            WineQualityLevelInput.IsEnabled = false;
 | 
			
		||||
 | 
			
		||||
            SetDefaultValue(HandPickedInput);
 | 
			
		||||
            ValidateRequiredInputs();
 | 
			
		||||
        }
 | 
			
		||||
@@ -157,11 +185,21 @@ namespace Elwig.Windows {
 | 
			
		||||
            bool ch = HasChanged, v = IsValid;
 | 
			
		||||
            ResetButton.IsEnabled = ch;
 | 
			
		||||
            SaveButton.IsEnabled = v && ch;
 | 
			
		||||
            FinishButton.IsEnabled = v || !ch;
 | 
			
		||||
            NewDeliveryPartButton.IsEnabled = v;
 | 
			
		||||
            FinishButton.IsEnabled = v && ch;
 | 
			
		||||
            NewDeliveryPartButton.IsEnabled = v && ch;
 | 
			
		||||
            CancelCreatingButton.IsEnabled = DeliveryList.SelectedItem == null || DeliveryPartList.SelectedItem == null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void Input_KeyUp(object sender, KeyEventArgs evt) {
 | 
			
		||||
            if (sender is not Control ctrl) return;
 | 
			
		||||
            if (evt.Key != Key.Enter) return;
 | 
			
		||||
            if (ctrl == MgNrInput || ctrl == MemberInput) {
 | 
			
		||||
                SortIdInput.Focus(); SortIdInput.SelectAll();
 | 
			
		||||
            } else if (ctrl == SortIdInput || ctrl == WineVarietyInput || ctrl == AttributesInput) {
 | 
			
		||||
                GradationOeInput.Focus(); GradationOeInput.SelectAll();
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async Task RefreshDeliveryList() {
 | 
			
		||||
            await RefreshDeliveryListQuery();
 | 
			
		||||
        }
 | 
			
		||||
@@ -194,6 +232,7 @@ namespace Elwig.Windows {
 | 
			
		||||
            double filterOeLt = 0;
 | 
			
		||||
 | 
			
		||||
            var filter = TextFilter.ToList();
 | 
			
		||||
            var hasFilters = filter.Count > 0;
 | 
			
		||||
            if (filter.Count > 0) {
 | 
			
		||||
                var var = await Context.WineVarieties.Select(v => v.SortId).ToListAsync();
 | 
			
		||||
                var qual = await Context.WineQualityLevels.Select(q => q.QualId).ToListAsync();
 | 
			
		||||
@@ -299,7 +338,8 @@ namespace Elwig.Windows {
 | 
			
		||||
                    .ToList();
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            ControlUtils.RenewItemsSource(DeliveryList, deliveries, d => ((d as Delivery)?.Year, (d as Delivery)?.DId), DeliveryList_SelectionChanged, ControlUtils.RenewSourceDefault.IfOnly, !updateSort);
 | 
			
		||||
            ControlUtils.RenewItemsSource(DeliveryList, deliveries, d => ((d as Delivery)?.Year, (d as Delivery)?.DId),
 | 
			
		||||
                DeliveryList_SelectionChanged, hasFilters ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
 | 
			
		||||
 | 
			
		||||
            var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
 | 
			
		||||
            StatusMembers.Text = $"Mitglieder: {members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
 | 
			
		||||
@@ -382,10 +422,19 @@ namespace Elwig.Windows {
 | 
			
		||||
                Title = $"Lieferungen - {Member.AdministrativeName} - Elwig";
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            Menu_Export_Bki.Items.Clear();
 | 
			
		||||
            foreach (var s in await Context.Seasons.OrderByDescending(s => s.Year).ToListAsync()) {
 | 
			
		||||
                var i = new MenuItem {
 | 
			
		||||
                    Header = $"Season {s.Year}",
 | 
			
		||||
                };
 | 
			
		||||
                i.Click += Menu_Export_Bki_Click;
 | 
			
		||||
                Menu_Export_Bki.Items.Add(i);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            await RefreshDeliveryList();
 | 
			
		||||
            var d = DeliveryList.SelectedItem as Delivery;
 | 
			
		||||
            var y = d?.Year ?? Utils.CurrentLastSeason;
 | 
			
		||||
            ControlUtils.RenewItemsSource(MemberInput, await Context.Members.OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
 | 
			
		||||
            ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsCreating).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
 | 
			
		||||
            ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
 | 
			
		||||
            ControlUtils.RenewItemsSource(WineVarietyInput, await Context.WineVarieties.OrderBy(v => v.Name).ToListAsync(), i => (i as WineVar)?.SortId);
 | 
			
		||||
            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => IsCreating || a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
 | 
			
		||||
@@ -399,6 +448,7 @@ namespace Elwig.Windows {
 | 
			
		||||
            if (IsCreating) await UpdateLsNr();
 | 
			
		||||
 | 
			
		||||
            await RefreshDeliveryParts();
 | 
			
		||||
            RefreshInputs();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void FocusSearchInput(object sender, RoutedEventArgs evt) {
 | 
			
		||||
@@ -607,12 +657,18 @@ namespace Elwig.Windows {
 | 
			
		||||
                    ScaleId = null;
 | 
			
		||||
                    WeighingId = null;
 | 
			
		||||
                }
 | 
			
		||||
                ManualWeighingReason = null;
 | 
			
		||||
                ManualWeighingInput.IsChecked = false;
 | 
			
		||||
                LastScaleError = null;
 | 
			
		||||
            } catch (Exception e) {
 | 
			
		||||
                LastScaleError = e.Message.Split(": ")[^1];
 | 
			
		||||
                WeightInput.Text = "";
 | 
			
		||||
                ScaleId = null;
 | 
			
		||||
                WeighingId = null;
 | 
			
		||||
                MessageBox.Show($"Beim Wiegen ist ein Fehler aufgetreten:\n\n{e.Message}", "Waagenfehler",
 | 
			
		||||
                       MessageBoxButton.OK, MessageBoxImage.Error);
 | 
			
		||||
            }
 | 
			
		||||
            ManualWeighingReason = null;
 | 
			
		||||
            ManualWeighingInput.IsChecked = false;
 | 
			
		||||
            base.TextBox_TextChanged(WeightInput, null);
 | 
			
		||||
            EnableWeighingButtons();
 | 
			
		||||
            UpdateButtons();
 | 
			
		||||
        }
 | 
			
		||||
@@ -688,7 +744,7 @@ namespace Elwig.Windows {
 | 
			
		||||
            MemberInput.SelectedItem = valid ? Context.Members.Find(int.Parse(MgNrInput.Text)) : null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void MemberInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
 | 
			
		||||
        private void MemberInput_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
 | 
			
		||||
            var m = MemberInput.SelectedItem as Member;
 | 
			
		||||
            if (m != null) MgNrInput.Text = m.MgNr.ToString();
 | 
			
		||||
            MemberAddressField.Text = m?.FullAddress;
 | 
			
		||||
@@ -702,32 +758,54 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            FinishButton.IsEnabled = false;
 | 
			
		||||
            NewDeliveryPartButton.IsEnabled = false;
 | 
			
		||||
            NewDeliveryPartButton.Cursor = Cursors.Wait;
 | 
			
		||||
            DeliveryPartList.IsEnabled = false;
 | 
			
		||||
            var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
 | 
			
		||||
            await RefreshDeliveryList();
 | 
			
		||||
            await RefreshDeliveryParts();
 | 
			
		||||
            NewDeliveryPartButton.Cursor = null;
 | 
			
		||||
            DeliveryList.SelectedItem = p?.Delivery;
 | 
			
		||||
            DeliveryPartList.SelectedItem = null;
 | 
			
		||||
            RefreshInputs();
 | 
			
		||||
            InitialInputs();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            FinishButton.IsEnabled = false;
 | 
			
		||||
            NewDeliveryPartButton.IsEnabled = false;
 | 
			
		||||
            FinishButton.Cursor = Cursors.Wait;
 | 
			
		||||
            DeliveryPartList.IsEnabled = false;
 | 
			
		||||
            var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
 | 
			
		||||
            await RefreshDeliveryList();
 | 
			
		||||
            await RefreshDeliveryParts();
 | 
			
		||||
            if (p?.Delivery != null) {
 | 
			
		||||
                Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
                using var doc = new DeliveryNote(p.Delivery, Context);
 | 
			
		||||
                await doc.Generate();
 | 
			
		||||
                Mouse.OverrideCursor = null;
 | 
			
		||||
                if (App.Config.Debug) {
 | 
			
		||||
                    doc.Show();
 | 
			
		||||
                //await doc.Print(2);
 | 
			
		||||
                } else {
 | 
			
		||||
                    await doc.Print(2);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            FinishButton.Cursor = null;
 | 
			
		||||
            DeliveryList.SelectedItem = null;
 | 
			
		||||
            RefreshInputs();
 | 
			
		||||
            InitInputs();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void CancelCreatingButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            ControlUtils.RenewItemsSource(AttributesInput, Context.WineAttributes.OrderBy(a => a.Name).ToList(), i => (i as WineAttr)?.AttrId);
 | 
			
		||||
        private async void CancelCreatingButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            if (IsCreating && HasChanged) {
 | 
			
		||||
                var r = MessageBox.Show("Soll der Vorgang wirklich abgebrochen werden?", "Abbrechen bestätigen",
 | 
			
		||||
                    MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
 | 
			
		||||
                if (r != MessageBoxResult.Yes) return;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
 | 
			
		||||
            ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsReceipt).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
 | 
			
		||||
            if (DeliveryList.SelectedItem is not Delivery d) {
 | 
			
		||||
                // switch away from creating mode
 | 
			
		||||
                IsCreating = false;
 | 
			
		||||
@@ -748,8 +826,11 @@ namespace Elwig.Windows {
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void NewDeliveryButton_Click(object? sender, RoutedEventArgs? evt) {
 | 
			
		||||
            ControlUtils.RenewItemsSource(AttributesInput, Context.WineAttributes.Where(a => a.IsActive).OrderBy(a => a.Name).ToList(), i => (i as WineAttr)?.AttrId);
 | 
			
		||||
        private async void NewDeliveryButton_Click(object? sender, RoutedEventArgs? evt) {
 | 
			
		||||
            TodayOnlyInput.IsChecked = true;
 | 
			
		||||
            SearchInput.Text = "";
 | 
			
		||||
            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
 | 
			
		||||
            ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsReceipt).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
 | 
			
		||||
            IsCreating = true;
 | 
			
		||||
            DeliveryList.IsEnabled = false;
 | 
			
		||||
            DeliveryPartList.IsEnabled = false;
 | 
			
		||||
@@ -769,6 +850,7 @@ namespace Elwig.Windows {
 | 
			
		||||
            try {
 | 
			
		||||
                if (res == null || res <= 0)
 | 
			
		||||
                    return;
 | 
			
		||||
                Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
                ClearOriginalValues();
 | 
			
		||||
                if (res >= p.Weight) {
 | 
			
		||||
                    ControlUtils.SelectComboBoxItem(WineQualityLevelInput, q => (q as WineQualLevel)?.QualId, "WEI");
 | 
			
		||||
@@ -797,6 +879,7 @@ namespace Elwig.Windows {
 | 
			
		||||
                }
 | 
			
		||||
                await Context.SaveChangesAsync();
 | 
			
		||||
                await RefreshDeliveryParts();
 | 
			
		||||
                Mouse.OverrideCursor = null;
 | 
			
		||||
                FinishInputFilling();
 | 
			
		||||
            } catch (Exception exc) {
 | 
			
		||||
                if (entry1 != null) {
 | 
			
		||||
@@ -814,7 +897,7 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void WeighingManualButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            var res = Utils.ShowManualWeighingDialog();
 | 
			
		||||
            var res = Utils.ShowManualWeighingDialog(LastScaleError);
 | 
			
		||||
            if (res == null) return;
 | 
			
		||||
            WeightInput.Text = $"{res?.Item1:N0}";
 | 
			
		||||
            ManualWeighingInput.IsChecked = true;
 | 
			
		||||
@@ -849,21 +932,28 @@ namespace Elwig.Windows {
 | 
			
		||||
                $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
 | 
			
		||||
                "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
 | 
			
		||||
            if (r == MessageBoxResult.Yes) {
 | 
			
		||||
                Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
                Context.Remove(d);
 | 
			
		||||
                await Context.SaveChangesAsync();
 | 
			
		||||
                await RefreshDeliveryList();
 | 
			
		||||
                await RefreshDeliveryParts();
 | 
			
		||||
                Mouse.OverrideCursor = null;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            DeliveryPart p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
 | 
			
		||||
            SaveButton.IsEnabled = false;
 | 
			
		||||
            SaveButton.Cursor = Cursors.Wait;
 | 
			
		||||
 | 
			
		||||
            IsEditing = false;
 | 
			
		||||
            IsCreating = false;
 | 
			
		||||
            DeliveryList.IsEnabled = true;
 | 
			
		||||
            DeliveryPartList.IsEnabled = true;
 | 
			
		||||
 | 
			
		||||
            DeliveryPart p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
 | 
			
		||||
 | 
			
		||||
            SaveButton.Cursor = null;
 | 
			
		||||
 | 
			
		||||
            HideSaveResetCancelButtons();
 | 
			
		||||
            ShowNewEditDeleteButtons();
 | 
			
		||||
            LockInputs();
 | 
			
		||||
@@ -925,12 +1015,12 @@ namespace Elwig.Windows {
 | 
			
		||||
                .ToListAsync();
 | 
			
		||||
 | 
			
		||||
            var res = Utils.ShowDeliveryExtractionDialog($"{delivery.LsNr}/{p.DPNr}", delivery.Member.AdministrativeName, count == 1, lsnrs);
 | 
			
		||||
            if (res == null) return;
 | 
			
		||||
            EntityEntry<Delivery>? entry = null;
 | 
			
		||||
            try {
 | 
			
		||||
                Delivery? d = null;
 | 
			
		||||
                if (res == null) {
 | 
			
		||||
                    return;
 | 
			
		||||
                } else if (res == "new") {
 | 
			
		||||
                Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
                if (res == "new") {
 | 
			
		||||
                    d = Context.CreateProxy<Delivery>();
 | 
			
		||||
                    d.Date = delivery.Date;
 | 
			
		||||
                    d.Time = delivery.Time;
 | 
			
		||||
@@ -958,6 +1048,7 @@ namespace Elwig.Windows {
 | 
			
		||||
                await Context.Entry(p).ReloadAsync();
 | 
			
		||||
                await Context.Entry(delivery).ReloadAsync();
 | 
			
		||||
 | 
			
		||||
                Mouse.OverrideCursor = null;
 | 
			
		||||
                await RefreshDeliveryList();
 | 
			
		||||
                DeliveryList.SelectedItem = d;
 | 
			
		||||
            } catch (Exception exc) {
 | 
			
		||||
@@ -979,9 +1070,11 @@ namespace Elwig.Windows {
 | 
			
		||||
                $"Soll die Teillieferung Nr. {p.DPNr} wirklich unwiderruflich gelöscht werden?",
 | 
			
		||||
                "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
 | 
			
		||||
            if (r == MessageBoxResult.Yes) {
 | 
			
		||||
                Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
                Context.Remove(p);
 | 
			
		||||
                await Context.SaveChangesAsync();
 | 
			
		||||
                await RefreshDeliveryParts();
 | 
			
		||||
                Mouse.OverrideCursor = null;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@@ -1026,8 +1119,8 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void ShowFinishNewPartDeliveryCancelButtons() {
 | 
			
		||||
            FinishButton.IsEnabled = IsCreating && IsValid;
 | 
			
		||||
            NewDeliveryPartButton.IsEnabled = IsCreating && IsValid;
 | 
			
		||||
            FinishButton.IsEnabled = false;
 | 
			
		||||
            NewDeliveryPartButton.IsEnabled = false;
 | 
			
		||||
            CancelCreatingButton.IsEnabled = true;
 | 
			
		||||
            FinishButton.Visibility = Visibility.Visible;
 | 
			
		||||
            NewDeliveryPartButton.Visibility = Visibility.Visible;
 | 
			
		||||
@@ -1082,10 +1175,11 @@ namespace Elwig.Windows {
 | 
			
		||||
 | 
			
		||||
        private void EnableWeighingButtons() {
 | 
			
		||||
            WeighingManualButton.IsEnabled = true;
 | 
			
		||||
            WeighingAButton.IsEnabled = true;
 | 
			
		||||
            WeighingBButton.IsEnabled = true;
 | 
			
		||||
            WeighingCButton.IsEnabled = true;
 | 
			
		||||
            WeighingDButton.IsEnabled = true;
 | 
			
		||||
            var n = App.Scales.Count;
 | 
			
		||||
            WeighingAButton.IsEnabled = n > 0 && App.Scales[0].IsReady;
 | 
			
		||||
            WeighingBButton.IsEnabled = n > 1 && App.Scales[1].IsReady;
 | 
			
		||||
            WeighingCButton.IsEnabled = n > 2 && App.Scales[2].IsReady;
 | 
			
		||||
            WeighingDButton.IsEnabled = n > 3 && App.Scales[3].IsReady;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async Task UpdateLsNr() {
 | 
			
		||||
@@ -1196,8 +1290,10 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void ModifiersInput_SelectionChanged(object sender, ItemSelectionChangedEventArgs evt) {
 | 
			
		||||
            if ((IsEditing || IsCreating) && App.Client.IsMatzen) {
 | 
			
		||||
            if (!IsEditing && !IsCreating) return;
 | 
			
		||||
            var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
 | 
			
		||||
            var source = ModifiersInput.ItemsSource.Cast<Modifier>();
 | 
			
		||||
            if (App.Client.IsMatzen) {
 | 
			
		||||
                var kl = mod.Where(m => m.Name.StartsWith("Klasse "));
 | 
			
		||||
                if (kl.Count() > 1) {
 | 
			
		||||
                    foreach (var r in kl.Take(kl.Count() - 1)) ModifiersInput.SelectedItems.Remove(r);
 | 
			
		||||
@@ -1206,11 +1302,14 @@ namespace Elwig.Windows {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void LesewagenInput_Changed(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            if ((IsEditing || IsCreating) && App.Client.IsMatzen) {
 | 
			
		||||
            if (!IsEditing && !IsCreating) return;
 | 
			
		||||
            var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
 | 
			
		||||
            var source = ModifiersInput.ItemsSource.Cast<Modifier>();
 | 
			
		||||
            var lw = LesewagenInput.IsChecked == true;
 | 
			
		||||
            if (App.Client.IsMatzen) {
 | 
			
		||||
                var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0];
 | 
			
		||||
                if (LesewagenInput.IsChecked == true) kl++; else kl--;
 | 
			
		||||
                var newKl = ModifiersInput.ItemsSource.Cast<Modifier>().Where(m => m.ModId == kl.ToString()).FirstOrDefault();
 | 
			
		||||
                if (lw) kl++; else kl--;
 | 
			
		||||
                var newKl = source.Where(m => m.ModId == kl.ToString()).FirstOrDefault();
 | 
			
		||||
                if (newKl != null) ModifiersInput.SelectedItems.Add(newKl);
 | 
			
		||||
            }
 | 
			
		||||
            CheckBox_Changed(sender, evt);
 | 
			
		||||
 
 | 
			
		||||
@@ -23,7 +23,7 @@
 | 
			
		||||
                <MenuItem Header="Über"/>
 | 
			
		||||
            </MenuItem>
 | 
			
		||||
        </Menu>
 | 
			
		||||
        <Grid Height="100" VerticalAlignment="Top" Margin="0,25,0,0">
 | 
			
		||||
        <Grid Height="100" VerticalAlignment="Top" Margin="25,25,0,0">
 | 
			
		||||
            <Grid.ColumnDefinitions>
 | 
			
		||||
                <ColumnDefinition Width="100"/>
 | 
			
		||||
                <ColumnDefinition Width="*"/>
 | 
			
		||||
@@ -38,26 +38,20 @@
 | 
			
		||||
                   HorizontalAlignment="Left" Margin="0,70,0,0" VerticalAlignment="Top"/>
 | 
			
		||||
        </Grid>
 | 
			
		||||
 | 
			
		||||
        <Button x:Name="MemberAdminButton" Content="Mitgliederverwaltung" Click="MemberAdminButton_Click"
 | 
			
		||||
        <Button x:Name="MemberAdminButton" Content="Mitglieder" Click="MemberAdminButton_Click"
 | 
			
		||||
                Margin="50,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="MemberListButton" Content="Mitgliederliste" Click="MemberListButton_Click"
 | 
			
		||||
                Margin="50,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="ReceiptButton" Content="Übernahme" Click="ReceiptButton_Click"
 | 
			
		||||
                Margin="50,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="DeliveryAdminButton" Content="Lieferungen" Click="DeliveryAdminButton_Click"
 | 
			
		||||
                Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="DeliveryAdminButton" Content="Lieferungsverwaltung" Click="DeliveryAdminButton_Click"
 | 
			
		||||
        <Button x:Name="PaymentWindowButton" Content="Auszahlung" Click="PaymentWindowButton_Click"
 | 
			
		||||
                Margin="50,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="DeliveryListButton" Content="Lieferungungen" Click="DeliveryListButton_Click" IsEnabled="False"
 | 
			
		||||
        <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
 | 
			
		||||
                Margin="50,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
 | 
			
		||||
        <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
 | 
			
		||||
                Margin="260,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="PdfButton" Content="PDF Erzeugen" Click="PdfButton_Click" Tag="Print"
 | 
			
		||||
                Margin="260,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="TestWindowButton" Content="Test Fenster" Click="TestWindowButton_Click"
 | 
			
		||||
                Margin="260,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="QueryWindowButton" Content="Datenbankabfragen" Click="QueryWindowButton_Click"
 | 
			
		||||
                Margin="260,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="PaymentWindowButton" Content="Auszahlung" Click="PaymentWindowButton_Click"
 | 
			
		||||
        <Button x:Name="QueryWindowButton" Content="Datenbankabfragen" Click="QueryWindowButton_Click"
 | 
			
		||||
                Margin="260,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
    </Grid>
 | 
			
		||||
</Window>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,18 +1,17 @@
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Windows;
 | 
			
		||||
using Elwig.Documents;
 | 
			
		||||
using Elwig.Helpers;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Windows {
 | 
			
		||||
    public partial class MainWindow : Window {
 | 
			
		||||
 | 
			
		||||
        public MainWindow() {
 | 
			
		||||
            InitializeComponent();
 | 
			
		||||
            if (!App.Config.Debug) {
 | 
			
		||||
                TestWindowButton.Visibility = Visibility.Hidden;
 | 
			
		||||
                //QueryWindowButton.Visibility = Visibility.Hidden;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void Window_Loaded(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            PdfButton.IsEnabled = App.IsPrintingReady;
 | 
			
		||||
        }
 | 
			
		||||
        private void Window_Loaded(object sender, RoutedEventArgs evt) { }
 | 
			
		||||
 | 
			
		||||
        private void MemberAdminButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            var w = new MemberAdminWindow();
 | 
			
		||||
@@ -38,15 +37,6 @@ namespace Elwig.Windows {
 | 
			
		||||
            // TODO
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void PdfButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            Utils.RunBackground("PDF Generation", async () => {
 | 
			
		||||
                using var ctx = new AppDbContext();
 | 
			
		||||
                using var doc = new DeliveryNote(ctx.Deliveries.OrderBy(d => d.Parts.Count).ThenBy(d => d.Year).ThenBy(d => d.DId).Last(), ctx);
 | 
			
		||||
                await doc.Generate();
 | 
			
		||||
                doc.Show();
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void TestWindowButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            var w = new TestWindow();
 | 
			
		||||
            w.Show();
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 | 
			
		||||
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 | 
			
		||||
        xmlns:local="clr-namespace:Elwig.Windows"
 | 
			
		||||
        Title="Mitgliederverwaltung - Elwig" Height="670" Width="1250" MinHeight="600" MinWidth="1000"
 | 
			
		||||
        Title="Mitglieder - Elwig" Height="670" Width="1250" MinHeight="600" MinWidth="1000"
 | 
			
		||||
        Loaded="Window_Loaded">
 | 
			
		||||
    <Window.Resources>
 | 
			
		||||
        <Style TargetType="Label">
 | 
			
		||||
 
 | 
			
		||||
@@ -89,7 +89,8 @@ namespace Elwig.Windows {
 | 
			
		||||
                    .ToList();
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            ControlUtils.RenewItemsSource(MemberList, members, i => (i as Member)?.MgNr, MemberList_SelectionChanged, ControlUtils.RenewSourceDefault.IfOnly, !updateSort);
 | 
			
		||||
            ControlUtils.RenewItemsSource(MemberList, members, i => (i as Member)?.MgNr,
 | 
			
		||||
                MemberList_SelectionChanged, TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void RefreshInputs(bool validate = false) {
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,7 @@
 | 
			
		||||
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 | 
			
		||||
        xmlns:local="clr-namespace:Elwig.Windows"
 | 
			
		||||
        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
 | 
			
		||||
        Title="Test Fenster - Elwig" MinHeight="400" MinWidth="325" Height="450" Width="800" ResizeMode="CanResize">
 | 
			
		||||
        Title="Test Fenster - Elwig" MinHeight="400" MinWidth="325" Height="450" Width="800" ResizeMode="CanResize" Loaded="Window_Loaded">
 | 
			
		||||
    <Grid>
 | 
			
		||||
        <xctk:CheckComboBox x:Name="MyComboBox" HorizontalAlignment="Left" Margin="216,186,0,0" VerticalAlignment="Top" Delimiter=", "
 | 
			
		||||
                            SelectedValue="{Binding SelectedValue}"
 | 
			
		||||
@@ -18,5 +18,10 @@
 | 
			
		||||
        <TextBlock x:Name="Output" Height="20" Width="200" Margin="470,329,0,0"  HorizontalAlignment="Left" VerticalAlignment="Top"/>
 | 
			
		||||
        <Button x:Name="ChartButton" Content="Chart" Click="ChartButton_Click"
 | 
			
		||||
                Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
 | 
			
		||||
        <Button x:Name="PdfDeliveryButton" Content="Lieferschein Erzeugen" Click="PdfDeliveryButton_Click" Tag="Print"
 | 
			
		||||
                Margin="260,190,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
        <Button x:Name="PdfCreditButton" Content="Gutschrift Erzeugen" Click="PdfCreditButton_Click" Tag="Print"
 | 
			
		||||
                Margin="260,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 | 
			
		||||
    </Grid>
 | 
			
		||||
</Window>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,16 +1,26 @@
 | 
			
		||||
using Elwig.Documents;
 | 
			
		||||
using Elwig.Helpers;
 | 
			
		||||
using Microsoft.EntityFrameworkCore;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Windows;
 | 
			
		||||
using System.Windows.Input;
 | 
			
		||||
using Xceed.Wpf.Toolkit.Primitives;
 | 
			
		||||
 | 
			
		||||
namespace Elwig.Windows {
 | 
			
		||||
    public partial class TestWindow : Window {
 | 
			
		||||
 | 
			
		||||
        public TestWindow() {
 | 
			
		||||
            InitializeComponent();
 | 
			
		||||
            MyComboBox.ItemsSource = new string[] { "Klasse A" , "Klasse B", "Klasse C", "Klasse D", "Klasse E", "Klasse F" };
 | 
			
		||||
            MyListBox.ItemsSource = new string[] { "Test 1", "Test 2", "Test 3", "Test 4" };
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void Window_Loaded(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            PdfDeliveryButton.IsEnabled = App.IsPrintingReady;
 | 
			
		||||
            PdfCreditButton.IsEnabled = App.IsPrintingReady;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private void OnItemSelectionChanged(object sender, ItemSelectionChangedEventArgs e) {
 | 
			
		||||
            MyText.Text = string.Join(", ", MyComboBox.SelectedItems.Cast<string>());
 | 
			
		||||
        }
 | 
			
		||||
@@ -39,5 +49,23 @@ namespace Elwig.Windows {
 | 
			
		||||
            var w = new ChartWindow();
 | 
			
		||||
            w.Show();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async void PdfDeliveryButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
            using var ctx = new AppDbContext();
 | 
			
		||||
            using var doc = new DeliveryNote(await ctx.Deliveries.OrderBy(d => d.Parts.Count).ThenBy(d => d.Year).ThenBy(d => d.DId).LastAsync(), ctx);
 | 
			
		||||
            await doc.Generate();
 | 
			
		||||
            doc.Show();
 | 
			
		||||
            Mouse.OverrideCursor = null;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        private async void PdfCreditButton_Click(object sender, RoutedEventArgs evt) {
 | 
			
		||||
            Mouse.OverrideCursor = Cursors.Wait;
 | 
			
		||||
            using var ctx = new AppDbContext();
 | 
			
		||||
            using var doc = new CreditNote(await ctx.Credits.FirstAsync(), ctx);
 | 
			
		||||
            await doc.Generate();
 | 
			
		||||
            doc.Show();
 | 
			
		||||
            Mouse.OverrideCursor = null;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,5 @@
 | 
			
		||||
::mkdir "C:\Program Files\Elwig"
 | 
			
		||||
::curl -s "http://www.columbia.edu/~em36/PDFtoPrinter.exe" -z "C:\Program Files\Elwig\PDFtoPrinter.exe" -o "C:\Program Files\Elwig\PDFtoPrinter.exe"
 | 
			
		||||
mkdir "C:\ProgramData\Elwig\resources"
 | 
			
		||||
curl -s -L "https://unpkg.com/pagedjs/dist/paged.polyfill.js" -o "C:\ProgramData\Elwig\resources\paged.polyfill.js"
 | 
			
		||||
copy /b /y "Documents\style.css" "C:\ProgramData\Elwig\resources\style.css"
 | 
			
		||||
copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
 | 
			
		||||
copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +0,0 @@
 | 
			
		||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 | 
			
		||||
	<Fragment>
 | 
			
		||||
		<ComponentGroup Id="DocumentTemplateComponents" Directory="ConfigFolderResources">
 | 
			
		||||
			<Component>
 | 
			
		||||
				<File Source="$(TargetDir)\paged.polyfill.js" />
 | 
			
		||||
			</Component>
 | 
			
		||||
			<Component>
 | 
			
		||||
				<File Source="$(var.ElwigProjectDir)\Documents\style.css" />
 | 
			
		||||
			</Component>
 | 
			
		||||
		</ComponentGroup>
 | 
			
		||||
	</Fragment>
 | 
			
		||||
</Wix>
 | 
			
		||||
@@ -23,10 +23,10 @@
 | 
			
		||||
    -->
 | 
			
		||||
	<xsl:key
 | 
			
		||||
        name="FileToRemove"
 | 
			
		||||
        match="wix:Component[ substring( wix:File/@Source, string-length( wix:File/@Source ) - 6 ) != '.cshtml' ]"
 | 
			
		||||
        match="wix:Component[ substring( wix:File/@Source, string-length( wix:File/@Source ) - 2 ) = '.cs' ]"
 | 
			
		||||
        use="@Id"
 | 
			
		||||
    />
 | 
			
		||||
	<!-- Get the last 4 characters of a string using `substring( s, len(s) - 3 )`, it uses -3 and not -4 because XSLT uses 1-based indexes, not 0-based indexes. -->
 | 
			
		||||
	<!-- Get the last 3 characters of a string using `substring( s, len(s) - 2 )`, it uses -2 and not -3 because XSLT uses 1-based indexes, not 0-based indexes. -->
 | 
			
		||||
 | 
			
		||||
	<!-- By default, copy all elements and nodes into the output... -->
 | 
			
		||||
	<xsl:template match="@*|node()">
 | 
			
		||||
@@ -2,6 +2,7 @@
 | 
			
		||||
[general]
 | 
			
		||||
; Only needed, if more than one branch is stored in database
 | 
			
		||||
branch = Zweigstelle
 | 
			
		||||
;debug = true
 | 
			
		||||
 | 
			
		||||
[database]
 | 
			
		||||
; Relative or absolute path to database file
 | 
			
		||||
 
 | 
			
		||||
@@ -25,14 +25,13 @@
 | 
			
		||||
    </Task>
 | 
			
		||||
  </UsingTask>
 | 
			
		||||
  <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
 | 
			
		||||
    <Exec Command="curl -s -L "https://unpkg.com/pagedjs/dist/paged.polyfill.js" -o "$(TargetDir)paged.polyfill.js"" />
 | 
			
		||||
    <Exec Command="curl -s "http://www.columbia.edu/~em36/PDFtoPrinter.exe" -z "$(TargetDir)PDFtoPrinter.exe" -o "$(TargetDir)PDFtoPrinter.exe"" />
 | 
			
		||||
    <Exec Command="dotnet publish "$(SolutionDir)Elwig\Elwig.csproj" "/p:PublishProfile=$(SolutionDir)\Elwig\Properties\PublishProfiles\FolderProfile.pubxml"" />
 | 
			
		||||
    <GetFileVersion AssemblyPath="..\Elwig\bin\Publish\Elwig.exe">
 | 
			
		||||
      <Output TaskParameter="Version" PropertyName="ElwigFileVersion" />
 | 
			
		||||
    </GetFileVersion>
 | 
			
		||||
    <PropertyGroup>
 | 
			
		||||
      <DefineConstants>ProductVersion=$(ElwigFileVersion);BuildPath=..\Elwig\bin\Publish;DocumentTemplatesPath=..\Elwig\Documents;ElwigProjectDir=..\Elwig</DefineConstants>
 | 
			
		||||
      <DefineConstants>ProductVersion=$(ElwigFileVersion);BuildPath=..\Elwig\bin\Publish;DocumentPath=..\Elwig\Documents;ElwigProjectDir=..\Elwig</DefineConstants>
 | 
			
		||||
    </PropertyGroup>
 | 
			
		||||
  </Target>
 | 
			
		||||
  <ItemGroup>
 | 
			
		||||
@@ -50,13 +49,13 @@
 | 
			
		||||
      <ComponentGroupName>DocumentTemplates</ComponentGroupName>
 | 
			
		||||
      <DirectoryRefId>ConfigFolderResources</DirectoryRefId>
 | 
			
		||||
      <SuppressRootDirectory>true</SuppressRootDirectory>
 | 
			
		||||
      <PreprocessorVariable>DocumentTemplatesPath</PreprocessorVariable>
 | 
			
		||||
      <Transforms>DocumentTemplatesTransform.xslt</Transforms>
 | 
			
		||||
      <PreprocessorVariable>DocumentPath</PreprocessorVariable>
 | 
			
		||||
      <Transforms>DocumentTransform.xslt</Transforms>
 | 
			
		||||
    </HarvestDirectory>
 | 
			
		||||
    <BindPath BindName="DocumentTemplateBindPath" Include="../Elwig/Documents" />
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
  <ItemGroup>
 | 
			
		||||
    <None Include="DocumentTemplatesTransform.xslt" />
 | 
			
		||||
    <None Include="DocumentTransform.xslt" />
 | 
			
		||||
    <None Include="BuildFilesTransform.xslt" />
 | 
			
		||||
    <None Include="Files\config.ini" />
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,6 @@
 | 
			
		||||
      <ComponentGroupRef Id="MainComponents"/>
 | 
			
		||||
      <ComponentGroupRef Id="BuildFiles"/>
 | 
			
		||||
      <ComponentGroupRef Id="DocumentTemplates"/>
 | 
			
		||||
      <ComponentGroupRef Id="DocumentTemplateComponents"/>
 | 
			
		||||
    </Feature>
 | 
			
		||||
  </Package>
 | 
			
		||||
</Wix>
 | 
			
		||||
 
 | 
			
		||||
@@ -68,5 +68,37 @@ namespace Tests {
 | 
			
		||||
                Assert.Throws<ArgumentException>(() => Utils.Modulo("789", -1));
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Test]
 | 
			
		||||
        public void Test_SplitAddress() {
 | 
			
		||||
            Assert.Multiple(() => {
 | 
			
		||||
                Assert.That(Utils.SplitAddress("Winzerstraße 1"), Is.EqualTo(("Winzerstraße", "1")));
 | 
			
		||||
                Assert.That(Utils.SplitAddress("Auf dem Feld 12"), Is.EqualTo(("Auf dem Feld", "12")));
 | 
			
		||||
                Assert.That(Utils.SplitAddress("Winzerstraße 5a"), Is.EqualTo(("Winzerstraße", "5a")));
 | 
			
		||||
                Assert.That(Utils.SplitAddress("Winzerstraße 1-3/2"), Is.EqualTo(("Winzerstraße", "1-3/2")));
 | 
			
		||||
                Assert.That(Utils.SplitAddress("Winzerstraße 3/4/5"), Is.EqualTo(("Winzerstraße", "3/4/5")));
 | 
			
		||||
                Assert.That(Utils.SplitAddress("Winzerstraße 7/2/4/77"), Is.EqualTo(("Winzerstraße", "7/2/4/77")));
 | 
			
		||||
                Assert.That(Utils.SplitAddress("Winzerstraße 95b"), Is.EqualTo(("Winzerstraße", "95b")));
 | 
			
		||||
                Assert.That(Utils.SplitAddress("Winzerstraße 1, TOP 3"), Is.EqualTo(("Winzerstraße", "1, TOP 3")));
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        [Test]
 | 
			
		||||
        public void Test_SplitName() {
 | 
			
		||||
            Assert.Multiple(() => {
 | 
			
		||||
                Assert.That(Utils.SplitName("Max Bauer", "Bauer"), Is.EqualTo(("Bauer", "Max")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Bauer Max", "Bauer"), Is.EqualTo(("Bauer", "Max")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Max und Moritz Bauer", "Bauer"), Is.EqualTo(("Bauer", "Max und Moritz")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Bauer Max und Moritz", "Bauer"), Is.EqualTo(("Bauer", "Max und Moritz")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Bauer GesbR", "Bauer"), Is.EqualTo(("Bauer", "GesbR")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Max und Moritz Bauer GesbR", "Bauer"), Is.EqualTo(("Bauer", "Max und Moritz GesbR")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Bauer Max und Moritz GesbR", "Bauer"), Is.EqualTo(("Bauer", "Max und Moritz GesbR")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Weingut Bauer", "Bauer"), Is.EqualTo(("Bauer", "Weingut")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Bauer Weingut", "Bauer"), Is.EqualTo(("Bauer", "Weingut")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Max und Moritz Bauer und Mustermann", "Bauer"), Is.EqualTo(("Bauer und Mustermann", "Max und Moritz")));
 | 
			
		||||
                Assert.That(Utils.SplitName("Bauer und Mustermann Max und Moritz", "Bauer"), Is.EqualTo(("Bauer und Mustermann", "Max und Moritz")));
 | 
			
		||||
                Assert.That(Utils.SplitName("ABC GesbR", "Bauer"), Is.EqualTo(((string, string?))("ABC GesbR", null)));
 | 
			
		||||
            });
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user