Elwig: Rename buchführend, funktionär, volllieferant, and gebunden
This commit is contained in:
@@ -13,7 +13,7 @@ namespace Elwig.Models.Dtos {
|
||||
("AttrId", "Attr.", null, 10),
|
||||
("CultId", "Bewirt.", null, 15),
|
||||
("QualId", "Qual.", null, 15),
|
||||
("Geb", "gebunden", null, 20),
|
||||
("Contracted", "gebunden", null, 20),
|
||||
("Weight", "Menge", "kg", 20),
|
||||
];
|
||||
|
||||
@@ -28,12 +28,12 @@ namespace Elwig.Models.Dtos {
|
||||
private static async Task<IEnumerable<WeightBreakdownRow>> FromDbSet(DbSet<WeightBreakdownRow> table, int year, string? zwstid) {
|
||||
zwstid = zwstid == null ? "NULL" : $"'{zwstid}'";
|
||||
return await table.FromSqlRaw($"""
|
||||
SELECT type, sortid, attrid, cultid, v.qualid, geb, SUM(weight) AS weight
|
||||
SELECT type, sortid, attrid, cultid, v.qualid, contracted, SUM(weight) AS weight
|
||||
FROM v_stat_total v
|
||||
LEFT JOIN wine_quality_level q ON q.qualid = v.qualid
|
||||
WHERE year = {year} AND ({zwstid} IS NULL OR zwstid = {zwstid})
|
||||
GROUP BY type, sortid, attrid, cultid, v.qualid, geb
|
||||
ORDER BY type DESC, sortid, attrid, cultid, q.min_kmw, geb
|
||||
GROUP BY type, sortid, attrid, cultid, v.qualid, contracted
|
||||
ORDER BY type DESC, sortid, attrid, cultid, q.min_kmw, contracted
|
||||
""").ToListAsync();
|
||||
}
|
||||
}
|
||||
@@ -50,8 +50,8 @@ namespace Elwig.Models.Dtos {
|
||||
public string? CultId { get; set; }
|
||||
[Column("qualid")]
|
||||
public required string QualId { get; set; }
|
||||
[Column("geb")]
|
||||
public required string Geb { get; set; }
|
||||
[Column("contracted")]
|
||||
public required string Contracted { get; set; }
|
||||
[Column("weight")]
|
||||
public int Weight { get; set; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user