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

DeliveryAdminWindow: Add filter for branch when in Receipt mode

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-11-16 09:32:25 +01:00
parent 363005ad49
commit 6db2e0a4ec
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/App.xaml.cs
View File

@ -35,6 +35,7 @@ namespace Elwig {
} }
} }
public static int BranchNum { get; private set; }
public static string ZwstId { get; private set; } public static string ZwstId { get; private set; }
public static string BranchName { get; private set; } public static string BranchName { get; private set; }
public static int? BranchPlz { get; private set; } public static int? BranchPlz { get; private set; }
@ -91,6 +92,7 @@ namespace Elwig {
Shutdown(); Shutdown();
return; return;
} }
BranchNum = branches.Count;
} }
Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged)); Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));

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

@ -296,6 +296,10 @@ namespace Elwig.Windows {
private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, List<string>)> GetFilters() { private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, List<string>)> GetFilters() {
List<string> filterNames = new(); List<string> filterNames = new();
IQueryable<Delivery> deliveryQuery = Context.Deliveries; IQueryable<Delivery> deliveryQuery = Context.Deliveries;
if (IsReceipt && App.BranchNum > 1) {
deliveryQuery = deliveryQuery.Where(d => d.ZwstId == App.ZwstId);
filterNames.Add($"Zweigstelle {App.BranchName}");
}
if (Member != null) { if (Member != null) {
deliveryQuery = deliveryQuery.Where(d => d.MgNr == Member.MgNr); deliveryQuery = deliveryQuery.Where(d => d.MgNr == Member.MgNr);
filterNames.Add(Member.AdministrativeName); filterNames.Add(Member.AdministrativeName);