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

DeliveryJournalData: Add delivery and member branch to excel export
All checks were successful
Test / Run tests (push) Successful in 2m52s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-08-02 11:42:27 +02:00
parent 5567d9f25a
commit cf05a0c658
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/Documents/PaymentVariantSummary.cshtml
View File

@ -49,7 +49,7 @@
<td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td> <td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td>
</tr> </tr>
<tr> <tr>
<th style="overflow: visible;">Nto./bto.-Zuschl:</th> <th style="overflow: visible;">Rebel-Zuschl.:</th>
<td colspan="3" class="center"> <td colspan="3" class="center">
@($"{Utils.GetSign(Model.BillingData.NetWeightModifier)}{Math.Abs(Model.BillingData.NetWeightModifier) * 100:N2}") % / @($"{Utils.GetSign(Model.BillingData.NetWeightModifier)}{Math.Abs(Model.BillingData.NetWeightModifier) * 100:N2}") % /
@($"{Utils.GetSign(Model.BillingData.GrossWeightModifier)}{Math.Abs(Model.BillingData.GrossWeightModifier) * 100:N2}") % @($"{Utils.GetSign(Model.BillingData.GrossWeightModifier)}{Math.Abs(Model.BillingData.GrossWeightModifier) * 100:N2}") %

2
Elwig/Helpers/Utils.cs
View File

@ -197,7 +197,7 @@ namespace Elwig.Helpers {
} }
public static void MailTo(string emailAddress) { public static void MailTo(string emailAddress) {
MailTo(new string[] { emailAddress }); MailTo([emailAddress]);
} }
public static void MailTo(IEnumerable<string> emailAddresses) { public static void MailTo(IEnumerable<string> emailAddresses) {

11
Elwig/Models/Dtos/DeliveryJournalData.cs
View File

@ -14,16 +14,18 @@ namespace Elwig.Models.Dtos {
("Pos", "Pos.", null, 10), ("Pos", "Pos.", null, 10),
("Date", "Datum", null, 20), ("Date", "Datum", null, 20),
("Time", "Zeit", null, 20), ("Time", "Zeit", null, 20),
("DeliveryBranch", "Zweigstelle", null, 30),
("MgNr", "MgNr.", null, 12), ("MgNr", "MgNr.", null, 12),
("Name1", "Name", null, 40), ("Name1", "Name", null, 40),
("Name2", "Vorname", null, 40), ("Name2", "Vorname", null, 40),
("MemberBranch", "Stamm-Zwst.", null, 30),
("SortId", "Sorte", null, 10), ("SortId", "Sorte", null, 10),
("AttrId", "Attr.", null, 15), ("AttrId", "Attr.", null, 15),
("CultId", "Bewirt.", null, 15), ("CultId", "Bewirt.", null, 15),
("QualId", "Qualität", null, 15), ("QualId", "Qualität", null, 15),
("Gradation", "Gradation", "°Oe|°KMW", 40), ("Gradation", "Gradation", "°Oe|°KMW", 40),
("Weight", "Gewicht", "kg", 20), ("Weight", "Gewicht", "kg", 20),
("NetGross", "bto./nto.", null, 20), ("IsNetWeight", "Gerebelt", null, 20),
("HkId", "Herkunft", null, 20), ("HkId", "Herkunft", null, 20),
("Modifiers", "Zu-/Abschläge", null, 40), ("Modifiers", "Zu-/Abschläge", null, 40),
("Comment", "Anmerkung", null, 60), ("Comment", "Anmerkung", null, 60),
@ -35,7 +37,7 @@ namespace Elwig.Models.Dtos {
public static async Task<DeliveryJournalData> FromQuery(IQueryable<DeliveryPart> query, List<string> filterNames) { public static async Task<DeliveryJournalData> FromQuery(IQueryable<DeliveryPart> query, List<string> filterNames) {
return new((await query return new((await query
.Include(p => p.Delivery.Member) .Include(p => p.Delivery.Member.Branch)
.Include(p => p.Delivery.Branch) .Include(p => p.Delivery.Branch)
.Include(p => p.PartModifiers).ThenInclude(m => m.Modifier) .Include(p => p.PartModifiers).ThenInclude(m => m.Modifier)
.Include(p => p.Variety) .Include(p => p.Variety)
@ -53,10 +55,12 @@ namespace Elwig.Models.Dtos {
public int Pos; public int Pos;
public DateOnly Date; public DateOnly Date;
public TimeOnly? Time; public TimeOnly? Time;
public string DeliveryBranch;
public int MgNr; public int MgNr;
public string Name1; public string Name1;
public string Name2; public string Name2;
public string AdministrativeName; public string AdministrativeName;
public string? MemberBranch;
public string SortId; public string SortId;
public string Variety; public string Variety;
public string? AttrId; public string? AttrId;
@ -71,7 +75,6 @@ namespace Elwig.Models.Dtos {
public double Oe => Gradation.Oe; public double Oe => Gradation.Oe;
public int Weight { get; set; } public int Weight { get; set; }
public bool IsNetWeight; public bool IsNetWeight;
public string NetGross => IsNetWeight ? "n" : "b";
public string? Modifiers; public string? Modifiers;
public string? Comment; public string? Comment;
@ -83,10 +86,12 @@ namespace Elwig.Models.Dtos {
Pos = p.DPNr; Pos = p.DPNr;
Date = d.Date; Date = d.Date;
Time = d.Time; Time = d.Time;
DeliveryBranch = d.Branch.Name;
MgNr = m.MgNr; MgNr = m.MgNr;
Name1 = m.FamilyName; Name1 = m.FamilyName;
Name2 = m.AdministrativeName2; Name2 = m.AdministrativeName2;
AdministrativeName = m.AdministrativeName; AdministrativeName = m.AdministrativeName;
MemberBranch = m.Branch?.Name;
SortId = p.SortId; SortId = p.SortId;
Variety = p.Variety.Name; Variety = p.Variety.Name;