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

Elwig: Rename (wine) variant to variety

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-01-27 11:36:43 +01:00
parent 519e903d1c
commit d3aca196dd
12 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Elwig/Models/Dtos/CreditNoteData.cs
View File

@ -1,8 +1,5 @@
using Elwig.Helpers;
using Elwig.Helpers.Billing;
using Elwig.Models.Entities;
using Elwig.Models.Entities;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
@ -46,7 +43,7 @@ namespace Elwig.Models.Dtos {
return await table.FromSqlRaw($"""
SELECT d.year, c.tgnr, v.avnr, d.mgnr, d.did, d.lsnr, d.dpnr, d.weight, d.modifiers,
b.bktnr, d.sortid, b.discr, b.value, pb.price, pb.amount, p.net_amount, p.amount AS total_amount,
s.name AS variant, a.name AS attribute, q.name AS quality_level, d.oe, d.kmw
s.name AS variety, a.name AS attribute, q.name AS quality_level, d.oe, d.kmw
FROM v_delivery d
JOIN wine_variety s ON s.sortid = d.sortid
LEFT JOIN wine_attribute a ON a.attrid = d.attrid
@ -71,7 +68,7 @@ namespace Elwig.Models.Dtos {
public string LsNr;
public int DPNr;
public string Variant;
public string Variety;
public string? Attribute;
public string[] Modifiers;
public string QualityLevel;
@ -89,7 +86,7 @@ namespace Elwig.Models.Dtos {
LsNr = f.LsNr;
DPNr = f.DPNr;
Variant = f.Variant;
Variety = f.Variety;
Attribute = f.Attribute;
var modifiers = (IEnumerable<Modifier>)(f.Modifiers ?? "").Split(',')
.Select(m => season?.Modifiers.FirstOrDefault(s => s.ModId == m))
@ -148,8 +145,8 @@ namespace Elwig.Models.Dtos {
public long? NetAmount { get; set; }
[Column("total_amount")]
public long? TotalAmount { get; set; }
[Column("variant")]
public string Variant { get; set; }
[Column("variety")]
public string Variety { get; set; }
[Column("attribute")]
public string? Attribute { get; set; }
[Column("quality_level")]

8
Elwig/Models/Dtos/DeliveryConfirmationData.cs
View File

@ -10,7 +10,7 @@ namespace Elwig.Models.Dtos {
private static readonly (string, string, string?, int)[] FieldNames = new[] {
("LsNr", "LsNr.", null, 26),
("DPNr", "Pos.", null, 8),
("Variant", "Sorte", null, 40),
("Variety", "Sorte", null, 40),
("Attribute", "Attribut", null, 20),
("Modifiers", "Zu-/Abschläge", null, 30),
("QualityLevel", "Qualitätsstufe", null, 25),
@ -51,7 +51,7 @@ namespace Elwig.Models.Dtos {
if (mgnr != null) q = q.Where(p => p.Delivery.MgNr == mgnr);
await q
.Include(p => p.Delivery)
.Include(p => p.Variant)
.Include(p => p.Variety)
.Include(p => p.Attribute)
.Include(p => p.Quality)
.Include(p => p.Buckets)
@ -71,7 +71,7 @@ namespace Elwig.Models.Dtos {
public class DeliveryConfirmationRow {
public string LsNr;
public int DPNr;
public string Variant;
public string Variety;
public string? Attribute;
public string QualityLevel;
public (double Oe, double Kmw) Gradation;
@ -83,7 +83,7 @@ namespace Elwig.Models.Dtos {
var d = p.Delivery;
LsNr = d.LsNr;
DPNr = p.DPNr;
Variant = p.Variant.Name;
Variety = p.Variety.Name;
Attribute = p.Attribute?.Name;
QualityLevel = p.Quality.Name;
Gradation = (p.Oe, p.Kmw);