winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

ChartWindow: Added second graph for gebunden

Browse Source
This commit is contained in:
Thomas Hilscher
2024-01-19 23:54:16 +01:00
parent 4a49a17b6a
commit 0cb7b4bfc8
5 changed files with 428 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Elwig/Helpers/Billing/ContractSelection.cs Normal file
View File

@ -0,0 +1,47 @@
using Elwig.Models.Entities;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Elwig.Helpers.Billing {
public class ContractSelection : IComparable<ContractSelection> {
public WineVar? Variety { get; }
public WineAttr? Attribute { get; }
public string Listing => Variety != null || Attribute != null ? $"{Variety?.SortId}{Attribute?.AttrId}" : "";
public ContractSelection(WineVar? var, WineAttr? attr) {
Variety = var;
Attribute = attr;
}
public ContractSelection(WineVar var) {
Variety = var;
}
public ContractSelection(WineAttr attr) {
Attribute = attr;
}
public override string ToString() {
return (Variety != null ? $"{Variety.Name}" : "") + (Attribute != null ? $" {Attribute.Name}" : "");
}
public static List<ContractSelection> GetContractsForYear(AppDbContext context, int year) {
return context.DeliveryParts
.Where(d => d.Year == year)
.Select(d => new ContractSelection(d.Variant, d.Attribute))
.Distinct()
.ToList()
.Union(context.WineVarieties.Select(v => new ContractSelection(v)))
.ToList();
}
public int CompareTo(ContractSelection? other) {
//MessageBox.Show($"{Listing} -- {other.Listing} : {Listing.CompareTo(other.Listing)}");
return other != null ?
Listing.CompareTo(other.Listing) :
throw new ArgumentException();
}
}
}

53
Elwig/Helpers/Billing/Graph.cs
View File

@ -26,6 +26,22 @@ namespace Elwig.Helpers.Billing {
DataY = dataY;
}
public double GetOechsleAt(int index) {
return DataX[index];
}
public void SetOechsleAt(int index, double oechsle) {
DataX[index] = oechsle;
}
public void SetPriceAt(int index, double price) {
DataY[index] = price;
}
public double GetPriceAt(int index) {
return DataY[index];
}
private void ParseGraphData(Dictionary<double, decimal> graphPoints, int minX, int maxX) {
if (graphPoints.Keys.Count < 1) {
return;
@ -71,19 +87,48 @@ namespace Elwig.Helpers.Billing {
}
}
public void FlattenGraph(int begin, int end, double value) {
private void FlattenGraph(int begin, int end, double value) {
for (int i = begin; i <= end; i++) {
DataY[i] = value;
}
}
public void LinearIncreaseGraph(int begin, int end, double inc) {
public void FlattenGraphLeft(int pointIndex) {
FlattenGraph(0, pointIndex, DataY[pointIndex]);
}
public void FlattenGraphRight(int pointIndex) {
FlattenGraph(pointIndex, DataY.Length - 1, DataY[pointIndex]);
}
private void LinearIncreaseGraph(int begin, int end, double inc) {
for (int i = begin; i < end; i++) {
DataY[i + 1] = DataY[i] + inc;
DataY[i + 1] = Math.Round(DataY[i] + inc, 4); //TODO richtig runden
}
}
public JsonObject ToJson(string mode) {
public void LinearIncreaseGraphToEnd(int begin, double inc) {
LinearIncreaseGraph(begin, DataY.Length - 1, inc);
}
public void InterpolateGraph(int firstPoint, int secondPoint) {
int steps = Math.Abs(firstPoint - secondPoint);
if (firstPoint == -1 || secondPoint == -1 || steps < 2) {
return;
}
var (lowIndex, highIndex) = firstPoint < secondPoint ? (firstPoint, secondPoint) : (secondPoint, firstPoint);
double step = (DataY[highIndex] - DataY[lowIndex]) / steps;
for (int i = lowIndex; i < highIndex - 1; i++) {
DataY[i + 1] = Math.Round(DataY[i] + step, 4); // TODO richtig runden
}
}
public JsonNode ToJson(string mode) {
if (DataY.Distinct().Count() == 1) {
return JsonValue.Create(DataY[0]);
}
var data = new JsonObject();
if (DataY[0] != DataY[1]) {

34
Elwig/Helpers/Billing/GraphEntry.cs
View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System.Text.Json.Nodes;
namespace Elwig.Helpers.Billing {
@ -8,8 +9,10 @@ namespace Elwig.Helpers.Billing {
public BillingData.CurveMode Mode { get; set; }
public Graph DataGraph { get; set; }
public Graph? GebundenGraph { get; set; }
public decimal? GebundenFlatPrice { get; set; }
public List<string> Contracts { get; set; }
public decimal? GebundenFlatBonus { get; set; }
public List<ContractSelection> Contracts { get; set; }
public string ContractsStringSimple => Contracts.Any() ? string.Join(", ", Contracts.Select(c => c.Listing)) : "-";
public string ContractsString => Contracts.Any() ? string.Join("\n", Contracts.Select(c => c.ToString())) : "-";
private int MinX { get; set; }
private int MaxX { get; set; }
@ -22,9 +25,10 @@ namespace Elwig.Helpers.Billing {
Contracts = [];
}
public GraphEntry(int id, BillingData.CurveMode mode, Dictionary<double, decimal> data, int minX, int maxX) :
this(id, mode, minX, maxX) {
public GraphEntry(int id, BillingData.CurveMode mode, Dictionary<double, decimal> data, Dictionary<double, decimal>? gebunden,
int minX, int maxX) : this(id, mode, minX, maxX) {
DataGraph = new Graph(data, minX, maxX);
if (gebunden != null) GebundenGraph = new Graph(gebunden, minX, maxX);
}
public GraphEntry(int id, BillingData.Curve curve, int minX, int maxX) :
@ -35,17 +39,29 @@ namespace Elwig.Helpers.Billing {
}
private GraphEntry(int id, BillingData.CurveMode mode, Graph dataGraph, Graph? gebundenGraph,
decimal? gebundenFlatPrice, List<string> contracts, int minX, int maxX) {
decimal? gebundenFlatPrice, List<ContractSelection> contracts, int minX, int maxX) {
Id = id;
Mode = mode;
MinX = minX;
MaxX = maxX;
DataGraph = dataGraph;
GebundenGraph = gebundenGraph;
GebundenFlatPrice = gebundenFlatPrice;
GebundenFlatBonus = gebundenFlatPrice;
Contracts = contracts;
}
public void AddGebundenGraph() {
GebundenGraph ??= new Graph(MinX, MaxX);
}
public void RemoveGebundenGraph() {
GebundenGraph = null;
}
public void SetGebundenFlatBonus(decimal? value) {
GebundenFlatBonus = value;
}
public JsonObject ToJson() {
var curve = new JsonObject {
["id"] = Id,
@ -54,8 +70,8 @@ namespace Elwig.Helpers.Billing {
curve["data"] = DataGraph.ToJson(Mode.ToString().ToLower());
if (GebundenFlatPrice != null) {
curve["geb"] = GebundenFlatPrice.ToString();
if (GebundenFlatBonus != null) {
curve["geb"] = GebundenFlatBonus;
} else if (GebundenGraph != null) {
curve["geb"] = GebundenGraph.ToJson(Mode.ToString().ToLower());
}
@ -64,7 +80,7 @@ namespace Elwig.Helpers.Billing {
}
public GraphEntry Copy(int id) {
return new GraphEntry(id, Mode, (Graph)DataGraph.Clone(), (Graph?)GebundenGraph?.Clone(), GebundenFlatPrice, Contracts, MinX, MaxX);
return new GraphEntry(id, Mode, (Graph)DataGraph.Clone(), (Graph?)GebundenGraph?.Clone(), GebundenFlatBonus, [], MinX, MaxX);
}
}
}