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

Billing: Rename attributeVariants and contracts to vaributes

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-01-27 11:08:10 +01:00
parent 31b0ae245d
commit dd568b81e8
10 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Elwig/Helpers/Billing/EditBillingData.cs
View File

@ -7,15 +7,15 @@ using System.Text.Json.Nodes;
namespace Elwig.Helpers.Billing {
public class EditBillingData : BillingData {
protected readonly IEnumerable<string> AttributeVariants;
protected readonly IEnumerable<string> Vaributes;
public EditBillingData(JsonObject data, IEnumerable<string> attributeVariants) :
public EditBillingData(JsonObject data, IEnumerable<string> vaributes) :
base(data) {
AttributeVariants = attributeVariants;
Vaributes = vaributes;
}
public static EditBillingData FromJson(string json, IEnumerable<string> attributeVariants) {
return new(ParseJson(json), attributeVariants);
public static EditBillingData FromJson(string json, IEnumerable<string> vaributes) {
return new(ParseJson(json), vaributes);
}
private (Dictionary<int, Curve>, Dictionary<int, List<string>>) GetGraphEntries(JsonNode root) {
@ -56,7 +56,7 @@ namespace Elwig.Helpers.Billing {
}
Dictionary<int, List<string>> dict3 = curves.ToDictionary(c => c.Key, _ => new List<string>());
foreach (var (selector, value) in GetSelection(root, AttributeVariants)) {
foreach (var (selector, value) in GetSelection(root, Vaributes)) {
int? idx = null;
if (value.TryGetValue<decimal>(out var val)) {
idx = Array.IndexOf(virtCurves, val) + virtOffset;
@ -75,7 +75,7 @@ namespace Elwig.Helpers.Billing {
var attrs = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
return entries
.Select(e => new GraphEntry(e.Key, precision, curves[e.Key], e.Value
.Select(s => new ContractSelection(vars[s[..2]], s.Length > 2 ? attrs[s[2..]] : null))
.Select(s => new Varibute(vars[s[..2]], s.Length > 2 ? attrs[s[2..]] : null))
.ToList()))
.ToList();
}
@ -83,7 +83,7 @@ namespace Elwig.Helpers.Billing {
public IEnumerable<GraphEntry> GetPaymentGraphEntries(AppDbContext ctx, Season season) {
var root = GetPaymentEntry();
var (curves, entries) = GetGraphEntries(root);
return CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Contracts.Count > 0);
return CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0);
}
public IEnumerable<GraphEntry> GetQualityGraphEntries(AppDbContext ctx, Season season, int idOffset = 0) {
@ -91,7 +91,7 @@ namespace Elwig.Helpers.Billing {
if (root == null || root["WEI"] is not JsonNode qualityWei)
return [];
var (curves, entries) = GetGraphEntries(qualityWei);
var list = CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Contracts.Count > 0);
var list = CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0);
foreach (var e in list) {
e.Id += idOffset;
e.Abgewertet = true;