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

Dtos: Rename CreditNote and DeliveryConfirmation DTOs

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-01-28 22:52:23 +01:00
parent 8665c93702
commit 6bcb2fb406
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Elwig/Documents/CreditNote.cs
View File

@ -11,7 +11,7 @@ namespace Elwig.Documents {
public PaymentMember? Payment; public PaymentMember? Payment;
public Credit? Credit; public Credit? Credit;
public CreditNoteData Data; public CreditNoteDeliveryData Data;
public string? Text; public string? Text;
public string CurrencySymbol; public string CurrencySymbol;
public int Precision; public int Precision;
@ -20,7 +20,7 @@ namespace Elwig.Documents {
public decimal MemberTotalUnderDelivery; public decimal MemberTotalUnderDelivery;
public decimal MemberAutoBusinessShares; public decimal MemberAutoBusinessShares;
public CreditNote(AppDbContext ctx, PaymentMember p, CreditNoteData data, Dictionary<string, UnderDelivery>? underDeliveries = null) : public CreditNote(AppDbContext ctx, PaymentMember p, CreditNoteDeliveryData data, Dictionary<string, UnderDelivery>? underDeliveries = null) :
base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.Name)} – {p.Variant.Name}", p.Member) { base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.Name)} – {p.Variant.Name}", p.Member) {
UseBillingAddress = true; UseBillingAddress = true;
ShowDateAndLocation = true; ShowDateAndLocation = true;

4
Elwig/Documents/DeliveryConfirmation.cs
View File

@ -10,11 +10,11 @@ namespace Elwig.Documents {
public new static string Name => "Anlieferungsbestätigung"; public new static string Name => "Anlieferungsbestätigung";
public Season Season; public Season Season;
public DeliveryConfirmationData Data; public DeliveryConfirmationDeliveryData Data;
public string? Text = App.Client.TextDeliveryConfirmation; public string? Text = App.Client.TextDeliveryConfirmation;
public Dictionary<string, MemberBucket> MemberBuckets; public Dictionary<string, MemberBucket> MemberBuckets;
public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationData data) : public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationDeliveryData data) :
base($"{Name} {year}", m) { base($"{Name} {year}", m) {
Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season"); Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
ShowDateAndLocation = true; ShowDateAndLocation = true;

14
Elwig/Models/Dtos/CreditNoteData.cs → Elwig/Models/Dtos/CreditNoteDeliveryData.cs
View File

@ -6,7 +6,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Elwig.Models.Dtos { namespace Elwig.Models.Dtos {
public class CreditNoteData : DataTable<CreditNoteRow> { public class CreditNoteDeliveryData : DataTable<CreditNoteDeliveryRow> {
private static readonly (string, string, string?)[] FieldNames = new[] { private static readonly (string, string, string?)[] FieldNames = new[] {
("", "", (string?)null), // TODO ("", "", (string?)null), // TODO
@ -17,7 +17,7 @@ namespace Elwig.Models.Dtos {
private readonly int? AvNr; private readonly int? AvNr;
private readonly int? MgNr; private readonly int? MgNr;
private CreditNoteData(IEnumerable<CreditNoteRow> rows, int year, int? tgnr, int? avnr = null, int? mgnr = null) : private CreditNoteDeliveryData(IEnumerable<CreditNoteDeliveryRow> rows, int year, int? tgnr, int? avnr = null, int? mgnr = null) :
base($"Traubengutschrift {year}/{tgnr}", rows, FieldNames) { base($"Traubengutschrift {year}/{tgnr}", rows, FieldNames) {
Year = year; Year = year;
TgNr = tgnr; TgNr = tgnr;
@ -25,14 +25,14 @@ namespace Elwig.Models.Dtos {
MgNr = mgnr; MgNr = mgnr;
} }
public static async Task<IDictionary<int, CreditNoteData>> ForPaymentVariant(DbSet<CreditNoteRowSingle> table, DbSet<Season> seasons, int year, int avnr) { public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteRowSingle> table, DbSet<Season> seasons, int year, int avnr) {
return (await FromDbSet(table, year, avnr)) return (await FromDbSet(table, year, avnr))
.GroupBy( .GroupBy(
r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr }, r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },
(k, g) => new CreditNoteRow(g, seasons)) (k, g) => new CreditNoteDeliveryRow(g, seasons))
.GroupBy( .GroupBy(
r => new { r.Year, r.AvNr, r.MgNr, r.TgNr }, r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
(k, g) => new CreditNoteData(g, k.Year, k.TgNr, mgnr: k.MgNr)) (k, g) => new CreditNoteDeliveryData(g, k.Year, k.TgNr, mgnr: k.MgNr))
.ToDictionary(d => d.MgNr ?? 0); .ToDictionary(d => d.MgNr ?? 0);
} }
@ -59,7 +59,7 @@ namespace Elwig.Models.Dtos {
} }
} }
public class CreditNoteRow { public class CreditNoteDeliveryRow {
public int Year; public int Year;
public int? TgNr; public int? TgNr;
@ -77,7 +77,7 @@ namespace Elwig.Models.Dtos {
public decimal? TotalModifiers; public decimal? TotalModifiers;
public decimal? Amount; public decimal? Amount;
public CreditNoteRow(IEnumerable<CreditNoteRowSingle> rows, DbSet<Season> seasons) { public CreditNoteDeliveryRow(IEnumerable<CreditNoteRowSingle> rows, DbSet<Season> seasons) {
var f = rows.First(); var f = rows.First();
Year = f.Year; Year = f.Year;
TgNr = f.TgNr; TgNr = f.TgNr;

20
Elwig/Models/Dtos/DeliveryConfirmationData.cs → Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs
View File

@ -5,7 +5,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Elwig.Models.Dtos { namespace Elwig.Models.Dtos {
public class DeliveryConfirmationData : DataTable<DeliveryConfirmationRow> { public class DeliveryConfirmationDeliveryData : DataTable<DeliveryConfirmationDeliveryRow> {
private static readonly (string, string, string?, int)[] FieldNames = new[] { private static readonly (string, string, string?, int)[] FieldNames = new[] {
("LsNr", "LsNr.", null, 26), ("LsNr", "LsNr.", null, 26),
@ -21,26 +21,26 @@ namespace Elwig.Models.Dtos {
private readonly int MgNr; private readonly int MgNr;
private DeliveryConfirmationData(IEnumerable<DeliveryConfirmationRow> rows, int year, Member m) : private DeliveryConfirmationDeliveryData(IEnumerable<DeliveryConfirmationDeliveryRow> rows, int year, Member m) :
base($"Anlieferungsbestätigung", $"Anlieferungsbestätigung {year} – {m.AdministrativeName}", rows, FieldNames) { base($"Anlieferungsbestätigung", $"Anlieferungsbestätigung {year} – {m.AdministrativeName}", rows, FieldNames) {
MgNr = m.MgNr; MgNr = m.MgNr;
} }
public static DeliveryConfirmationData CreateEmpty(int year, Member m) { public static DeliveryConfirmationDeliveryData CreateEmpty(int year, Member m) {
return new([], year, m); return new([], year, m);
} }
public static async Task<IDictionary<int, DeliveryConfirmationData>> ForSeason(DbSet<DeliveryPart> table, int year) { public static async Task<IDictionary<int, DeliveryConfirmationDeliveryData>> ForSeason(DbSet<DeliveryPart> table, int year) {
return (await FromDbSet(table, year)) return (await FromDbSet(table, year))
.GroupBy( .GroupBy(
p => p.Delivery.Member, p => p.Delivery.Member,
p => new DeliveryConfirmationRow(p), p => new DeliveryConfirmationDeliveryRow(p),
(k, g) => new DeliveryConfirmationData(g, year, k) (k, g) => new DeliveryConfirmationDeliveryData(g, year, k)
).ToDictionary(d => d.MgNr, d => d); ).ToDictionary(d => d.MgNr, d => d);
} }
public static async Task<DeliveryConfirmationData> ForMember(DbSet<DeliveryPart> table, int year, Member m) { public static async Task<DeliveryConfirmationDeliveryData> ForMember(DbSet<DeliveryPart> table, int year, Member m) {
return new DeliveryConfirmationData((await FromDbSet(table, year, m.MgNr)).Select(p => new DeliveryConfirmationRow(p)), year, m); return new DeliveryConfirmationDeliveryData((await FromDbSet(table, year, m.MgNr)).Select(p => new DeliveryConfirmationDeliveryRow(p)), year, m);
} }
private static async Task<IEnumerable<DeliveryPart>> FromDbSet(DbSet<DeliveryPart> table, int? year = null, int? mgnr = null) { private static async Task<IEnumerable<DeliveryPart>> FromDbSet(DbSet<DeliveryPart> table, int? year = null, int? mgnr = null) {
@ -68,7 +68,7 @@ namespace Elwig.Models.Dtos {
} }
} }
public class DeliveryConfirmationRow { public class DeliveryConfirmationDeliveryRow {
public string LsNr; public string LsNr;
public int DPNr; public int DPNr;
public string Variety; public string Variety;
@ -79,7 +79,7 @@ namespace Elwig.Models.Dtos {
public int Weight; public int Weight;
public (string Name, int Value)[] Buckets; public (string Name, int Value)[] Buckets;
public DeliveryConfirmationRow(DeliveryPart p) { public DeliveryConfirmationDeliveryRow(DeliveryPart p) {
var d = p.Delivery; var d = p.Delivery;
LsNr = d.LsNr; LsNr = d.LsNr;
DPNr = p.DPNr; DPNr = p.DPNr;

4
Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs
View File

@ -74,9 +74,9 @@ namespace Elwig.Dialogs {
} }
IEnumerable<Member> list = await members.ToListAsync(); IEnumerable<Member> list = await members.ToListAsync();
var data = await DeliveryConfirmationData.ForSeason(Context.DeliveryParts, Year); var data = await DeliveryConfirmationDeliveryData.ForSeason(Context.DeliveryParts, Year);
using var doc = Document.Merge(list.Select(m => using var doc = Document.Merge(list.Select(m =>
new DeliveryConfirmation(Context, Year, m, data.TryGetValue(m.MgNr, out var d) ? d : DeliveryConfirmationData.CreateEmpty(Year, m)) { new DeliveryConfirmation(Context, Year, m, data.TryGetValue(m.MgNr, out var d) ? d : DeliveryConfirmationDeliveryData.CreateEmpty(Year, m)) {
//DoubleSided = true //DoubleSided = true
} }
)); ));

2
Elwig/Windows/PaymentVariantsWindow.xaml.cs
View File

@ -488,7 +488,7 @@ namespace Elwig.Windows {
members = members.OrderBy(m => m.MgNr); members = members.OrderBy(m => m.MgNr);
IEnumerable<Member> list = await members.ToListAsync(); IEnumerable<Member> list = await members.ToListAsync();
var data = await CreditNoteData.ForPaymentVariant(Context.CreditNoteRows, Context.Seasons, v.Year, v.AvNr); var data = await CreditNoteDeliveryData.ForPaymentVariant(Context.CreditNoteRows, Context.Seasons, v.Year, v.AvNr);
var payments = await Context.MemberPayments.Where(p => p.Year == v.Year && p.AvNr == v.AvNr).ToDictionaryAsync(c => c.MgNr); var payments = await Context.MemberPayments.Where(p => p.Year == v.Year && p.AvNr == v.AvNr).ToDictionaryAsync(c => c.MgNr);
await Context.GetMemberAreaCommitmentBuckets(Year, 0); await Context.GetMemberAreaCommitmentBuckets(Year, 0);
using var doc = Document.Merge(list.Select(m => using var doc = Document.Merge(list.Select(m =>

2
Elwig/Windows/TestWindow.xaml.cs
View File

@ -48,7 +48,7 @@ namespace Elwig.Windows {
private async void ZipButton_Click(object sender, RoutedEventArgs evt) { private async void ZipButton_Click(object sender, RoutedEventArgs evt) {
using var ctx = new AppDbContext(); using var ctx = new AppDbContext();
using var ods = new OdsFile(@"C:\Users\Lorenz\Desktop\test.ods"); using var ods = new OdsFile(@"C:\Users\Lorenz\Desktop\test.ods");
await ods.AddTable(await DeliveryConfirmationData.ForMember(ctx.DeliveryParts, 2023, ctx.Members.Find(2948))); await ods.AddTable(await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, 2023, ctx.Members.Find(2948)));
} }
} }
} }