Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
26e549caa6 | |||
1d187c25f3 | |||
accbb9df08 | |||
7791d02979 | |||
dcec6f03fe | |||
526e951029 | |||
3cde360aaa | |||
66be5a3e2c | |||
5c12dba125 | |||
165770fa37 | |||
648c406ad2 | |||
9fa9d9fbec |
42
CHANGELOG.md
42
CHANGELOG.md
@ -3,6 +3,48 @@ Changelog
|
||||
=========
|
||||
|
||||
|
||||
[v0.11.3][v0.11.3] (2024-09-22) {#v0.11.3}
|
||||
------------------------------------------
|
||||
|
||||
### Sonstiges {#v0.11.3-misc}
|
||||
|
||||
* Im Mitglieder-Fenster (`MemberAdminWindow`) wurde das Berechnen der Mitgliederdaten pro Jahr und Mitglied rückgängig gemacht. (1d187c25f3)
|
||||
|
||||
[v0.11.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.3
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.11.2][v0.11.2] (2024-09-22) {#v0.11.2}
|
||||
------------------------------------------
|
||||
|
||||
> [!WARNING]
|
||||
> Aufgrund eines Fehlers kann in dieser Version das Öffnen des Mitglieder-Fensters deutlich länger dauern!
|
||||
>
|
||||
> Es wird empfohlen die nächste Version zu verwenden.
|
||||
|
||||
### Neue Funktionen {#v0.11.2-features}
|
||||
|
||||
* In der Anmeldeliste (`DeliveryAncmtList`) wird die Stamm-KG des Mitgliedes angegeben. (165770fa37)
|
||||
* Im Hauptmenü wurde im Menüpunkt _Hilfe_ ein Fehler-Protokoll-Fenster (`LogWindow`) hinzugefügt. (526e951029)
|
||||
|
||||
### Behobene Fehler {#v0.11.2-bugfixes}
|
||||
|
||||
* Falls das Übernahme-Fenster (`DeliveryAdminWindow`) geöffnet war und man währenddessen die aktuellste Lieferung gelöscht hat kam es zum Fehler beim Nummerieren des Lieferscheines. (5c12dba125)
|
||||
* In Seltenen Fällen konnte es vorkommen, dass sich Elwig aufgrund eines internen Fehlers im Übernahme-Fenster (`DeliveryAdminWindow`) geschlossen hat. (dcec6f03fe)
|
||||
|
||||
### Sonstiges {#v0.11.2-misc}
|
||||
|
||||
* Im Lieferungen-Fenster (`DeliveryAdminWindow`) wurde das Layout der Teillieferungen-Liste angepasst. (9fa9d9fbec)
|
||||
* Alle Aufrufe von `FillInputs()` in `Services` sind nun synchron. (648c406ad2, 7791d02979)
|
||||
* Im Mitglieder-Fenster (`MemberAdminWindow`) werden die Lieferinformationen pro Jahr und Mitglied im Voraus berechnet. (66be5a3e2c)
|
||||
* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) heißt es nun _Anmeldungen_, nicht mehr _Traubenanmeldungen_. (3cde360aaa)
|
||||
|
||||
[v0.11.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.2
|
||||
|
||||
|
||||
|
||||
|
||||
[v0.11.1][v0.11.1] (2024-09-19) {#v0.11.1}
|
||||
------------------------------------------
|
||||
|
||||
|
@ -8,10 +8,11 @@
|
||||
<h2>@Model.Filter</h2>
|
||||
<table class="announcement-list">
|
||||
<colgroup>
|
||||
<col style="width: 18mm;"/>
|
||||
<col style="width: 15mm;"/>
|
||||
<col style="width: 12mm;"/>
|
||||
<col style="width: 70mm;"/>
|
||||
<col style="width: 40mm;"/>
|
||||
<col style="width: 50mm;"/>
|
||||
<col style="width: 25mm;"/>
|
||||
<col style="width: 38mm;"/>
|
||||
<col style="width: 11mm;"/>
|
||||
<col style="width: 14mm;"/>
|
||||
</colgroup>
|
||||
@ -20,6 +21,7 @@
|
||||
<th rowspan="2">Datum</th>
|
||||
<th rowspan="2">MgNr.</th>
|
||||
<th rowspan="2" style="text-align: left;">Mitglied</th>
|
||||
<th rowspan="2" style="text-align: left;">Ort</th>
|
||||
<th rowspan="2" style="text-align: left;">Sorte</th>
|
||||
<th rowspan="2">Anmldg.</th>
|
||||
<th>Gewicht</th>
|
||||
@ -31,9 +33,10 @@
|
||||
<tbody>
|
||||
@foreach (var a in Model.Announcements) {
|
||||
<tr>
|
||||
<td>@($"{a.Date:dd.MM.yyyy}")</td>
|
||||
<td class="small">@($"{a.Date:dd.MM.yyyy}")</td>
|
||||
<td class="number">@a.MgNr</td>
|
||||
<td>@a.AdministrativeName</td>
|
||||
<td class="small">@a.DefaultKg</td>
|
||||
<td>@a.Variety</td>
|
||||
<td class="small center">@(a.Status ?? "-")</td>
|
||||
<td class="number">@($"{a.Weight:N0}")</td>
|
||||
@ -41,7 +44,7 @@
|
||||
}
|
||||
<tr class="sum bold">
|
||||
<td colspan="2">Gesamt:</td>
|
||||
<td colspan="2">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
|
||||
<td colspan="3">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
|
||||
<td colspan="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
@ -7,7 +7,7 @@
|
||||
<UseWPF>true</UseWPF>
|
||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||
<ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
|
||||
<Version>0.11.1</Version>
|
||||
<Version>0.11.3</Version>
|
||||
<SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<ApplicationManifest>app.manifest</ApplicationManifest>
|
||||
|
@ -539,6 +539,16 @@ namespace Elwig.Helpers {
|
||||
}
|
||||
}
|
||||
|
||||
public static List<EventLogEntry> GetLogEntries() {
|
||||
using var log = new EventLog {
|
||||
Log = "Application",
|
||||
Source = ".NET Runtime",
|
||||
};
|
||||
return log.Entries.Cast<EventLogEntry>()
|
||||
.Where(e => e.Message.StartsWith("Application: Elwig.exe"))
|
||||
.ToList();
|
||||
}
|
||||
|
||||
public static int GetEntityIdetifierForPk(params object?[] primaryKey) {
|
||||
var pk = primaryKey.Select(k => k?.GetHashCode() ?? 0).ToArray();
|
||||
return ((IStructuralEquatable)pk).GetHashCode(EqualityComparer<int>.Default);
|
||||
|
@ -15,6 +15,7 @@ namespace Elwig.Models.Dtos {
|
||||
("MgNr", "MgNr.", null, 12),
|
||||
("Name1", "Name", null, 40),
|
||||
("Name2", "Vorname", null, 40),
|
||||
("DefaultKg", "Ort", null, 40),
|
||||
("SortId", "Sorte", null, 10),
|
||||
("Weight", "Gewicht", "kg", 20),
|
||||
("CreatedTimestamp", "Angemeldet", null, 35),
|
||||
@ -43,6 +44,7 @@ namespace Elwig.Models.Dtos {
|
||||
public string Name1;
|
||||
public string? Name2;
|
||||
public string AdministrativeName;
|
||||
public string? DefaultKg;
|
||||
public string SortId;
|
||||
public string Variety;
|
||||
public DateTime CreatedTimestamp;
|
||||
@ -60,6 +62,7 @@ namespace Elwig.Models.Dtos {
|
||||
Name1 = m.AdministrativeName1;
|
||||
Name2 = m.AdministrativeName2;
|
||||
AdministrativeName = m.AdministrativeName;
|
||||
DefaultKg = m.DefaultKg?.Name;
|
||||
SortId = a.SortId;
|
||||
Variety = a.Variety.Name;
|
||||
CreatedTimestamp = a.CreatedTimestamp;
|
||||
|
@ -162,20 +162,13 @@ namespace Elwig.Services {
|
||||
AddToolTipCell(grid, max == null ? "" : $"{max:N0} kg", row, 4, 1, bold, true);
|
||||
}
|
||||
|
||||
public static async Task<(string, Grid)> GenerateToolTip(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
|
||||
var grid = new Grid();
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(10) });
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(60) });
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(80) });
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(80) });
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(80) });
|
||||
AddToolTipCell(grid, "Lieferpflicht", 0, 3, 1, false, false, true);
|
||||
AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true);
|
||||
public static async Task<(string, (string?, string?, int, int?, int?)[])> GenerateToolTipData(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
|
||||
var grid = new List<(string?, string?, int, int?, int?)>();
|
||||
var text = "-";
|
||||
|
||||
var area = await areaComs.SumAsync(p => p.Area);
|
||||
text = $"{area:N0} m²";
|
||||
AddToolTipRow(grid, 1, "Geb. Fläche", null, area, null, null);
|
||||
grid.Add(("Geb. Fläche", null, area, null, null));
|
||||
|
||||
if (await areaComs.AnyAsync()) {
|
||||
var attrGroups = await areaComs
|
||||
@ -221,24 +214,38 @@ namespace Elwig.Services {
|
||||
.ThenBy(g => g.SortId)
|
||||
.ToListAsync();
|
||||
|
||||
int rowNum = 2;
|
||||
if (noAttr.Count > 0) {
|
||||
rowNum++;
|
||||
AddToolTipRow(grid, rowNum++, null, null, noAttr.Sum(g => g.Area), noAttr.Sum(g => g.Min), noAttr.Sum(g => g.Max));
|
||||
grid.Add((null, null, noAttr.Sum(g => g.Area), noAttr.Sum(g => g.Min), noAttr.Sum(g => g.Max)));
|
||||
foreach (var g in noAttr) {
|
||||
AddToolTipRow(grid, rowNum++, null, g.SortId, g.Area, g.Min, g.Max);
|
||||
grid.Add((null, g.SortId, g.Area, g.Min, g.Max));
|
||||
}
|
||||
}
|
||||
foreach (var attrG in attrGroups) {
|
||||
rowNum++;
|
||||
AddToolTipRow(grid, rowNum++, attrG.Attr, null, attrG.Area, attrG.Min, attrG.Max);
|
||||
grid.Add((attrG.Attr, null, attrG.Area, attrG.Min, attrG.Max));
|
||||
foreach (var g in groups.Where(g => g.Attr == attrG.Attr).OrderByDescending(g => g.Area).ThenBy(g => g.SortId)) {
|
||||
AddToolTipRow(grid, rowNum++, null, g.SortId, g.Area, g.Min, g.Max);
|
||||
grid.Add((null, g.SortId, g.Area, g.Min, g.Max));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return (text, grid);
|
||||
return (text, grid.ToArray());
|
||||
}
|
||||
|
||||
public static Grid GenerateToolTip((string?, string?, int, int?, int?)[] data) {
|
||||
var grid = new Grid();
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(10) });
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(60) });
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(80) });
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(80) });
|
||||
grid.ColumnDefinitions.Add(new() { Width = new(80) });
|
||||
AddToolTipCell(grid, "Lieferpflicht", 0, 3, 1, false, false, true);
|
||||
AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true);
|
||||
int rowNum = 1;
|
||||
foreach (var row in data) {
|
||||
AddToolTipRow(grid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
|
||||
if (rowNum == 2) rowNum++;
|
||||
}
|
||||
return grid;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -32,7 +32,7 @@ namespace Elwig.Services {
|
||||
vm.StatusAncmtModified = "-";
|
||||
}
|
||||
|
||||
public static async Task FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
|
||||
public static void FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
|
||||
vm.MgNr = a.MgNr;
|
||||
vm.DeliverySchedule = (DeliverySchedule?)ControlUtils.GetItemFromSourceWithPk(vm.DeliveryScheduleSource, a.Year, a.DsNr);
|
||||
vm.SortId = a.SortId;
|
||||
|
@ -21,7 +21,7 @@ namespace Elwig.Services {
|
||||
public static void ClearInputs(this DeliveryScheduleAdminViewModel vm) {
|
||||
}
|
||||
|
||||
public static async Task FillInputs(this DeliveryScheduleAdminViewModel vm, DeliverySchedule s) {
|
||||
public static void FillInputs(this DeliveryScheduleAdminViewModel vm, DeliverySchedule s) {
|
||||
vm.Date = s.Date;
|
||||
vm.Branch = (Branch?)ControlUtils.GetItemFromSourceWithPk(vm.BranchSource, s.ZwstId);
|
||||
vm.Description = s.Description;
|
||||
|
@ -444,6 +444,7 @@ namespace Elwig.Services {
|
||||
|
||||
var date = DateOnly.ParseExact(vm.Date!, "dd.MM.yyyy");
|
||||
int? newLnr = (deliveryNew || dateHasChanged) ? await ctx.NextLNr(date) : null;
|
||||
string? newLsNr = (newLnr != null) ? Utils.GenerateLsNr(date, vm.Branch!.ZwstId, newLnr.Value) : null;
|
||||
|
||||
string? newTimeString = null;
|
||||
if (partNew && timeIsDefault) {
|
||||
@ -459,7 +460,7 @@ namespace Elwig.Services {
|
||||
TimeString = newTimeString ?? oldDelivery?.TimeString,
|
||||
LNr = newLnr ?? oldDelivery!.LNr,
|
||||
ZwstId = vm.Branch!.ZwstId,
|
||||
LsNr = vm.LsNr!,
|
||||
LsNr = newLsNr ?? vm.LsNr!,
|
||||
MgNr = (int)vm.MgNr!,
|
||||
Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
|
||||
};
|
||||
@ -720,36 +721,22 @@ namespace Elwig.Services {
|
||||
AddToolTipCell(grid, $"{max:N1}°", row, 4, 1, bold, true);
|
||||
}
|
||||
|
||||
public static async Task<(string WeightText, Grid WeightGrid, string GradationText, Grid GradationGrid)> GenerateToolTip(IQueryable<DeliveryPart> deliveryParts) {
|
||||
var wGrid = new Grid();
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(10) });
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(60) });
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(80) });
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
|
||||
public static async Task<(string WeightText, (string?, string?, int, int?, int)[] WeightGrid, string GradationText, (string?, string?, double, double, double)[] GradationGrid)> GenerateToolTipData(IQueryable<DeliveryPart> deliveryParts) {
|
||||
var wGrid = new List<(string?, string?, int, int?, int)>();
|
||||
var wText = "-";
|
||||
|
||||
var gGrid = new Grid();
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(10) });
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(60) });
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
|
||||
AddToolTipCell(gGrid, "Min.", 0, 2, 1, false, false, true);
|
||||
AddToolTipCell(gGrid, "⌀", 0, 3, 1, false, false, true);
|
||||
AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
|
||||
var gGrid = new List<(string?, string?, double, double, double)>();
|
||||
var gText = "-";
|
||||
|
||||
var weight = await deliveryParts.SumAsync(p => p.Weight);
|
||||
wText = $"{weight:N0} kg";
|
||||
AddWeightToolTipRow(wGrid, 0, "Gewicht", null, weight, null, weight);
|
||||
wGrid.Add(("Gewicht", null, weight, null, weight));
|
||||
|
||||
if (await deliveryParts.AnyAsync()) {
|
||||
var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
|
||||
var kmwAvg = Utils.AggregateDeliveryPartsKmw(deliveryParts);
|
||||
var kmwMax = await deliveryParts.MaxAsync(p => p.Kmw);
|
||||
gText = $"{kmwMin:N1}° / {kmwAvg:N1}° / {kmwMax:N1}°";
|
||||
AddGradationToolTipRow(gGrid, 1, "Gradation", null, kmwMin, kmwAvg, kmwMax);
|
||||
gGrid.Add(("Gradation", null, kmwMin, kmwAvg, kmwMax));
|
||||
|
||||
var attrGroups = await deliveryParts
|
||||
.GroupBy(p => new { Attr = p.Attribute!.Name, Cult = p.Cultivation!.Name })
|
||||
@ -798,22 +785,18 @@ namespace Elwig.Services {
|
||||
.ThenBy(g => g.SortId)
|
||||
.ToListAsync();
|
||||
|
||||
int rowNum = 1;
|
||||
foreach (var attrG in attrGroups) {
|
||||
rowNum++;
|
||||
var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
|
||||
AddWeightToolTipRow(wGrid, rowNum++, name, null, attrG.Weight, attrG.Weight, weight);
|
||||
wGrid.Add((name, null, attrG.Weight, attrG.Weight, weight));
|
||||
foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
|
||||
AddWeightToolTipRow(wGrid, rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
|
||||
wGrid.Add((null, g.SortId, g.Weight, attrG.Weight, weight));
|
||||
}
|
||||
}
|
||||
rowNum = 2;
|
||||
foreach (var attrG in attrGroups) {
|
||||
rowNum++;
|
||||
var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
|
||||
AddGradationToolTipRow(gGrid, rowNum++, name, null, attrG.Min, attrG.Avg, attrG.Max);
|
||||
gGrid.Add((name, null, attrG.Min, attrG.Avg, attrG.Max));
|
||||
foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Avg).ThenBy(g => g.SortId)) {
|
||||
AddGradationToolTipRow(gGrid, rowNum++, null, g.SortId, g.Min, g.Avg, g.Max);
|
||||
gGrid.Add((null, g.SortId, g.Min, g.Avg, g.Max));
|
||||
}
|
||||
}
|
||||
|
||||
@ -835,7 +818,38 @@ namespace Elwig.Services {
|
||||
}
|
||||
}
|
||||
|
||||
return (wText, wGrid, gText, gGrid);
|
||||
return (wText, wGrid.ToArray(), gText, gGrid.ToArray());
|
||||
}
|
||||
|
||||
public static (Grid WeightGrid, Grid GradationGrid) GenerateToolTip((string?, string?, int, int?, int)[] weightData, (string?, string?, double, double, double)[] gradationData) {
|
||||
var wGrid = new Grid();
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(10) });
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(60) });
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(80) });
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
|
||||
wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
|
||||
int rowNum = 0;
|
||||
foreach (var row in weightData) {
|
||||
AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
|
||||
if (rowNum == 1) rowNum++;
|
||||
}
|
||||
|
||||
var gGrid = new Grid();
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(10) });
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(60) });
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
|
||||
gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
|
||||
AddToolTipCell(gGrid, "Min.", 0, 2, 1, false, false, true);
|
||||
AddToolTipCell(gGrid, "⌀", 0, 3, 1, false, false, true);
|
||||
AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
|
||||
rowNum = 1;
|
||||
foreach (var row in gradationData) {
|
||||
AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
|
||||
if (rowNum == 2) rowNum++;
|
||||
}
|
||||
|
||||
return (wGrid, gGrid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ namespace Elwig.Services {
|
||||
vm.Age = "-";
|
||||
}
|
||||
|
||||
public static async Task FillInputs(this MemberAdminViewModel vm, Member m) {
|
||||
public static void FillInputs(this MemberAdminViewModel vm, Member m) {
|
||||
vm.IsMemberSelected = true;
|
||||
vm.MgNrString = $"{m.MgNr}";
|
||||
vm.PredecessorMgNrString = $"{m.PredecessorMgNr}";
|
||||
@ -137,19 +137,26 @@ namespace Elwig.Services {
|
||||
vm.ContactViaPost = m.ContactViaPost;
|
||||
vm.ContactViaEmail = m.ContactViaEmail;
|
||||
|
||||
Dictionary<int, int> deliveries;
|
||||
using (var ctx = new AppDbContext()) {
|
||||
vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
|
||||
vm.StatusDeliveriesLastSeason = "...";
|
||||
vm.StatusDeliveriesLastSeasonToolTip = null;
|
||||
vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
|
||||
vm.StatusDeliveriesThisSeason = "...";
|
||||
vm.StatusDeliveriesThisSeasonToolTip = null;
|
||||
vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
|
||||
vm.StatusAreaCommitment = "...";
|
||||
vm.StatusAreaCommitmentToolTip = null;
|
||||
|
||||
Utils.RunBackground("Mitgliederdaten laden", async () => {
|
||||
using var ctx = new AppDbContext();
|
||||
|
||||
var d1 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
|
||||
var (_, d1Grid, _, _) = await DeliveryService.GenerateToolTip(d1.SelectMany(d => d.Parts));
|
||||
vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
|
||||
vm.StatusDeliveriesLastSeason = $"{await d1.CountAsync():N0} ({await d1.SumAsync(d => d.Parts.Count):N0}), {await d1.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
|
||||
vm.StatusDeliveriesLastSeasonToolTip = d1Grid;
|
||||
var (_, d1GridData, _, _) = await DeliveryService.GenerateToolTipData(d1.SelectMany(d => d.Parts));
|
||||
var textLast = $"{await d1.CountAsync():N0} ({await d1.SumAsync(d => d.Parts.Count):N0}), {await d1.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
|
||||
|
||||
var d2 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason && d.MgNr == m.MgNr);
|
||||
var (_, d2Grid, _, _) = await DeliveryService.GenerateToolTip(d2.SelectMany(d => d.Parts));
|
||||
vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
|
||||
vm.StatusDeliveriesThisSeason = $"{await d2.CountAsync():N0} ({await d2.SumAsync(d => d.Parts.Count):N0}), {await d2.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
|
||||
vm.StatusDeliveriesThisSeasonToolTip = d2Grid;
|
||||
var (_, d2GridData, _, _) = await DeliveryService.GenerateToolTipData(d2.SelectMany(d => d.Parts));
|
||||
var textThis = $"{await d2.CountAsync():N0} ({await d2.SumAsync(d => d.Parts.Count):N0}), {await d2.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
|
||||
|
||||
var c = m.ActiveAreaCommitments(ctx, Utils.CurrentLastSeason);
|
||||
int maxKgPerHa = 10_000;
|
||||
@ -157,21 +164,33 @@ namespace Elwig.Services {
|
||||
var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
|
||||
if (s != null) maxKgPerHa = s.MaxKgPerHa;
|
||||
} catch { }
|
||||
var (text, grid) = await AreaComService.GenerateToolTip(c, maxKgPerHa);
|
||||
vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
|
||||
vm.StatusAreaCommitment = text;
|
||||
vm.StatusAreaCommitmentToolTip = grid;
|
||||
var (text, gridData) = await AreaComService.GenerateToolTipData(c, maxKgPerHa);
|
||||
|
||||
deliveries = ctx.Deliveries
|
||||
.Where(d => d.MgNr == m.MgNr)
|
||||
.SelectMany(d => d.Parts)
|
||||
.GroupBy(d => d.Year)
|
||||
.ToDictionary(g => g.Key, g => g.Sum(d => d.Weight));
|
||||
}
|
||||
var deliveries = await ctx.Deliveries
|
||||
.Where(d => d.MgNr == m.MgNr)
|
||||
.GroupBy(d => d.Year)
|
||||
.ToDictionaryAsync(g => g.Key, g => g.Any());
|
||||
|
||||
await App.MainDispatcher.BeginInvoke(() => {
|
||||
var (d1Grid, _) = DeliveryService.GenerateToolTip(d1GridData, []);
|
||||
var (d2Grid, _) = DeliveryService.GenerateToolTip(d2GridData, []);
|
||||
var grid = AreaComService.GenerateToolTip(gridData);
|
||||
vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
|
||||
vm.StatusDeliveriesLastSeason = textLast;
|
||||
vm.StatusDeliveriesLastSeasonToolTip = d1Grid;
|
||||
vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
|
||||
vm.StatusDeliveriesThisSeason = textThis;
|
||||
vm.StatusDeliveriesThisSeasonToolTip = d2Grid;
|
||||
vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
|
||||
vm.StatusAreaCommitment = text;
|
||||
vm.StatusAreaCommitmentToolTip = grid;
|
||||
vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => deliveries.GetValueOrDefault(i, false)).ToList();
|
||||
});
|
||||
});
|
||||
|
||||
vm.MemberHasEmail = m.EmailAddresses.Count > 0;
|
||||
vm.MemberCanSendEmail = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
|
||||
vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => deliveries.GetValueOrDefault(i, 0) > 0).ToList();
|
||||
vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => false).ToList();
|
||||
}
|
||||
|
||||
public static async Task<(List<string>, IQueryable<Member>, List<string>)> GetFilters(this MemberAdminViewModel vm, AppDbContext ctx) {
|
||||
|
@ -79,9 +79,9 @@ namespace Elwig.Windows {
|
||||
if (filter.Count == 0) {
|
||||
ViewModel.StatusAreaCommitments = $"{await areaComQuery.CountAsync():N0}";
|
||||
var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
|
||||
var (text, grid) = await AreaComService.GenerateToolTip(areaComQuery, s?.MaxKgPerHa ?? 10_000);
|
||||
var (text, gridData) = await AreaComService.GenerateToolTipData(areaComQuery, s?.MaxKgPerHa ?? 10_000);
|
||||
ViewModel.StatusArea = text;
|
||||
ViewModel.StatusAreaToolTip = grid;
|
||||
ViewModel.StatusAreaToolTip = AreaComService.GenerateToolTip(gridData);
|
||||
} else {
|
||||
ViewModel.StatusAreaCommitments = $"{areaComs.Count:N0}";
|
||||
ViewModel.StatusArea = $"{areaComs.Select(a => a.Area).Sum():N0} m²";
|
||||
|
@ -356,14 +356,14 @@
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5">
|
||||
<GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="100"/>
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
|
||||
<Label Content="Lieferschein-Nr.:" Margin="10,10,0,0" Grid.Column="0"/>
|
||||
<TextBox x:Name="LsNrInput" Text="{Binding LsNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
||||
Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
|
||||
IsReadOnly="True" IsTabStop="False"
|
||||
@ -390,6 +390,37 @@
|
||||
<TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
|
||||
Grid.Column="1" Margin="0,100,10,10"
|
||||
TextChanged="TextBox_TextChanged"/>
|
||||
|
||||
<Grid Grid.ColumnSpan="2" Margin="0,130,0,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
|
||||
SelectionChanged="DeliveryPartList_SelectionChanged">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="{Binding DPNr}" Width="20"/>
|
||||
<TextBlock Text="{Binding SortId}" Width="30"/>
|
||||
<TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
|
||||
<TextBlock Text="{Binding QualId}" Width="30"/>
|
||||
<TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
|
||||
<TextBlock Text="{Binding Attribute.Name}" Width="60"/>
|
||||
<TextBlock Text="{Binding Cultivation.Name}" Width="50"/>
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
|
||||
<Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
|
||||
ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
|
||||
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
|
||||
Click="ExtractDeliveryPartButton_Click"/>
|
||||
<Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
|
||||
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
|
||||
Click="DeleteDeliveryPartButton_Click"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
@ -538,39 +569,6 @@
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
|
||||
SelectionChanged="DeliveryPartList_SelectionChanged">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<TextBlock Text="{Binding DPNr}" Width="20"/>
|
||||
<TextBlock Text="{Binding SortId}" Width="30"/>
|
||||
<TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
|
||||
<TextBlock Text="{Binding QualId}" Width="30"/>
|
||||
<TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
|
||||
<TextBlock Text="{Binding Attribute.Name}" Width="60"/>
|
||||
<TextBlock Text="{Binding Cultivation.Name}" Width="50"/>
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
|
||||
<Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
|
||||
ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
|
||||
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
|
||||
Click="ExtractDeliveryPartButton_Click"/>
|
||||
<Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
|
||||
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
|
||||
Click="DeleteDeliveryPartButton_Click"/>
|
||||
</Grid>
|
||||
</GroupBox>
|
||||
|
||||
<GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="3" Margin="5,5,5,10">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
|
@ -394,8 +394,10 @@ namespace Elwig.Windows {
|
||||
ViewModel.StatusDeliveries = $"{deliveries.Count} ({await deliveryParts.CountAsync()})";
|
||||
var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
|
||||
ViewModel.StatusVarieties = $"{varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
|
||||
(ViewModel.StatusWeight, ViewModel.StatusWeightToolTip,
|
||||
ViewModel.StatusGradation, ViewModel.StatusGradationToolTip) = await DeliveryService.GenerateToolTip(deliveryParts);
|
||||
var (wText, wData, gText, gData) = await DeliveryService.GenerateToolTipData(deliveryParts);
|
||||
ViewModel.StatusWeight = wText;
|
||||
ViewModel.StatusGradation = gText;
|
||||
(ViewModel.StatusWeightToolTip, ViewModel.StatusGradationToolTip) = DeliveryService.GenerateToolTip(wData, gData);
|
||||
} else {
|
||||
ViewModel.StatusVarieties = "-";
|
||||
ViewModel.StatusWeight = "-";
|
||||
@ -1309,8 +1311,7 @@ namespace Elwig.Windows {
|
||||
|
||||
private void ModifiersInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
|
||||
if (!IsEditing && !IsCreating) return;
|
||||
var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
|
||||
var source = ModifiersInput.ItemsSource.Cast<Modifier>();
|
||||
var mod = ModifiersInput.SelectedItems.Cast<Modifier>().ToList();
|
||||
if (App.Client.IsMatzen) {
|
||||
var kl = mod.Where(m => m.Name.StartsWith("Klasse "));
|
||||
if (kl.Count() > 1) {
|
||||
@ -1330,8 +1331,8 @@ namespace Elwig.Windows {
|
||||
|
||||
private void LesewagenInput_Changed(object sender, RoutedEventArgs evt) {
|
||||
if (!IsEditing && !IsCreating) return;
|
||||
var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
|
||||
var source = ModifiersInput.ItemsSource.Cast<Modifier>();
|
||||
var mod = ModifiersInput.SelectedItems.Cast<Modifier>().ToList();
|
||||
var source = ModifiersInput.ItemsSource.Cast<Modifier>().ToList();
|
||||
var lw = LesewagenInput.IsChecked == true;
|
||||
if (App.Client.IsMatzen) {
|
||||
var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0];
|
||||
|
@ -8,7 +8,7 @@
|
||||
xmlns:local="clr-namespace:Elwig.Windows"
|
||||
xmlns:vm="clr-namespace:Elwig.ViewModels"
|
||||
xmlns:ctrl="clr-namespace:Elwig.Controls"
|
||||
Title="Traubenanmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400"
|
||||
Title="Anmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400"
|
||||
Loaded="Window_Loaded">
|
||||
<Window.DataContext>
|
||||
<vm:DeliveryAncmtAdminViewModel/>
|
||||
@ -99,7 +99,7 @@
|
||||
<TextBox.ToolTip>
|
||||
<TextBlock>
|
||||
<Bold>Strg+F</Bold><LineBreak/><LineBreak/>
|
||||
Traubenanmeldungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
|
||||
Anmeldungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
|
||||
Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
|
||||
<LineBreak/>
|
||||
Filtern nach:<LineBreak/>
|
||||
|
@ -144,12 +144,12 @@ namespace Elwig.Windows {
|
||||
}
|
||||
}
|
||||
|
||||
private async Task RefreshInputs(bool validate = false) {
|
||||
private void RefreshInputs(bool validate = false) {
|
||||
ClearInputStates();
|
||||
if (ViewModel.SelectedDeliveryAncmt is DeliveryAncmt a) {
|
||||
EditDeliveryAncmtButton.IsEnabled = true;
|
||||
DeleteDeliveryAncmtButton.IsEnabled = true;
|
||||
await FillInputs(a);
|
||||
FillInputs(a);
|
||||
} else {
|
||||
EditDeliveryAncmtButton.IsEnabled = false;
|
||||
DeleteDeliveryAncmtButton.IsEnabled = false;
|
||||
@ -185,8 +185,8 @@ namespace Elwig.Windows {
|
||||
await RefreshList();
|
||||
}
|
||||
|
||||
private async void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
await RefreshInputs();
|
||||
private void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
RefreshInputs();
|
||||
}
|
||||
|
||||
private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
@ -314,8 +314,8 @@ namespace Elwig.Windows {
|
||||
if (ViewModel.SelectedDeliveryAncmt is not DeliveryAncmt a)
|
||||
return;
|
||||
var r = MessageBox.Show(
|
||||
$"Soll die Traubenanmeldung wirklich unwiderruflich gelöscht werden?",
|
||||
"Traubenanmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
|
||||
$"Soll die Anmeldung wirklich unwiderruflich gelöscht werden?",
|
||||
"Anmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
|
||||
if (r == MessageBoxResult.OK) {
|
||||
Mouse.OverrideCursor = Cursors.AppStarting;
|
||||
try {
|
||||
@ -327,7 +327,7 @@ namespace Elwig.Windows {
|
||||
} catch (Exception exc) {
|
||||
var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
|
||||
if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
|
||||
MessageBox.Show(str, "Traubenanmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
MessageBox.Show(str, "Anmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
}
|
||||
Mouse.OverrideCursor = null;
|
||||
}
|
||||
@ -349,7 +349,7 @@ namespace Elwig.Windows {
|
||||
} catch (Exception exc) {
|
||||
var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
|
||||
if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
|
||||
MessageBox.Show(str, "Traubenanmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
MessageBox.Show(str, "Anmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
}
|
||||
Mouse.OverrideCursor = null;
|
||||
IsEditing = false;
|
||||
@ -361,7 +361,7 @@ namespace Elwig.Windows {
|
||||
ViewModel.EnableSearchInputs = true;
|
||||
FinishInputFilling();
|
||||
await RefreshList();
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
ViewModel.SearchQuery = "";
|
||||
ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr);
|
||||
if (sortid != null)
|
||||
@ -374,9 +374,9 @@ namespace Elwig.Windows {
|
||||
ResetButton_Click(null, null);
|
||||
}
|
||||
|
||||
private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
|
||||
private void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
|
||||
if (IsEditing) {
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
} else if (IsCreating) {
|
||||
ClearInputs();
|
||||
InitInputs();
|
||||
@ -401,15 +401,15 @@ namespace Elwig.Windows {
|
||||
|
||||
HideSaveResetCancelButtons();
|
||||
ShowNewEditDeleteButtons();
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
LockInputs();
|
||||
ViewModel.EnableSearchInputs = true;
|
||||
}
|
||||
|
||||
private async Task FillInputs(DeliveryAncmt a) {
|
||||
private void FillInputs(DeliveryAncmt a) {
|
||||
ClearOriginalValues();
|
||||
ClearDefaultValues();
|
||||
await ViewModel.FillInputs(a);
|
||||
ViewModel.FillInputs(a);
|
||||
FinishInputFilling();
|
||||
}
|
||||
|
||||
|
@ -72,12 +72,12 @@ namespace Elwig.Windows {
|
||||
DeliveryScheduleList.ScrollIntoView(DeliveryScheduleList.SelectedItem);
|
||||
}
|
||||
|
||||
private async Task RefreshInputs(bool validate = false) {
|
||||
private void RefreshInputs(bool validate = false) {
|
||||
ClearInputStates();
|
||||
if (ViewModel.SelectedDeliverySchedule is DeliverySchedule s) {
|
||||
EditDeliveryScheduleButton.IsEnabled = true;
|
||||
DeleteDeliveryScheduleButton.IsEnabled = true;
|
||||
await FillInputs(s);
|
||||
FillInputs(s);
|
||||
} else {
|
||||
EditDeliveryScheduleButton.IsEnabled = false;
|
||||
DeleteDeliveryScheduleButton.IsEnabled = false;
|
||||
@ -113,8 +113,8 @@ namespace Elwig.Windows {
|
||||
await RefreshList();
|
||||
}
|
||||
|
||||
private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
await RefreshInputs();
|
||||
private void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
RefreshInputs();
|
||||
}
|
||||
|
||||
private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
|
||||
@ -218,7 +218,7 @@ namespace Elwig.Windows {
|
||||
ViewModel.EnableSearchInputs = true;
|
||||
FinishInputFilling();
|
||||
await RefreshList();
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
ViewModel.SearchQuery = "";
|
||||
}
|
||||
|
||||
@ -228,9 +228,9 @@ namespace Elwig.Windows {
|
||||
ResetButton_Click(null, null);
|
||||
}
|
||||
|
||||
private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
|
||||
private void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
|
||||
if (IsEditing) {
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
} else if (IsCreating) {
|
||||
ClearInputs();
|
||||
InitInputs();
|
||||
@ -238,21 +238,21 @@ namespace Elwig.Windows {
|
||||
UpdateButtons();
|
||||
}
|
||||
|
||||
private async void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
|
||||
private void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
|
||||
IsEditing = false;
|
||||
IsCreating = false;
|
||||
DeliveryScheduleList.IsEnabled = true;
|
||||
HideSaveResetCancelButtons();
|
||||
ShowNewEditDeleteButtons();
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
LockInputs();
|
||||
ViewModel.EnableSearchInputs = true;
|
||||
}
|
||||
|
||||
private async Task FillInputs(DeliverySchedule s) {
|
||||
private void FillInputs(DeliverySchedule s) {
|
||||
ClearOriginalValues();
|
||||
ClearDefaultValues();
|
||||
await ViewModel.FillInputs(s);
|
||||
ViewModel.FillInputs(s);
|
||||
FinishInputFilling();
|
||||
}
|
||||
|
||||
|
34
Elwig/Windows/LogWindow.xaml
Normal file
34
Elwig/Windows/LogWindow.xaml
Normal file
@ -0,0 +1,34 @@
|
||||
<Window x:Class="Elwig.Windows.LogWindow"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="clr-namespace:Elwig.Windows"
|
||||
Title="Fehler-Protokoll - Elwig" Height="600" Width="1000"
|
||||
Loaded="Window_Loaded">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition Width="5"/>
|
||||
<ColumnDefinition/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<DataGrid x:Name="EventList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
|
||||
CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
|
||||
SelectionChanged="EventList_SelectionChanged"
|
||||
Margin="10,10,5,10">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Header="Ebene" Binding="{Binding Event.EntryType}" Width="60"/>
|
||||
<DataGridTextColumn Header="Zeitpunkt" Binding="{Binding Event.TimeGenerated, StringFormat='{}{0:dd.MM.yyyy HH:mm:ss}'}" Width="120"/>
|
||||
<DataGridTextColumn Header="Gerät" Binding="{Binding Event.MachineName}" Width="120"/>
|
||||
<DataGridTextColumn Header="Fehler" Binding="{Binding ExceptionName}" Width="200"/>
|
||||
<DataGridTextColumn Header="Beschreibung" Binding="{Binding ExceptionMessage}" Width="200"/>
|
||||
<DataGridTextColumn Header="Herkunft" Binding="{Binding Location}" Width="200"/>
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
|
||||
<GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
|
||||
|
||||
<TextBox x:Name="EventData" Grid.Column="2" Margin="5,10,10,10" IsReadOnly="True"
|
||||
HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible"/>
|
||||
</Grid>
|
||||
</Window>
|
44
Elwig/Windows/LogWindow.xaml.cs
Normal file
44
Elwig/Windows/LogWindow.xaml.cs
Normal file
@ -0,0 +1,44 @@
|
||||
using Elwig.Helpers;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Windows;
|
||||
|
||||
namespace Elwig.Windows {
|
||||
public partial class LogWindow : Window {
|
||||
|
||||
public LogWindow() {
|
||||
InitializeComponent();
|
||||
WindowState = WindowState.Maximized;
|
||||
}
|
||||
|
||||
private void Window_Loaded(object sender, RoutedEventArgs evt) {
|
||||
var log = Utils.GetLogEntries();
|
||||
EventList.ItemsSource = log
|
||||
.Select(e => new {
|
||||
Event = e,
|
||||
Lines = e.Message.Split('\n').ToArray(),
|
||||
})
|
||||
.Select(e => new {
|
||||
e.Event,
|
||||
Exception = e.Lines.FirstOrDefault(l => l.StartsWith("Exception Info: "))?[16..].Trim().Split(':', 2),
|
||||
Location = e.Lines.FirstOrDefault(l => l.StartsWith(" at Elwig."))?[5..].Trim(),
|
||||
})
|
||||
.Select(e => new {
|
||||
e.Event,
|
||||
e.Exception,
|
||||
ExceptionName = e.Exception?[0].Trim(),
|
||||
ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
|
||||
e.Location,
|
||||
})
|
||||
.OrderByDescending(e => e.Event.TimeGenerated)
|
||||
.ToList();
|
||||
EventList.SelectedIndex = 0;
|
||||
}
|
||||
|
||||
private void EventList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
var t = EventList.SelectedItem.GetType();
|
||||
var p = t.GetProperty("Event")!;
|
||||
EventData.Text = ((EventLogEntry)p.GetValue(EventList.SelectedItem)!).Message;
|
||||
}
|
||||
}
|
||||
}
|
@ -32,6 +32,7 @@
|
||||
<MenuItem Header="Über"/>
|
||||
<MenuItem x:Name="Menu_Help_Update" Header="Nach Updates suchen" Click="Menu_Help_Update_Click"/>
|
||||
<MenuItem x:Name="Menu_Help_Smtp" Header="E-Mail-Einstellungen testen" Click="Menu_Help_Smtp_Click"/>
|
||||
<MenuItem x:Name="Menu_Help_Log" Header="Fehler-Protokoll anzeigen" Click="Menu_Help_Log_Click"/>
|
||||
<Separator/>
|
||||
<MenuItem x:Name="Menu_Help_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Help_Config_Click"/>
|
||||
<MenuItem x:Name="Menu_Help_Directory" Header="Konfigurationsspeicherort öffnen..." Click="Menu_Help_Directory_Click"/>
|
||||
|
@ -90,6 +90,11 @@ namespace Elwig.Windows {
|
||||
} catch { }
|
||||
}
|
||||
|
||||
private void Menu_Help_Log_Click(object sender, RoutedEventArgs evt) {
|
||||
var w = new LogWindow();
|
||||
w.Show();
|
||||
}
|
||||
|
||||
private async void Menu_Scale_SetDateTime_Click(object sender, RoutedEventArgs evt) {
|
||||
if (App.CommandScales.Count == 0) {
|
||||
MessageBox.Show("Es sind keine geeigneten Waagen verfügbar!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
|
@ -155,12 +155,12 @@ namespace Elwig.Windows {
|
||||
ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({await ctx.Members.SumAsync(m => m.BusinessShares):N0})";
|
||||
}
|
||||
|
||||
private async Task RefreshInputs(bool validate = false) {
|
||||
private void RefreshInputs(bool validate = false) {
|
||||
ClearInputStates();
|
||||
if (ViewModel.SelectedMember is Member m) {
|
||||
EditMemberButton.IsEnabled = true;
|
||||
DeleteMemberButton.IsEnabled = true;
|
||||
await FillInputs(m);
|
||||
FillInputs(m);
|
||||
} else {
|
||||
EditMemberButton.IsEnabled = false;
|
||||
DeleteMemberButton.IsEnabled = false;
|
||||
@ -283,8 +283,8 @@ namespace Elwig.Windows {
|
||||
inputs.Address.Visibility = vis;
|
||||
}
|
||||
|
||||
private async void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
await RefreshInputs();
|
||||
private void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
RefreshInputs();
|
||||
if (MemberList.SelectedItem is Member m) {
|
||||
Menu_Export_ExportSelected.IsEnabled = !IsEditing && !IsCreating;
|
||||
Menu_Export_UploadSelected.IsEnabled = !IsEditing && !IsCreating && App.Config.SyncUrl != null;
|
||||
@ -409,7 +409,7 @@ namespace Elwig.Windows {
|
||||
ViewModel.EnableSearchInputs = true;
|
||||
FinishInputFilling();
|
||||
await RefreshList();
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
ViewModel.SearchQuery = "";
|
||||
if (mgnr is int m)
|
||||
FocusMember(m);
|
||||
@ -425,7 +425,7 @@ namespace Elwig.Windows {
|
||||
ViewModel.TransferPredecessorAreaComs = null;
|
||||
ViewModel.CancelAreaComs = null;
|
||||
if (IsEditing) {
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
} else if (IsCreating) {
|
||||
ClearInputs();
|
||||
await InitInputs();
|
||||
@ -433,7 +433,7 @@ namespace Elwig.Windows {
|
||||
UpdateButtons();
|
||||
}
|
||||
|
||||
private async void CancelButton_Click(object sender, RoutedEventArgs evt) {
|
||||
private void CancelButton_Click(object sender, RoutedEventArgs evt) {
|
||||
IsEditing = false;
|
||||
IsCreating = false;
|
||||
MemberList.IsEnabled = true;
|
||||
@ -441,7 +441,7 @@ namespace Elwig.Windows {
|
||||
ViewModel.CancelAreaComs = null;
|
||||
HideSaveResetCancelButtons();
|
||||
ShowNewEditDeleteButtons();
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
LockInputs();
|
||||
UpdateContactInfoVisibility();
|
||||
ViewModel.EnableSearchInputs = true;
|
||||
@ -686,10 +686,10 @@ namespace Elwig.Windows {
|
||||
}
|
||||
}
|
||||
|
||||
private async Task FillInputs(Member m) {
|
||||
private void FillInputs(Member m) {
|
||||
ClearOriginalValues();
|
||||
ClearDefaultValues();
|
||||
await ViewModel.FillInputs(m);
|
||||
ViewModel.FillInputs(m);
|
||||
UpdateContactInfoVisibility(IsEditing || IsCreating);
|
||||
FinishInputFilling();
|
||||
}
|
||||
|
@ -18,11 +18,11 @@ namespace Tests.DocumentTests {
|
||||
Assert.That(text, Contains.Substring("Anmeldeliste"));
|
||||
Assert.That(text, Contains.Substring("01.10.2020 – Matzen – GV Kabinettaktion"));
|
||||
Assert.That(table, Is.EqualTo(new string[][] {
|
||||
["01.10.2020", "101 MUSTERMANN Max", "Grüner Veltliner", "-", "5 000"],
|
||||
["01.10.2020", "102 WEINBAUER Wernhardt", "Grüner Veltliner", "-", "10 000"],
|
||||
["01.10.2020", "103 MUSTERBAUER Matthäus", "Grüner Veltliner", "-", "8 000"],
|
||||
["01.10.2020", "104 WINZER Waltraud", "Grüner Veltliner", "-", "2 000"],
|
||||
["Gesamt:", "Anmeldungen: 4", "25 000"],
|
||||
["01.10.2020", "101 MUSTERMANN Max", "Hohenruppersdorf", "Grüner Veltliner", "-", "5 000"],
|
||||
["01.10.2020", "102 WEINBAUER Wernhardt", "Hohenruppersdorf", "Grüner Veltliner", "-", "10 000"],
|
||||
["01.10.2020", "103 MUSTERBAUER Matthäus", "Wolkersdorf", "Grüner Veltliner", "-", "8 000"],
|
||||
["01.10.2020", "104 WINZER Waltraud", "Wolkersdorf", "Grüner Veltliner", "-", "2 000"],
|
||||
["Gesamt:", "Anmeldungen: 4", "25 000"],
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
Reference in New Issue
Block a user