From 7af27ab5def37d65907889b036cd669e8b8a45dd Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Wed, 9 Aug 2023 22:41:00 +0200 Subject: [PATCH] Lieferscheine --- Elwig/App.xaml.cs | 31 +++++++- Elwig/Documents/BusinessDocument.cshtml | 2 +- Elwig/Documents/BusinessDocument.cshtml.cs | 14 +++- Elwig/Documents/BusinessLetter.cshtml.cs | 4 +- Elwig/Documents/DeliveryNote.cshtml | 61 +++++++++++--- Elwig/Documents/DeliveryNote.cshtml.cs | 10 ++- Elwig/Documents/Document.cshtml | 2 +- Elwig/Documents/Document.cshtml.cs | 20 +++-- Elwig/Documents/style.css | 93 +++++++++++++++++++++- Elwig/Helpers/ClientParameters.cs | 16 ++++ Elwig/Models/Branch.cs | 24 ++++++ Elwig/Models/Delivery.cs | 2 +- Elwig/Models/DeliveryPart.cs | 2 + Elwig/Models/WineOrigin.cs | 2 + Elwig/Windows/DeliveryAdminWindow.xaml | 5 +- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 20 ++++- 16 files changed, 269 insertions(+), 39 deletions(-) diff --git a/Elwig/App.xaml.cs b/Elwig/App.xaml.cs index 62f78a4..6c7eaff 100644 --- a/Elwig/App.xaml.cs +++ b/Elwig/App.xaml.cs @@ -20,6 +20,13 @@ namespace Elwig { public static readonly Config Config = new(DataPath + "config.ini"); public static string ZwstId { get; private set; } + public static string BranchName { get; private set; } + public static int? BranchPlz { get; private set; } + public static string? BranchOrt { get; private set; } + public static string? BranchAddress { get; private set; } + public static string? BranchPhoneNr { get; private set; } + public static string? BranchFaxNr { get; private set; } + public static string? BranchMobileNr { get; private set; } public static IEnumerable Scales { get; private set; } public static ClientParameters Client { get; private set; } @@ -48,13 +55,13 @@ namespace Elwig { new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)) ); - Dictionary branches = new(); + Dictionary branches = new(); using (var ctx = new AppDbContext()) { if (!ctx.Database.CanConnect()) { MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error); Shutdown(); } else { - branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => b.ZwstId); + branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Dest, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr)); } } Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged)); @@ -88,10 +95,26 @@ namespace Elwig { MessageBox.Show("Invalid branch name in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error); Shutdown(); } else { - ZwstId = branches[Config.Branch.ToLower()]; + var entry = branches[Config.Branch.ToLower()]; + ZwstId = entry.Item1; + BranchName = entry.Item2; + BranchPlz = entry.Item3; + BranchOrt = entry.Item4; + BranchAddress = entry.Item5; + BranchPhoneNr = entry.Item6; + BranchFaxNr = entry.Item7; + BranchMobileNr = entry.Item8; } } else if (branches.Count == 1) { - ZwstId = branches.First().Value; + var entry = branches.First().Value; + ZwstId = entry.Item1; + BranchName = entry.Item2; + BranchPlz = entry.Item3; + BranchOrt = entry.Item4; + BranchAddress = entry.Item5; + BranchPhoneNr = entry.Item6; + BranchFaxNr = entry.Item7; + BranchMobileNr = entry.Item8; } else { MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error); Shutdown(); diff --git a/Elwig/Documents/BusinessDocument.cshtml b/Elwig/Documents/BusinessDocument.cshtml index 3fc80fd..425642c 100644 --- a/Elwig/Documents/BusinessDocument.cshtml +++ b/Elwig/Documents/BusinessDocument.cshtml @@ -13,7 +13,7 @@
@Model.Address
- +
@RenderBody() diff --git a/Elwig/Documents/BusinessDocument.cshtml.cs b/Elwig/Documents/BusinessDocument.cshtml.cs index df5d5b3..1cee709 100644 --- a/Elwig/Documents/BusinessDocument.cshtml.cs +++ b/Elwig/Documents/BusinessDocument.cshtml.cs @@ -5,10 +5,20 @@ namespace Elwig.Documents { public Member Member; public bool IncludeSender = false; + public string Aside { get; set; } + public string? Location { get; set; } public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) { Member = m; + Location = App.BranchName; IncludeSender = includeSender; + var uid = (m.UstId ?? "-") + (m.IsBuchführend ? "" : " (pauschaliert)"); + Aside = $"" + + $"" + + $"" + + $"" + + $"" + + $"
Mitglied
Mitglieds-Nr.{m.MgNr}
Betriebs-Nr.{m.LfbisNr}
UID{uid}
"; } public string Address { @@ -16,9 +26,9 @@ namespace Elwig.Documents { var b = Member.BillingAddress; var plz = (b == null) ? Member.PostalDest.AtPlz : b.PostalDest.AtPlz; if (b != null) { - return $"{b.Name}\n{b.Address}\n{plz.Plz} {plz.Dest}"; + return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich"; } else { - return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}"; + return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich"; } } } diff --git a/Elwig/Documents/BusinessLetter.cshtml.cs b/Elwig/Documents/BusinessLetter.cshtml.cs index 8b44a00..4fac26d 100644 --- a/Elwig/Documents/BusinessLetter.cshtml.cs +++ b/Elwig/Documents/BusinessLetter.cshtml.cs @@ -2,8 +2,6 @@ using Elwig.Models; namespace Elwig.Documents { public class BusinessLetter : BusinessDocument { - public BusinessLetter(string title, Member m) : base(title, m) { - - } + public BusinessLetter(string title, Member m) : base(title, m) { } } } diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml index 5c46ac3..59cd4df 100644 --- a/Elwig/Documents/DeliveryNote.cshtml +++ b/Elwig/Documents/DeliveryNote.cshtml @@ -3,30 +3,67 @@ @model Elwig.Documents.DeliveryNote @{ Layout = "BusinessDocument"; } -

Traubenübernahmeschein Nr. @Model.Delivery.LsNr

- +
@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")
+

@Model.Title

+
++ + + + + + + + - - + + + + - - - + + + @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) { - + + + - - - + + + - } + + + @if (part.Comment != null) { + + } + @if (part.Temperature != null || part.Acid != null) { + + } + }
SorteQualitätsstufePos.SorteAttribut(e)Qualitätsstufe Gradation Gewicht
°KMW°Oekg[°Oe][°KMW][kg]
@part.DPNr @part.Variant.Name@string.Join(" / ", part.Attributes) @part.Quality.Name@part.Kmw@part.Oe@part.Weight@($"{part.Oe:N0}")@($"{part.Kmw:N1}")@($"{part.Weight:N0}")
Herkunft: @part.OriginString
+ @(part.ManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen")) +
Anmerkung: @part.Comment
@(part.Temperature != null ? $"Temperatur: {part.Temperature:N1} °C" : "")@(part.Temperature != null && part.Acid != null ? ", " : "")@(part.Acid != null ? $"Säure: {part.Acid:N1} g/l" : "")
+@if (Model.Delivery.Comment != null) { +

Amerkung zur Lieferung: @Model.Delivery.Comment

+} +
+ +@if (Model.Text != null) { +

@Model.Text

+} +
+
Genossenschaft
+
Mitglied
+
+
diff --git a/Elwig/Documents/DeliveryNote.cshtml.cs b/Elwig/Documents/DeliveryNote.cshtml.cs index 1900649..9915ba6 100644 --- a/Elwig/Documents/DeliveryNote.cshtml.cs +++ b/Elwig/Documents/DeliveryNote.cshtml.cs @@ -4,9 +4,17 @@ namespace Elwig.Documents { public class DeliveryNote : BusinessDocument { public Delivery Delivery; + public string? Text; - public DeliveryNote(Delivery d) : base($"Lieferschein {d.LsNr}", d.Member) { + public DeliveryNote(Delivery d) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) { Delivery = d; + Aside = Aside.Replace("", "") + + $"Lieferung" + + $"LS-Nr.{d.LsNr}" + + $"Datum/Zeit{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}" + + $"Zweigstelle{d.Branch.Name}" + + $""; + Text = App.Client.DeliveryNoteText; } } } diff --git a/Elwig/Documents/Document.cshtml b/Elwig/Documents/Document.cshtml index 494c18d..d711c63 100644 --- a/Elwig/Documents/Document.cshtml +++ b/Elwig/Documents/Document.cshtml @@ -24,7 +24,7 @@
@Raw(Model.Header)
- @Model.FullDateString + @($"{Model.Date:dddd, d. MMMM yyyy}")
@Raw(Model.Footer)
diff --git a/Elwig/Documents/Document.cshtml.cs b/Elwig/Documents/Document.cshtml.cs index 0c7bd6d..2dbddc6 100644 --- a/Elwig/Documents/Document.cshtml.cs +++ b/Elwig/Documents/Document.cshtml.cs @@ -9,10 +9,15 @@ namespace Elwig.Documents { private TempFile? PdfFile = null; public Document(string title) { + var c = App.Client; DataPath = App.DataPath; Title = title; - Header = $"

{App.Client.Name}

"; - Footer = App.Client.NameFull; + Header = $"

{c.Name}

"; + Footer = $"{c.NameFull}
" + + $"{c.Address} \u00b7 {c.Plz} {c.Ort} \u00b7 Österreich \u00b7 " + + $"Tel.: {c.PhoneNr} \u00b7 Fax: {c.FaxNr}
{c.EmailAddress} \u00b7 {c.Website} \u00b7 " + + $"Betriebs-Nr.: {c.LfbisNr} \u00b7 UID: {c.UstId}
" + + $"BIC: {c.Bic} \u00b7 IBAN: {c.Iban}"; Date = DateTime.Today; } @@ -23,20 +28,13 @@ namespace Elwig.Documents { public void Dispose() { PdfFile?.Dispose(); PdfFile = null; + GC.SuppressFinalize(this); } public string DataPath { get; set; } - public string Title { get; set; } - public string Header { get; set; } - public string Footer { get; set; } - - public string FullDateString { - get => Date.ToString("dddd, d. MMMM yyyy"); - } - public DateTime Date { get; set; } private async Task Render() { @@ -57,7 +55,7 @@ namespace Elwig.Documents { await File.WriteAllTextAsync(tmpHtml.FilePath, await Render()); await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath); } - Pdf.UpdateMetadata(pdf.FilePath, Title, "Winzergenossenschaft für Matzen und Umgebung reg. Gen.m.b.H."); + Pdf.UpdateMetadata(pdf.FilePath, Title, App.Client.NameFull); PdfFile = pdf; } diff --git a/Elwig/Documents/style.css b/Elwig/Documents/style.css index a3ecdf2..49d3554 100644 --- a/Elwig/Documents/style.css +++ b/Elwig/Documents/style.css @@ -10,6 +10,7 @@ body { margin: 0; + break-inside: avoid; } .m1, .m2, .m3 { @@ -24,6 +25,10 @@ body { .m2 {top: 148.5mm;} .m3 {top: 210mm;} +header, .address-wrapper, aside, main { + overflow: hidden; +} + header { height: 45mm; padding: 5mm; @@ -33,7 +38,14 @@ header { right: 0; text-align: center; } + +header h1{ + font-size: 18pt; + margin-top: 1cm; +} + .spacing {height: 20mm;} + .info-wrapper { width: 100%; height:45mm; @@ -79,6 +91,38 @@ aside { 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 { + padding: 0.5mm 1mm; + text-align: left; + font-size: 10pt; +} + +aside table tbody th { + font-weight: normal; +} + +.main-wrapper, +.main-wrapper * { + break-inside: auto; +} + main { margin: 8.46mm 20mm 4.23mm 25mm; } @@ -104,6 +148,11 @@ main h1 { margin-bottom: 2em; } +main p.comment { + font-size: 10pt; + hyphens: auto; +} + .footer-wrapper { padding: 0 20mm 0 25mm; position: running(page-footer); @@ -139,6 +188,48 @@ footer { table { width: 100%; border-collapse: collapse; + table-layout: fixed; +} + +table.delivery { + margin-bottom: 1cm; +} + +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; +} + + +main .bottom { + bottom: 0; + position: absolute; + width: calc(100% - 25mm - 20mm); +} + +main .signatures { + width: 100%; + display: flex; + justify-content: space-around; + margin: 20mm 0 5mm 0; +} + +main .signatures > * { + width: 5cm; + border-top: 1pt solid black; + padding-top: 1mm; + text-align: center; + font-size: 10pt; } @page { @@ -154,7 +245,7 @@ table { width: 210mm; } header, .address-wrapper, aside, main { - border: 1px solid lightgray; + border: 1pt solid lightgray; } .m1, .m2, .m3 {display: none;} header {top: 0;} diff --git a/Elwig/Helpers/ClientParameters.cs b/Elwig/Helpers/ClientParameters.cs index ae2c47f..15d8674 100644 --- a/Elwig/Helpers/ClientParameters.cs +++ b/Elwig/Helpers/ClientParameters.cs @@ -32,6 +32,8 @@ namespace Elwig.Helpers { public string? EmailAddress; public string? Website; + public string? DeliveryNoteText; + public ClientParameters() { NameToken = "WGM"; NameShort = "WG Matzen"; @@ -41,7 +43,21 @@ namespace Elwig.Helpers { Plz = 2243; Ort = "Matzen"; Address = "Schloßstraße 6"; + PhoneNr = "+43 2289 2221"; + FaxNr = "+43 2289 2221"; + EmailAddress = "winzermatzen@aon.at"; + Website = "winzermatzen.at"; + LfbisNr = "0901768"; + UstId = "ATU16328105"; + Bic = "RLNWATWWGAE"; + Iban = "AT92 3209 2000 0240 0075"; Sender2 = "E Österreichische Post AG Eco Brief"; + DeliveryNoteText = "Das Mitglied erklärt, dass die gelieferte Ware dem österreichischen Weingesetz entspricht und insbesondere die " + + "Bestimmungen über die Mengenbeschränkungen sowie für die Erzeugung von Wein besonderer Leseart eingehalten wird. " + + "Alle maßgeblichen Veränderungen obiger Angaben sind der Winzergenossenschaft unverzüglich zu melden. " + + "Das Mitglied bestätigt weiters mit seiner Unterschrift, dass die gelieferten Trauben entsprechend der guten Herstellungspraxis erzeugt wurden, " + + "insbesondere die Einhaltung der vom Hersteller vorgegebenen Wartefristen für Pflanzenschutzmittel. " + + "Weiters wird bestätigt, dass die Datenschutzerklärung der Winzergenossenschaft für Matzen und Umgebung in der Übernahmestelle zur freien Entnahme aufliegt."; } } } diff --git a/Elwig/Models/Branch.cs b/Elwig/Models/Branch.cs index 471c89a..5a00a48 100644 --- a/Elwig/Models/Branch.cs +++ b/Elwig/Models/Branch.cs @@ -11,6 +11,30 @@ namespace Elwig.Models { [Column("name")] public string Name { get; set; } + [Column("country")] + public int? CountryNum { get; set; } + + [Column("postal_dest")] + public string? PostalDestId { get; set; } + + [Column("address")] + public string? Address { get; set; } + + [ForeignKey("CountryNum")] + public virtual Country? Country { get; private set; } + + [ForeignKey("CountryNum, PostalDestId")] + public virtual PostalDest? PostalDest { get; private set; } + + [Column("phone_nr")] + public string? PhoneNr { get; set; } + + [Column("fax_nr")] + public string? FaxNr { get; set; } + + [Column("mobile_nr")] + public string? MobileNr { get; set; } + [InverseProperty("Branch")] public virtual ISet Members { get; private set; } } diff --git a/Elwig/Models/Delivery.cs b/Elwig/Models/Delivery.cs index 1b24cf9..2735ad2 100644 --- a/Elwig/Models/Delivery.cs +++ b/Elwig/Models/Delivery.cs @@ -86,7 +86,7 @@ namespace Elwig.Models { public int SearchScore(IEnumerable keywords) { var list = new string?[] { - LsNr, Year.ToString(), Date.ToString("dd.MM.yyyy"), Time?.ToString("HH:ss"), + LsNr, Year.ToString(), Date.ToString("dd.MM.yyyy"), Time?.ToString("HH:mm"), MgNr.ToString(), Member.FamilyName, Member.MiddleName, Member.GivenName, Member.BillingAddress?.Name, Comment }.ToList(); diff --git a/Elwig/Models/DeliveryPart.cs b/Elwig/Models/DeliveryPart.cs index a4ddd6c..51897b8 100644 --- a/Elwig/Models/DeliveryPart.cs +++ b/Elwig/Models/DeliveryPart.cs @@ -106,5 +106,7 @@ namespace Elwig.Models { [NotMapped] public IEnumerable Modifiers => PartModifiers.Select(m => m.Modifier); + + 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}" : ""); } } diff --git a/Elwig/Models/WineOrigin.cs b/Elwig/Models/WineOrigin.cs index 335b3f8..ac7bff6 100644 --- a/Elwig/Models/WineOrigin.cs +++ b/Elwig/Models/WineOrigin.cs @@ -40,5 +40,7 @@ namespace Elwig.Models { public override string ToString() { return Name; } + + public string OriginString => (Parent != null ? $"{Parent.OriginString} / " : "") + Name; } } diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml index 203bd95..8e246c2 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml +++ b/Elwig/Windows/DeliveryAdminWindow.xaml @@ -58,7 +58,10 @@ - + + diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index f69095e..2edd945 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -87,6 +87,20 @@ namespace Elwig.Windows { } } + private async void Menu_Print_ShowDeliveryNote_Click(object sender, RoutedEventArgs evt) { + if (DeliveryList.SelectedItem is not Delivery d) return; + using var doc = new DeliveryNote(d); + await doc.Generate(); + doc.Show(); + } + + private async void Menu_Print_PrintDeliveryNote_Click(object sender, RoutedEventArgs evt) { + if (DeliveryList.SelectedItem is not Delivery d) return; + using var doc = new DeliveryNote(d); + await doc.Generate(); + await doc.Print(); + } + private void OnSecondPassed(object? sender, EventArgs? evt) { if (IsReceipt && IsCreating) { var now = DateTime.Now; @@ -407,8 +421,12 @@ namespace Elwig.Windows { RefreshDeliveryParts(); if (DeliveryList.SelectedItem != null) { DeleteDeliveryButton.IsEnabled = true; + Menu_Print_ShowDeliveryNote.IsEnabled = !IsEditing && !IsCreating; + Menu_Print_PrintDeliveryNote.IsEnabled = !IsEditing && !IsCreating; } else { DeleteDeliveryButton.IsEnabled = false; + Menu_Print_ShowDeliveryNote.IsEnabled = false; + Menu_Print_PrintDeliveryNote.IsEnabled = false; } } @@ -466,7 +484,7 @@ namespace Elwig.Windows { await RefreshDeliveryList(); RefreshDeliveryParts(); if (p != null) { - var doc = new DeliveryNote(p.Delivery); + using var doc = new DeliveryNote(p.Delivery); await doc.Generate(); doc.Show(); //await doc.Print(2);