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

[#34] First step of not using Bio as Attribute

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-02-19 22:14:47 +01:00
parent 092c5788a4
commit abbb5a12a6
19 changed files with 219 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Elwig/Models/Dtos/CreditNoteDeliveryData.cs
View File

@ -43,10 +43,11 @@ 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 variety, a.name AS attribute, q.name AS quality_level, d.oe, d.kmw
s.name AS variety, a.name AS attribute, c.name AS cultivation, 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
LEFT JOIN wine_cultivation c ON c.cultid = d.cultid
JOIN wine_quality_level q ON q.qualid = d.qualid
LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
LEFT JOIN payment_variant v ON v.year = d.year
@ -70,6 +71,7 @@ namespace Elwig.Models.Dtos {
public int DPNr;
public string Variety;
public string? Attribute;
public string? Cultivation;
public string[] Modifiers;
public string QualityLevel;
public (double Oe, double Kmw) Gradation;
@ -88,6 +90,7 @@ namespace Elwig.Models.Dtos {
DPNr = f.DPNr;
Variety = f.Variety;
Attribute = f.Attribute;
Cultivation = f.Cultivation;
var modifiers = (IEnumerable<Modifier>)(f.Modifiers ?? "").Split(',')
.Select(m => season?.Modifiers.FirstOrDefault(s => s.ModId == m))
.Where(m => m != null)
@ -149,6 +152,8 @@ namespace Elwig.Models.Dtos {
public string Variety { get; set; }
[Column("attribute")]
public string? Attribute { get; set; }
[Column("cultivation")]
public string? Cultivation { get; set; }
[Column("quality_level")]
public string QualityLevel { get; set; }
[Column("oe")]

2
Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs
View File

@ -73,6 +73,7 @@ namespace Elwig.Models.Dtos {
public int DPNr;
public string Variety;
public string? Attribute;
public string? Cultivation;
public string QualityLevel;
public (double Oe, double Kmw) Gradation;
public string[] Modifiers;
@ -85,6 +86,7 @@ namespace Elwig.Models.Dtos {
DPNr = p.DPNr;
Variety = p.Variety.Name;
Attribute = p.Attribute?.Name;
Cultivation = p.Cultivation?.Name;
QualityLevel = p.Quality.Name;
Gradation = (p.Oe, p.Kmw);
Modifiers = p.Modifiers