Graph.cs: move from Models/ to Helpers/Billing/

ChartWindow: use System.Text.Json instead of Newtonsoft.Json
Documents: Update documents
2023-09-06 14:04:14 +02:00 · 2023-09-06 14:00:30 +02:00 · 2023-09-05 20:41:03 +02:00 · 2023-09-05 15:20:53 +02:00 · 2023-09-05 15:16:23 +02:00 · 2023-09-04 13:15:51 +02:00
9 changed files with 96 additions and 84 deletions
--- a/Elwig/Documents/BusinessDocument.cshtml
+++ b/Elwig/Documents/BusinessDocument.cshtml
@@ -2,7 +2,6 @@
@inherits TemplatePage<Elwig.Documents.BusinessDocument>
@model Elwig.Documents.BusinessDocument
@{ Layout = "Document"; }
 <div class="info-wrapper">
    <div class="address-wrapper">
        <div class="sender">
--- a/Elwig/Documents/BusinessLetter.cshtml
+++ b/Elwig/Documents/BusinessLetter.cshtml
@@ -2,7 +2,6 @@
@inherits TemplatePage<Elwig.Documents.BusinessLetter>
@model Elwig.Documents.BusinessLetter
@{ Layout = "BusinessDocument"; }
 <p>Sehr geehrtes Mitglied,</p>
 <p>nein.</p>
 <p>Mit freundlichen Grüßen<br/>Ihre Winzergenossenschaft</p>
--- a/Elwig/Documents/DeliveryNote.cshtml
+++ b/Elwig/Documents/DeliveryNote.cshtml
@@ -2,7 +2,6 @@
@inherits TemplatePage<Elwig.Documents.DeliveryNote>
@model Elwig.Documents.DeliveryNote
@{ Layout = "BusinessDocument"; }
 <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
 <h1>@Model.Title</h1>
@{
@@ -11,24 +10,35 @@
 <script>
    document.addEventListener("DOMContentLoaded", () => {
        const hidden = document.getElementsByClassName("hidden")[0];
-        const bottom = hidden.offsetTop + hidden.offsetHeight;
+        const table = document.getElementsByClassName("delivery")[0];
-        const cm = bottom * 2.54 / 96 * window.devicePixelRatio;
+        const stats = document.getElementById("delivery-stats");
        const mm = px2mm(0, hidden.offsetTop + hidden.offsetHeight);
        const heightTable = px2mm(table.offsetTop, hidden.offsetTop + hidden.offsetHeight);
-        if (cm > 25.75) {
+        if (mm >= heightA4 - heightFooter) {
-            // force page break
+            if (heightTable + 10 >= heightMain) {
-            const table = document.getElementsByClassName("delivery")[0];
+                // 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 hr = document.createElement("hr");
+                const p = document.createElement("p");
-            hr.classList.add("page-break");
+                p.innerText = "Siehe nächste Seite."
-            table.before(hr);
+                hr.before(p);
-
+            }
            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);
        }
    });
 </script>
--- a/Elwig/Documents/Document.cshtml
+++ b/Elwig/Documents/Document.cshtml
@@ -1,7 +1,6 @@
@using RazorLight
@inherits TemplatePage<Elwig.Documents.Document>
@model Elwig.Documents.Document
 <!DOCTYPE html>
 <html lang="de-AT">
 <head>
@@ -13,9 +12,15 @@
            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>
+    <script src="file:///@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"/>
 </head>
 <body>
    <div class="m1"></div>
--- a/Elwig/Documents/style.css
+++ b/Elwig/Documents/style.css
@@ -165,7 +165,7 @@ main p.comment {
 }
 .pre-footer {
-    margin: 4.23mm 0;
+    margin: 1em 0;
    font-size: 10pt;
    display: flex;
 }
@@ -327,6 +327,10 @@ hr.page-break {
    break-after: page;
 }
 tr.page-break {
    break-before: page;
 }
@page {
    size: A4;
    margin: 25mm 0 35mm 0;
--- a/Elwig/Helpers/Billing/Graph.cs
+++ b/Elwig/Helpers/Billing/Graph.cs
@@ -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.Text.Json.Nodes;
 using System.Threading.Tasks;
 using System.Windows.Markup;
-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) {
+        private void ParseGraphData(JsonObject graphData) {
-            var GraphPoints = graphData.Children().OfType<JProperty>().ToDictionary(p => int.Parse(p.Name[..^2]), p => (double)p.Value);
+            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() {
+        public JsonObject ToJson() {
-            JObject graph = new();
+            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;
        }
--- a/Elwig/Helpers/ClientParameters.cs
+++ b/Elwig/Helpers/ClientParameters.cs
@@ -7,10 +7,10 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers {
    public class ClientParameters {
-        public enum Type { Matzen, GWK };
+        public enum Type { Matzen, Winzerkeller };
        public bool IsMatzen => Client == Type.Matzen;
-        public bool IsGWK => Client == Type.GWK;
+        public bool IsWinzerkeller => Client == Type.Winzerkeller;
        public string NameToken;
        public string NameShort;
@@ -61,7 +61,7 @@ namespace Elwig.Helpers {
                NameType = parameters["CLIENT_NAME_TYPE"] ?? throw new KeyNotFoundException();
                switch (Name) {
                    case "Winzergenossenschaft für Matzen und Umgebung": Client = Type.Matzen; break;
-                    case "Winzerkeller im Weinviertel": Client = Type.GWK; break;
+                    case "Winzerkeller im Weinviertel": Client = Type.Winzerkeller; break;
                };
                Plz = int.Parse(parameters["CLIENT_PLZ"] ?? "");
--- a/Elwig/Windows/BaseDataWindow.xaml.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.cs
@@ -212,7 +212,7 @@ namespace Elwig.Windows {
            p.Address = ClientAddressInput.Text;
            p.Plz = int.Parse(ClientPlzInput.Text);
            p.Ort = ClientOrtInput.Text;
-            p.Iban = ClientIbanInput.Text.Length > 0 ? ClientIbanInput.Text.Replace(" ", "") : null;
+            p.Iban = ClientIbanInput.Text.Length > 0 ? ClientIbanInput.Text : null;
            p.Bic = ClientBicInput.Text.Length > 0 ? ClientBicInput.Text : null;
            p.UstIdNr = ClientUstIdNrInput.Text.Length > 0 ? ClientUstIdNrInput.Text : null;
            p.LfbisNr = ClientLfbisNrInput.Text.Length > 0 ? ClientLfbisNrInput.Text : null;
--- a/Elwig/Windows/ChartWindow.xaml.cs
+++ b/Elwig/Windows/ChartWindow.xaml.cs
@@ -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>()) {
+            foreach (var sorte in auszahlungsSorten) {
-                if (((JProperty)sorte).Name == "Kurven") {
+                if (sorte.Key == "Kurven") continue;
-                    continue;
+                foreach (var attribut in sorte.Value.AsObject()) {
-                }
+                    foreach (var bindung in attribut.Value.AsObject()) {
-                foreach (var attribut in sorte.Values().OfType<JToken>()) {
+                        if ((int)bindung.Value.AsValue() == num) {
-                    foreach (var bindung in attribut.Values().OfType<JProperty>()) {
+                            contracts.Add($"{sorte.Key}/{attribut.Key}/{bindung.Key}");
                        if ((int)(bindung).Value == num) {
                            contracts.Add($"{((JProperty)sorte).Name}/{((JProperty)attribut).Name}/{bindung.Name}");
                        }
                    }
                }
@@ -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>()) {
+            foreach (var sorte in auszahlungsSorten) {
-                if (((JProperty)sorte).Name == "Kurven") {
+                if (sorte.Key == "Kurven") continue;
-                    continue;
+                foreach (var attribut in sorte.Value.AsObject()) {
-                }
+                    var bindungen = attribut.Value.AsObject();
-                foreach (var attribut in sorte.Values().OfType<JToken>()) {
+                    foreach (var bindung in bindungen) {
-                    List<JProperty> itemsToRemove = new();
+                        int v = (int)bindung.Value;
-                    foreach (var bindung in attribut.Values().OfType<JProperty>()) {
+                        if (v == num - 1) {
-                        if ((int)bindung.Value == num - 1) {
+                            bindungen.Remove(bindung.Key);
-                            itemsToRemove.Add(bindung);
+                        } else if (v > num - 1) {
-                        } else if ((int)bindung.Value > num - 1) {
+                            bindungen[bindung.Key] = v - 1;
                            bindung.Value = (int)bindung.Value - 1;
                        }
                    }
                    itemsToRemove.ForEach(i => i.Remove());
                }
            }
@@ -231,6 +222,7 @@ namespace Elwig.Windows {
        private void InitPlot() {
            OechslePricePlotScatter = OechslePricePlot.Plot.AddScatter(Graph.DataX, Graph.DataY);
            OechslePricePlot.Configuration.DoubleClickBenchmark = false;
            OechslePricePlotScatter.LineColor = Color.Blue;
            OechslePricePlotScatter.MarkerColor = Color.Blue;
            OechslePricePlotScatter.MarkerSize = 9;
@@ -398,7 +390,7 @@ namespace Elwig.Windows {
                    PriceInput.Text = Graph.DataY[PrimaryMarkedPointIndex].ToString();
-                    EnableActionButtons();
+                    if (IsEditing || IsCreating) EnableActionButtons();
                    OechslePricePlot.Render();
                    return;
                }
@@ -430,6 +422,8 @@ namespace Elwig.Windows {
                return;
            }
            FlattenGraph(0, PrimaryMarkedPointIndex, Graph.DataY[PrimaryMarkedPointIndex]);
            SaveButton.IsEnabled = true;
            ResetButton.IsEnabled = true;
        }
        private void RightFlatButton_Click(object sender, RoutedEventArgs evt) {
@@ -437,6 +431,8 @@ namespace Elwig.Windows {
                return;
            }
            FlattenGraph(PrimaryMarkedPointIndex, Graph.DataY.Length - 1, Graph.DataY[PrimaryMarkedPointIndex]);
            SaveButton.IsEnabled = true;
            ResetButton.IsEnabled = true;
        }
        private void InterpolateButton_Click(object sender, RoutedEventArgs evt) {
@@ -451,6 +447,8 @@ namespace Elwig.Windows {
            for (int i = lowIndex; i < highIndex - 1; i++) {
                Graph.DataY[i + 1] = Math.Round(Graph.DataY[i] + step, 4); // TODO richtig runden
            }
            SaveButton.IsEnabled = true;
            ResetButton.IsEnabled = true;
        }
        private void LinearIncreaseButton_Click(object sender, RoutedEventArgs e) { 
@@ -462,6 +460,8 @@ namespace Elwig.Windows {
                return;
            }
            LinearIncreaseGraph(PrimaryMarkedPointIndex, Graph.DataY.Length - 1, priceIncrease.Value);
            SaveButton.IsEnabled = true;
            ResetButton.IsEnabled = true;
        }
        private void OechslePricePlot_MouseDown(object sender, MouseEventArgs e) {
@@ -662,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;
            }
Author	SHA1	Message	Date
Lorenz Stechauner	28b424fe65	Graph.cs: move from Models/ to Helpers/Billing/	2023-09-06 14:04:14 +02:00
Lorenz Stechauner	324c5db94e	ChartWindow: use System.Text.Json instead of Newtonsoft.Json	2023-09-06 14:00:30 +02:00
Lorenz Stechauner	faaeefe6ce	Documents: Update documents	2023-09-05 20:41:03 +02:00
Lorenz Stechauner	b76d43a5ff	ClientParameters: Change GWK to Winzerkeller	2023-09-05 15:20:53 +02:00
Lorenz Stechauner	8b48882c86	BaseDataWindow: Keep IBAN spaces when saving	2023-09-05 15:16:23 +02:00
Thomas Hilscher	286279b89f	Fixed ChartWindow	2023-09-04 13:15:51 +02:00