Compare commits

..

9 Commits

Author SHA1 Message Date
1f4fe2129d Bump version to 1.0.4.1
All checks were successful
Deploy / Build and Deploy (push) Successful in 1m49s
2026-03-27 12:29:28 +01:00
cdb4b0a2bd Tests: Update dependencies
All checks were successful
Test / Run tests (push) Successful in 1m54s
2026-03-27 12:19:39 +01:00
ddfc86197d Elwig: Update dependencies 2026-03-27 12:19:31 +01:00
ae0a082421 MailWindow: Fail silently when disposing documents
All checks were successful
Test / Run tests (push) Successful in 1m49s
2026-03-27 12:16:41 +01:00
3c52156b7e Documents: Fix letterhead and other problems
All checks were successful
Test / Run tests (push) Successful in 2m39s
2026-03-27 12:06:19 +01:00
982a6616e1 DeliveryNote: Set date to be mtime
All checks were successful
Test / Run tests (push) Successful in 2m36s
2026-03-19 20:37:18 +01:00
b1075d1e69 DeliveryAdminWindow: Ensure that bulk actions are not performed while editing or creating
All checks were successful
Test / Run tests (push) Successful in 2m1s
2026-03-16 22:58:35 +01:00
cc018ded10 ContextWindow: Use EnsureContextRenewed() correctly 2026-03-16 22:58:04 +01:00
0aefab5d63 DeliveryConfirmation: Fix text alignment
All checks were successful
Test / Run tests (push) Successful in 2m3s
2026-03-16 19:47:33 +01:00
17 changed files with 139 additions and 101 deletions

View File

@@ -2,6 +2,27 @@
Changelog Changelog
========= =========
[v1.0.4.1][v1.0.4.1] (2026-03-27) {#v1.0.4.1}
---------------------------------------------
### Behobene Fehler {#v1.0.4.1-bugfixes}
* In der Anlieferungsbestätigung (`DeliveryConfirmation`) war in einer Spalte der Text nicht rechtsbündig. (0aefab5d63)
* Die zweite Zeile des Absenders wurde nicht mehr abgedruckt und der Briefkopf (`Letterhead`) beinhaltete zu viele Informationen. (3c52156b7e)
### Sonstiges {#v1.0.4.1-misc}
* Evtl. wurden bei Änderungen in der Datenbank unnötigerweise einige Daten in Elwig doppelt angefordert. (cc018ded10)
* Massenaktionen im Lieferungen-Fenster (`DeliveryAdminWindow`) sind nun nicht mehr während dem Bearbeiten oder Erstellen möglich. (b1075d1e69)
* Das Datum auf Lieferscheinen (`DeliveryNote`) ist nun statt des heutigen, das Datum der letzten Änderung der Lieferung. (982a6616e1)
* Sollte es im Rundschreiben-Fenster (`MailWindow`) zu einem Fehler während dem Bereinigen der Dokumenten kommen wird dieser ignoriert. (ae0a082421)
* Abhängigkeiten aktualisiert. (ddfc86197d, cdb4b0a2bd)
[v1.0.4.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.4.1
[v1.0.4.0][v1.0.4.0] (2026-03-16) {#v1.0.4.0} [v1.0.4.0][v1.0.4.0] (2026-03-16) {#v1.0.4.0}
--------------------------------------------- ---------------------------------------------

View File

@@ -2,6 +2,7 @@ using Elwig.Helpers;
using Elwig.Models; using Elwig.Models;
using Elwig.Models.Entities; using Elwig.Models.Entities;
using iText.Kernel.Colors; using iText.Kernel.Colors;
using iText.Kernel.Geom;
using iText.Kernel.Pdf; using iText.Kernel.Pdf;
using iText.Kernel.Pdf.Action; using iText.Kernel.Pdf.Action;
using iText.Kernel.Pdf.Canvas; using iText.Kernel.Pdf.Canvas;
@@ -53,9 +54,8 @@ namespace Elwig.Documents {
IncludeSender = includeSender; IncludeSender = includeSender;
} }
protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) { protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
base.RenderHeader(doc, pdf); base.BeforeRenderBody(doc, pdf);
var uid = new KernedParagraph(Member.UstIdNr ?? "-", 10); var uid = new KernedParagraph(Member.UstIdNr ?? "-", 10);
if (!Member.IsBuchführend) uid.Add(Normal(" ")).Add(Italic("(pauschaliert)")); if (!Member.IsBuchführend) uid.Add(Normal(" ")).Add(Italic("(pauschaliert)"));
Aside = new Table(ColsMM(22.5, 42.5)) Aside = new Table(ColsMM(22.5, 42.5))
@@ -68,6 +68,20 @@ namespace Elwig.Documents {
.AddCell(NewAsideCell("UID:", isName: true)).AddCell(NewAsideCell(uid)); .AddCell(NewAsideCell("UID:", isName: true)).AddCell(NewAsideCell(uid));
} }
protected void RenderAddress(Canvas canvas, Rectangle pageSize) {
canvas.Add(new Div()
.SetFixedPositionMM(25, 50, 80, 45, pageSize)
.SetFont(NF)
.Add(new KernedParagraph(IncludeSender ? $"{App.Client.Sender1}\n{App.Client.Sender2}" : "", 8).SetMargins(8, 0, 8, 0).SetHeight(16.0625f))
.Add(new KernedParagraph(Address, 12).SetMargin(0).SetHeight(12 * 5)));
}
protected static void RenderAside(Table aside, Canvas canvas, Rectangle pageSize) {
canvas.Add(new Div()
.SetFixedPositionMM(125, 50, 65, 50, pageSize)
.Add(aside));
}
protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
base.RenderBody(doc, pdf); base.RenderBody(doc, pdf);
@@ -84,16 +98,10 @@ namespace Elwig.Documents {
header.Add(new KernedParagraph(App.Client.NameTypeFull, 12).SetFont(NF).SetMargin(0)); header.Add(new KernedParagraph(App.Client.NameTypeFull, 12).SetFont(NF).SetMargin(0));
canvas.Add(header); canvas.Add(header);
// address // address
canvas.Add(new Div() RenderAddress(canvas, pageSize);
.SetFixedPositionMM(25, 50, 80, 45, pageSize)
.SetFont(NF)
.Add(new KernedParagraph(IncludeSender ? $"{App.Client.Sender1}\n{App.Client.Sender2}" : "", 8).SetMargin(0).SetHeight(16).SetPaddings(8, 0, 8, 0))
.Add(new KernedParagraph(Address, 12).SetMargin(0).SetHeight(12 * 5)));
// aside // aside
if (Aside != null) { if (Aside != null) {
canvas.Add(new Div() RenderAside(Aside, canvas, pageSize);
.SetFixedPositionMM(125, 50, 65, 50, pageSize)
.Add(Aside));
} }
} }

View File

@@ -95,8 +95,8 @@ namespace Elwig.Documents {
} }
} }
protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) { protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
base.RenderHeader(doc, pdf); base.BeforeRenderBody(doc, pdf);
Aside?.AddCell(NewAsideCell("Gutschrift", 2)) Aside?.AddCell(NewAsideCell("Gutschrift", 2))
.AddCell(NewAsideCell("TG-Nr.:", isName: true)).AddCell(NewAsideCell(Payment?.Credit != null ? $"{Payment.Credit.Year}/{Payment.Credit.TgNr:000}" : "-")) .AddCell(NewAsideCell("TG-Nr.:", isName: true)).AddCell(NewAsideCell(Payment?.Credit != null ? $"{Payment.Credit.Year}/{Payment.Credit.TgNr:000}" : "-"))
.AddCell(NewAsideCell("Datum:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.Date:dd.MM.yyyy}")) .AddCell(NewAsideCell("Datum:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.Date:dd.MM.yyyy}"))

View File

@@ -31,8 +31,8 @@ namespace Elwig.Documents {
MemberStats = AppDbContext.GetMemberStats(Season.Year, m.MgNr).GetAwaiter().GetResult(); MemberStats = AppDbContext.GetMemberStats(Season.Year, m.MgNr).GetAwaiter().GetResult();
} }
protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) { protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
base.RenderHeader(doc, pdf); base.BeforeRenderBody(doc, pdf);
var firstDay = Data.Rows.MinBy(r => r.Date)?.Date; var firstDay = Data.Rows.MinBy(r => r.Date)?.Date;
var lastDay = Data.Rows.MaxBy(r => r.Date)?.Date; var lastDay = Data.Rows.MaxBy(r => r.Date)?.Date;
Aside?.AddCell(NewAsideCell("Saison", 2)) Aside?.AddCell(NewAsideCell("Saison", 2))
@@ -120,8 +120,8 @@ namespace Elwig.Documents {
} }
if (i == p.Buckets.Length - 1) { if (i == p.Buckets.Length - 1) {
sub.AddCell(NewTd($"{p.Weight:N0}")); sub.AddCell(NewTd($"{p.Weight:N0}", right: true));
sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, center: true).SetFont(SF).SetPadding(0)); sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, right: true).SetFont(SF).SetPadding(0));
} else { } else {
sub.AddCell(NewCell(colspan: 2)); sub.AddCell(NewCell(colspan: 2));
} }

View File

@@ -32,12 +32,13 @@ namespace Elwig.Documents {
Delivery = d; Delivery = d;
Text = App.Client.TextDeliveryNote; Text = App.Client.TextDeliveryNote;
DocumentId = d.LsNr; DocumentId = d.LsNr;
Date = DateOnly.FromDateTime(d.ModifiedAt);
IsDoublePaged = true; IsDoublePaged = true;
MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? []; MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
} }
protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) { protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
base.RenderHeader(doc, pdf); base.BeforeRenderBody(doc, pdf);
Aside?.AddCell(NewAsideCell("Lieferung", 2)) Aside?.AddCell(NewAsideCell("Lieferung", 2))
.AddCell(NewAsideCell("LS-Nr.:", isName: true)).AddCell(NewAsideCell(Delivery.LsNr)) .AddCell(NewAsideCell("LS-Nr.:", isName: true)).AddCell(NewAsideCell(Delivery.LsNr))
.AddCell(NewAsideCell("Datum/Zeit:", isName: true)).AddCell(NewAsideCell($"{Delivery.Date:dd.MM.yyyy} / {Delivery.Time:HH:mm}")) .AddCell(NewAsideCell("Datum/Zeit:", isName: true)).AddCell(NewAsideCell($"{Delivery.Date:dd.MM.yyyy} / {Delivery.Time:HH:mm}"))

View File

@@ -88,11 +88,15 @@ namespace Elwig.Documents {
} }
public int Render(string path) { public int Render(string path) {
using var writer = new PdfWriter(path); using (var writer = new PdfWriter(path)) {
return Render(writer); Render(writer);
}
using var reader = new PdfReader(path);
using var pdf = new PdfDocument(reader);
return pdf.GetNumberOfPages();
} }
private int Render(PdfWriter writer) { private void Render(PdfWriter writer) {
NF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\times.ttf", PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED); NF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\times.ttf", PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
BF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesbd.ttf", PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED); BF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesbd.ttf", PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
IF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesi.ttf", PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED); IF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesi.ttf", PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
@@ -117,16 +121,14 @@ namespace Elwig.Documents {
_doc = new iText.Layout.Document(pdf, iText.Kernel.Geom.PageSize.A4); _doc = new iText.Layout.Document(pdf, iText.Kernel.Geom.PageSize.A4);
try { try {
_doc.SetFont(NF).SetFontSize(12); _doc.SetFont(NF).SetFontSize(12);
RenderHeader(_doc, pdf); BeforeRenderBody(_doc, pdf);
RenderBody(_doc, pdf); RenderBody(_doc, pdf);
var pageNum = pdf.GetNumberOfPages();
return pageNum;
} finally { } finally {
_doc.Close(); _doc.Close();
} }
} }
protected virtual void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) { } protected virtual void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
protected virtual void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { } protected virtual void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
@@ -150,84 +152,77 @@ namespace Elwig.Documents {
using var mergedPdf = new PdfDocument(writer); using var mergedPdf = new PdfDocument(writer);
var merger = new PdfMerger(mergedPdf); var merger = new PdfMerger(mergedPdf);
PdfPage? letterheadPage = null; (PdfPage Page, int InsertIndex, int DocIndex)? letterhead = null;
int letterheadInsertIndex = 0;
int letterheadDocIndex = 0;
int p = mergedPdf.GetNumberOfPages();
for (int i = 0; i < m.Documents.Count; i++) { for (int i = 0; i < m.Documents.Count; i++) {
if (cancelToken?.IsCancellationRequested ?? false) if (cancelToken?.IsCancellationRequested ?? false)
throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!"); throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
var doc = m.Documents[i]; var doc = m.Documents[i];
int p0 = mergedPdf.GetNumberOfPages(); int p0 = p;
if (letterheadPage != null && doc is Letterhead) { if (letterhead != null && doc is Letterhead) {
if (mergedPdf.GetNumberOfPages() <= letterheadInsertIndex) { if (p0 <= letterhead.Value.InsertIndex) {
mergedPdf.AddPage(letterheadPage); mergedPdf.AddPage(letterhead.Value.Page);
mergedPdf.AddNewPage(); mergedPdf.AddNewPage();
} else { } else {
mergedPdf.AddPage(letterheadInsertIndex + 1, letterheadPage); mergedPdf.AddPage(letterhead.Value.InsertIndex + 1, letterhead.Value.Page);
mergedPdf.AddNewPage(letterheadInsertIndex + 2); mergedPdf.AddNewPage(letterhead.Value.InsertIndex + 2);
} }
pageNums[letterheadDocIndex] = 1; pageNums[letterhead.Value.DocIndex] = 1;
letterheadPage = null; letterhead = null;
p += 2;
} }
if (doc is RawPdfDocument) { if (doc is RawPdfDocument) {
if (IsDoublePaged && doc is Letterhead) { using var reader = new PdfReader(doc.PdfPath);
using var reader = new PdfReader(doc.PdfPath); using var src = new PdfDocument(reader);
using var src = new PdfDocument(reader); merger.Merge(src, 1, src.GetNumberOfPages());
letterheadPage = src.GetPage(1).CopyTo(mergedPdf); p += src.GetNumberOfPages();
letterheadInsertIndex = p0;
letterheadDocIndex = i;
} else {
using var reader = new PdfReader(doc.PdfPath);
using var src = new PdfDocument(reader);
merger.Merge(src, 1, src.GetNumberOfPages());
}
} else { } else {
int pageNum = doc.Render(tmpPdf.FilePath); int pageNum = doc.Render(tmpPdf.FilePath);
if (IsDoublePaged && doc is Letterhead) { if (IsDoublePaged && doc is Letterhead) {
using var reader = new PdfReader(tmpPdf.FilePath); using var reader = new PdfReader(tmpPdf.FilePath);
using var src = new PdfDocument(reader); using var src = new PdfDocument(reader);
letterheadPage = src.GetPage(1).CopyTo(mergedPdf); letterhead = (src.GetPage(1).CopyTo(mergedPdf), p0, i);
letterheadInsertIndex = p0;
letterheadDocIndex = i;
} else { } else {
using var reader = new PdfReader(tmpPdf.FilePath); using var reader = new PdfReader(tmpPdf.FilePath);
using var src = new PdfDocument(reader); using var src = new PdfDocument(reader);
merger.Merge(src, 1, pageNum); merger.Merge(src, 1, pageNum);
p += pageNum;
} }
} }
int p1 = mergedPdf.GetNumberOfPages(); int p1 = p;
pageNums.Add(p1 - p0); pageNums.Add(p1 - p0);
if (IsDoublePaged && doc is not Letterhead && mergedPdf.GetNumberOfPages() % 2 != 0) { if (IsDoublePaged && doc is not Letterhead && p % 2 != 0) {
if (letterheadPage != null) { if (letterhead != null) {
mergedPdf.AddPage(letterheadPage); mergedPdf.AddPage(letterhead.Value.Page);
letterheadPage = null; letterhead = null;
} else { } else {
mergedPdf.AddNewPage(); mergedPdf.AddNewPage();
} }
p++;
} }
progress?.Report(100.0 * (i + 1) / (m.Documents.Count + 1)); progress?.Report(100.0 * (i + 1) / (m.Documents.Count + 1));
} }
if (letterheadPage != null) { if (letterhead != null) {
if (mergedPdf.GetNumberOfPages() <= letterheadInsertIndex) { if (p <= letterhead.Value.InsertIndex) {
mergedPdf.AddPage(letterheadPage.CopyTo(mergedPdf)); mergedPdf.AddPage(letterhead.Value.Page);
mergedPdf.AddNewPage(); mergedPdf.AddNewPage();
} else { } else {
mergedPdf.AddPage(letterheadInsertIndex + 1, letterheadPage.CopyTo(mergedPdf)); mergedPdf.AddPage(letterhead.Value.InsertIndex + 1, letterhead.Value.Page);
mergedPdf.AddNewPage(letterheadInsertIndex + 2); mergedPdf.AddNewPage(letterhead.Value.InsertIndex + 2);
} }
pageNums[letterhead.Value.DocIndex] = 1;
pageNums[letterheadDocIndex] = 1; p += 2;
} }
TotalPages = pageNums.Sum(); TotalPages = p;
} catch { } catch {
pdf.Dispose(); pdf.Dispose();
throw; throw;
@@ -297,7 +292,7 @@ namespace Elwig.Documents {
protected Cell NewTh(string? text, float fontSize = 8, int rowspan = 1, int colspan = 1, bool left = false, bool rotated = false) { protected Cell NewTh(string? text, float fontSize = 8, int rowspan = 1, int colspan = 1, bool left = false, bool rotated = false) {
var p = new KernedParagraph(text ?? "", fontSize); var p = new KernedParagraph(text ?? "", fontSize);
if (rotated) p.SetRotationAngle(rotated ? 0.5 * Math.PI : 0); if (rotated) p.SetRotationAngle(0.5 * Math.PI);
var cell = NewCell(p, rowspan: rowspan, colspan: colspan) var cell = NewCell(p, rowspan: rowspan, colspan: colspan)
.SetTextAlignment(left ? TextAlignment.LEFT : TextAlignment.CENTER) .SetTextAlignment(left ? TextAlignment.LEFT : TextAlignment.CENTER)
.SetVerticalAlignment(VerticalAlignment.MIDDLE) .SetVerticalAlignment(VerticalAlignment.MIDDLE)
@@ -394,6 +389,8 @@ namespace Elwig.Documents {
} }
private void OnPageEnd(PdfDocumentEvent evt) { private void OnPageEnd(PdfDocumentEvent evt) {
if (_doc is Letterhead) return;
var pdf = evt.GetDocument(); var pdf = evt.GetDocument();
var page = evt.GetPage(); var page = evt.GetPage();
var pageNum = pdf.GetPageNumber(page); var pageNum = pdf.GetPageNumber(page);

View File

@@ -1,10 +1,21 @@
using Elwig.Models.Entities; using Elwig.Models.Entities;
using iText.Kernel.Pdf;
using iText.Kernel.Pdf.Canvas;
using iText.Layout;
namespace Elwig.Documents { namespace Elwig.Documents {
public class Letterhead : BusinessDocument { public class Letterhead : BusinessDocument {
public Letterhead(Member m) : public Letterhead(Member m) :
base($"Briefkopf {m.FullName}", m, true) { base($"Briefkopf {m.FullName}", m, true) {
Aside = null; }
protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
// do not render anything except this
var page = pdf.AddNewPage();
var pageSize = page.GetPageSize();
var pdfCanvas = new PdfCanvas(page.NewContentStreamBefore(), page.GetResources(), pdf);
using var canvas = new Canvas(pdfCanvas, pageSize);
RenderAddress(canvas, pageSize);
} }
} }
} }

View File

@@ -9,7 +9,7 @@
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon> <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
<Version>1.0.4.0</Version> <Version>1.0.4.1</Version>
<SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages> <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -23,8 +23,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="bblanchon.PDFium.Win32" Version="148.0.7734" /> <PackageReference Include="bblanchon.PDFium.Win32" Version="148.0.7749" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="itext" Version="9.5.0" /> <PackageReference Include="itext" Version="9.5.0" />
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.5.0" /> <PackageReference Include="itext.bouncy-castle-adapter" Version="9.5.0" />
<PackageReference Include="LinqKit" Version="1.3.11" /> <PackageReference Include="LinqKit" Version="1.3.11" />

View File

@@ -287,8 +287,7 @@ namespace Elwig.Windows {
LockInputs(); LockInputs();
UnlockSearchInputs(); UnlockSearchInputs();
FinishInputFilling(); FinishInputFilling();
await RefreshList(); await EnsureContextRenewed();
RefreshInputs();
Mouse.OverrideCursor = null; Mouse.OverrideCursor = null;
ViewModel.SearchQuery = ""; ViewModel.SearchQuery = "";
ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault()); ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());

View File

@@ -13,7 +13,7 @@ namespace Elwig.Windows {
set { set {
_lockContext = value; _lockContext = value;
if (!_lockContext && _renewPending) { if (!_lockContext && _renewPending) {
Dispatcher.BeginInvoke(async () => await RenewContext()); Dispatcher.BeginInvoke(async () => await EnsureContextRenewed());
} }
} }
} }
@@ -36,7 +36,7 @@ namespace Elwig.Windows {
public async Task HintContextChange() { public async Task HintContextChange() {
_renewPending = true; _renewPending = true;
if (LockContext) return; if (LockContext) return;
await RenewContext(); await EnsureContextRenewed();
} }
protected async void OnLoaded(object? sender, RoutedEventArgs? evt) { protected async void OnLoaded(object? sender, RoutedEventArgs? evt) {
@@ -44,7 +44,7 @@ namespace Elwig.Windows {
await OnRenewContext(ctx); await OnRenewContext(ctx);
} }
protected async Task RenewContext() { protected async Task EnsureContextRenewed() {
if (!_renewPending) return; if (!_renewPending) return;
using var ctx = new AppDbContext(); using var ctx = new AppDbContext();
await OnRenewContext(ctx); await OnRenewContext(ctx);

View File

@@ -285,17 +285,17 @@ namespace Elwig.Windows {
await ViewModel.GenerateDeliveryDataList(DeliveryService.ExportSubject.FromFilters, ExportMode.SaveList); await ViewModel.GenerateDeliveryDataList(DeliveryService.ExportSubject.FromFilters, ExportMode.SaveList);
private async void Menu_BulkAction_SetAttribute_Click(object sender, RoutedEventArgs evt) { private async void Menu_BulkAction_SetAttribute_Click(object sender, RoutedEventArgs evt) {
if (sender is not MenuItem item) return; if (IsEditing || IsCreating || sender is not MenuItem item) return;
await ViewModel.BulkSetAttribute(item.Header as string); await ViewModel.BulkSetAttribute(item.Header as string);
} }
private async void Menu_BulkAction_AddModifier_Click(object sender, RoutedEventArgs evt) { private async void Menu_BulkAction_AddModifier_Click(object sender, RoutedEventArgs evt) {
if (sender is not MenuItem item || item.Header is not string name) return; if (IsEditing || IsCreating || sender is not MenuItem item || item.Header is not string name) return;
await ViewModel.BulkAddModifier(name); await ViewModel.BulkAddModifier(name);
} }
private async void Menu_BulkAction_RemoveModifier_Click(object sender, RoutedEventArgs evt) { private async void Menu_BulkAction_RemoveModifier_Click(object sender, RoutedEventArgs evt) {
if (sender is not MenuItem item || item.Header is not string name) return; if (IsEditing || IsCreating || sender is not MenuItem item || item.Header is not string name) return;
await ViewModel.BulkRemoveModifier(name); await ViewModel.BulkRemoveModifier(name);
} }
@@ -812,13 +812,11 @@ namespace Elwig.Windows {
} }
EmptyScale(); EmptyScale();
await RefreshList(); await EnsureContextRenewed();
await RefreshDeliveryParts();
Mouse.OverrideCursor = null; Mouse.OverrideCursor = null;
ControlUtils.SelectItem(DeliveryList, p?.Delivery); ControlUtils.SelectItem(DeliveryList, p?.Delivery);
DeliveryPartList.SelectedItem = null; DeliveryPartList.SelectedItem = null;
DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().Last()); DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().Last());
RefreshInputs();
InitialInputs(); InitialInputs();
} }
@@ -851,8 +849,7 @@ namespace Elwig.Windows {
} }
EmptyScale(); EmptyScale();
await RefreshList(); await EnsureContextRenewed();
await RefreshDeliveryParts();
if (p?.Delivery != null) { if (p?.Delivery != null) {
try { try {
using var ctx = new AppDbContext(); using var ctx = new AppDbContext();
@@ -870,8 +867,7 @@ namespace Elwig.Windows {
Mouse.OverrideCursor = null; Mouse.OverrideCursor = null;
DeliveryList.SelectedItem = null; DeliveryList.SelectedItem = null;
await RenewContext(); await EnsureContextRenewed();
RefreshInputs();
InitInputs(); InitInputs();
} }
@@ -902,7 +898,7 @@ namespace Elwig.Windows {
DisableWeighingButtons(); DisableWeighingButtons();
HideFinishNewPartDeliveryCancelButtons(); HideFinishNewPartDeliveryCancelButtons();
ShowNewEditDeleteButtons(); ShowNewEditDeleteButtons();
await RenewContext(); await EnsureContextRenewed();
RefreshInputs(); RefreshInputs();
ClearInputStates(); ClearInputStates();
LockInputs(); LockInputs();
@@ -1082,9 +1078,7 @@ namespace Elwig.Windows {
LockInputs(); LockInputs();
UnlockSearchInputs(); UnlockSearchInputs();
FinishInputFilling(); FinishInputFilling();
await RefreshList(); await EnsureContextRenewed();
await RefreshDeliveryParts();
RefreshInputs();
Mouse.OverrideCursor = null; Mouse.OverrideCursor = null;
DepreciateButton.IsEnabled = true; DepreciateButton.IsEnabled = true;
@@ -1184,6 +1178,9 @@ namespace Elwig.Windows {
SeasonInput.IsEnabled = false; SeasonInput.IsEnabled = false;
TodayOnlyInput.IsEnabled = false; TodayOnlyInput.IsEnabled = false;
AllSeasonsInput.IsEnabled = false; AllSeasonsInput.IsEnabled = false;
Menu_BulkAction_SetAttribute.IsEnabled = false;
Menu_BulkAction_AddModifier.IsEnabled = false;
Menu_BulkAction_RemoveModifier.IsEnabled = false;
} }
private void UnlockSearchInputs() { private void UnlockSearchInputs() {
@@ -1191,6 +1188,9 @@ namespace Elwig.Windows {
SeasonInput.IsEnabled = true; SeasonInput.IsEnabled = true;
TodayOnlyInput.IsEnabled = true; TodayOnlyInput.IsEnabled = true;
AllSeasonsInput.IsEnabled = (ViewModel.FilterMember != null); AllSeasonsInput.IsEnabled = (ViewModel.FilterMember != null);
Menu_BulkAction_SetAttribute.IsEnabled = true;
Menu_BulkAction_AddModifier.IsEnabled = true;
Menu_BulkAction_RemoveModifier.IsEnabled = true;
} }
new protected void UnlockInputs() { new protected void UnlockInputs() {

View File

@@ -374,8 +374,7 @@ namespace Elwig.Windows {
LockInputs(); LockInputs();
ViewModel.EnableSearchInputs = true; ViewModel.EnableSearchInputs = true;
FinishInputFilling(); FinishInputFilling();
await RefreshList(); await EnsureContextRenewed();
RefreshInputs();
ViewModel.SearchQuery = ""; ViewModel.SearchQuery = "";
ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr); ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr);
if (sortid != null) if (sortid != null)

View File

@@ -225,8 +225,7 @@ namespace Elwig.Windows {
LockInputs(); LockInputs();
ViewModel.EnableSearchInputs = true; ViewModel.EnableSearchInputs = true;
FinishInputFilling(); FinishInputFilling();
await RefreshList(); await EnsureContextRenewed();
RefreshInputs();
ViewModel.SearchQuery = ""; ViewModel.SearchQuery = "";
} }

View File

@@ -615,12 +615,16 @@ namespace Elwig.Windows {
} }
private void DisposeDocs() { private void DisposeDocs() {
PrintDocument?.Dispose(); try {
PrintDocument = null; PrintDocument?.Dispose();
PrintDocument = null;
} catch { }
if (EmailDocuments != null) { if (EmailDocuments != null) {
foreach (var (m, docs) in EmailDocuments) { foreach (var (m, docs) in EmailDocuments) {
foreach (var d in docs) { foreach (var d in docs) {
d.Dispose(); try {
d.Dispose();
} catch { }
} }
} }
EmailDocuments = null; EmailDocuments = null;

View File

@@ -436,8 +436,7 @@ namespace Elwig.Windows {
UpdateContactInfoVisibility(); UpdateContactInfoVisibility();
ViewModel.EnableSearchInputs = true; ViewModel.EnableSearchInputs = true;
FinishInputFilling(); FinishInputFilling();
await RefreshList(); await EnsureContextRenewed();
RefreshInputs();
ViewModel.SearchQuery = ""; ViewModel.SearchQuery = "";
Mouse.OverrideCursor = null; Mouse.OverrideCursor = null;
if (mgnr is int m) if (mgnr is int m)

View File

@@ -13,7 +13,7 @@ About
**Product:** Elwig **Product:** Elwig
**Description:** Electronic Management for Vintners' Cooperatives **Description:** Electronic Management for Vintners' Cooperatives
**Type:** ERP system **Type:** ERP system
**Version:** 1.0.4.0 ([Changelog](./CHANGELOG.md)) **Version:** 1.0.4.1 ([Changelog](./CHANGELOG.md))
**License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE) **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)
**Website:** https://elwig.at/ **Website:** https://elwig.at/
**Source code:** https://git.necronda.net/winzer/elwig **Source code:** https://git.necronda.net/winzer/elwig
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
**Produkt:** Elwig **Produkt:** Elwig
**Beschreibung:** Elektronische Winzergenossenschaftsverwaltung **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung
**Typ:** Warenwirtschaftssystem (ERP-System) **Typ:** Warenwirtschaftssystem (ERP-System)
**Version:** 1.0.4.0 ([Änderungsprotokoll](./CHANGELOG.md)) **Version:** 1.0.4.1 ([Änderungsprotokoll](./CHANGELOG.md))
**Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE) **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)
**Website:** https://elwig.at/ **Website:** https://elwig.at/
**Quellcode:** https://git.necronda.net/winzer/elwig **Quellcode:** https://git.necronda.net/winzer/elwig

View File

@@ -23,12 +23,12 @@
<PackageReference Include="Appium.WebDriver" Version="4.4.5" /> <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
<PackageReference Include="NReco.PdfRenderer" Version="1.6.0" /> <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
<PackageReference Include="NUnit" Version="4.5.1" /> <PackageReference Include="NUnit" Version="4.5.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" /> <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.12.0"> <PackageReference Include="NUnit.Analyzers" Version="4.12.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.0"> <PackageReference Include="coverlet.collector" Version="8.0.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>