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

Billing: Fixes

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-01-23 01:16:53 +01:00
parent 1a492e4eff
commit 3931a4084c
6 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Elwig/Windows/ChartWindow.xaml.cs
View File

@ -15,6 +15,7 @@ using ScottPlot.Plottables;
using ScottPlot;
using Xceed.Wpf.Toolkit.Primitives;
using ScottPlot.Control;
using LinqKit;
namespace Elwig.Windows {
public partial class ChartWindow : ContextWindow {
@ -85,18 +86,13 @@ namespace Elwig.Windows {
PaymentVar = await Context.PaymentVariants.FindAsync(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
Season = await Context.Seasons.FindAsync(Year) ?? throw new ArgumentException("Season not found");
var attrVariants = (await Context.DeliveryParts
.Where(d => d.Year == Year)
.Select(d => $"{d.SortId}{d.AttrId}")
.Distinct()
.ToListAsync())
.Union(Context.WineVarieties.Select(v => v.SortId))
.Order()
.ToList();
var data = EditBillingData.FromJson(PaymentVar.Data, attrVariants);
GraphEntries = [ ..data.GetPaymentGraphEntries(Context, Season), ..data.GetQualityGraphEntries(Context, Season)];
var data = EditBillingData.FromJson(PaymentVar.Data, Utils.GetAttributeVarieties(Context, Year));
GraphEntries = [
..data.GetPaymentGraphEntries(Context, Season),
..data.GetQualityGraphEntries(Context, Season)
];
var contracts = ContractSelection.GetContractsForYear(Context, Year);
var contracts = Utils.GetContractsForYear(Context, Year);
FillingInputs = true;
ControlUtils.RenewItemsSource(ContractInput, contracts, g => (g as ContractSelection)?.Listing);
FillingInputs = false;
@ -638,7 +634,7 @@ namespace Elwig.Windows {
private async void SaveButton_Click(object sender, RoutedEventArgs e) {
var origData = BillingData.FromJson(PaymentVar.Data);
var data = BillingData.FromGraphEntries(GraphEntries, origData);
var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetAttributeVarieties(Context, Year, true));
EntityEntry<PaymentVar>? tr = null;
try {