Compare commits
2 Commits
363005ad49
...
df5007826d
| Author | SHA1 | Date | |
|---|---|---|---|
| df5007826d | |||
| 6db2e0a4ec |
+3
-1
@@ -35,6 +35,7 @@ namespace Elwig {
|
||||
}
|
||||
}
|
||||
|
||||
public static int BranchNum { get; private set; }
|
||||
public static string ZwstId { get; private set; }
|
||||
public static string BranchName { get; private set; }
|
||||
public static int? BranchPlz { get; private set; }
|
||||
@@ -71,7 +72,7 @@ namespace Elwig {
|
||||
new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))
|
||||
);
|
||||
|
||||
Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "";
|
||||
Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split("+")[0] ?? "0.0.0";
|
||||
|
||||
try {
|
||||
AppDbUpdater.CheckDb();
|
||||
@@ -91,6 +92,7 @@ namespace Elwig {
|
||||
Shutdown();
|
||||
return;
|
||||
}
|
||||
BranchNum = branches.Count;
|
||||
}
|
||||
|
||||
Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
|
||||
|
||||
@@ -296,6 +296,10 @@ namespace Elwig.Windows {
|
||||
private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, List<string>)> GetFilters() {
|
||||
List<string> filterNames = new();
|
||||
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) {
|
||||
deliveryQuery = deliveryQuery.Where(d => d.MgNr == Member.MgNr);
|
||||
filterNames.Add(Member.AdministrativeName);
|
||||
|
||||
Reference in New Issue
Block a user