Compare commits
	
		
			19 Commits
		
	
	
		
			v0.3.3
			...
			2bb8205da0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2bb8205da0 | |||
| f623aa1fee | |||
| 00e7eeb774 | |||
| 47d51ded51 | |||
| 532bb826e1 | |||
| 8193bf483c | |||
| 34dcaf26d9 | |||
| 7411f570ee | |||
| 52702f3fa2 | |||
| 7f3573cede | |||
| 72359dc8be | |||
| 0e17aa5408 | |||
| 2bf850bc55 | |||
| aadf536d13 | |||
| 3be6371be1 | |||
| ca1b68aa4f | |||
| d4e5ac6753 | |||
| c9f49927a8 | |||
| 1794b5b8ca | 
| @@ -157,9 +157,12 @@ namespace Elwig { | ||||
|  | ||||
|         protected void OnPrintingReadyChanged(EventArgs evt) { | ||||
|             foreach (Window w in Windows) { | ||||
|                 foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => "Print".Equals(b.Tag))) { | ||||
|                 foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => b.Tag?.ToString() == "Print")) { | ||||
|                     b.IsEnabled = IsPrintingReady; | ||||
|                 } | ||||
|                 foreach (var i in ControlUtils.FindAllChildren<MenuItem>(w).Where(i => i.Tag?.ToString() == "Print")) { | ||||
|                     i.IsEnabled = IsPrintingReady; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -1,3 +1,4 @@ | ||||
| using Elwig.Helpers; | ||||
| using Elwig.Models; | ||||
|  | ||||
| namespace Elwig.Documents { | ||||
| @@ -26,14 +27,9 @@ namespace Elwig.Documents { | ||||
|  | ||||
|         public string Address { | ||||
|             get { | ||||
|                 var b = Member.BillingAddress; | ||||
|                 if (b != null && UseBillingAddress) { | ||||
|                     var plz = b.PostalDest.AtPlz; | ||||
|                     return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich"; | ||||
|                 } else { | ||||
|                     var plz = Member.PostalDest.AtPlz; | ||||
|                     return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich"; | ||||
|                 } | ||||
|                 IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member; | ||||
|                 var plz = addr.PostalDest.AtPlz; | ||||
|                 return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}"; | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -1,5 +1,6 @@ | ||||
| using Elwig.Helpers; | ||||
| using Elwig.Models; | ||||
| using Microsoft.EntityFrameworkCore; | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.Linq; | ||||
| @@ -15,11 +16,18 @@ namespace Elwig.Documents { | ||||
|             Deliveries = deliveries; | ||||
|         } | ||||
|  | ||||
|         public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) : | ||||
|             this(filter, (IEnumerable<DeliveryPart>)deliveries | ||||
|                 .Include(p => p.Delivery) | ||||
|                 .Include(p => p.Delivery.Member) | ||||
|                 .Include(p => p.Variant)) { } | ||||
|  | ||||
|         public DeliveryJournal(AppDbContext ctx, DateOnly date) : | ||||
|             this(date.ToString("dd.MM.yyyy"), ctx.DeliveryParts | ||||
|                 .Where(p => p.Delivery.DateString == date.ToString("yyy-MM-dd")) | ||||
|                 .OrderBy(p => p.Delivery.LsNr) | ||||
|                 .ThenBy(p => p.DPNr) | ||||
|                 .ToList()) { } | ||||
|                 .OrderBy(p => p.Delivery.DateString) | ||||
|                 .ThenBy(p => p.Delivery.TimeString) | ||||
|                 .ThenBy(p => p.Delivery.LsNr) | ||||
|                 .ThenBy(p => p.DPNr)) { } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -2,11 +2,15 @@ using System; | ||||
| using System.Threading.Tasks; | ||||
| using System.IO; | ||||
| using Elwig.Helpers; | ||||
| using System.Collections.Generic; | ||||
| using System.Text.RegularExpressions; | ||||
| using System.Linq; | ||||
|  | ||||
| namespace Elwig.Documents { | ||||
|     public abstract class Document : IDisposable { | ||||
|     public abstract partial class Document : IDisposable { | ||||
|  | ||||
|         private TempFile? PdfFile = null; | ||||
|         private TempFile? _pdfFile = null; | ||||
|         private string? _renderedHtml = null; | ||||
|  | ||||
|         public bool ShowFoldMarks = App.Config.Debug; | ||||
|  | ||||
| @@ -35,17 +39,56 @@ namespace Elwig.Documents { | ||||
|             Date = DateTime.Today; | ||||
|         } | ||||
|  | ||||
|         [GeneratedRegex(@"</body>.*?</footer>\s*</div>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)] | ||||
|         private static partial Regex GeneratedDocumentHeaderRegex(); | ||||
|         private static readonly Regex DocumentHeaderRegex = GeneratedDocumentHeaderRegex(); | ||||
|  | ||||
|         [GeneratedRegex(@"<style>.*?/style>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)] | ||||
|         private static partial Regex GeneratedHtmlStyleRegex(); | ||||
|         private static readonly Regex HtmlStyleRegex = GeneratedHtmlStyleRegex(); | ||||
|  | ||||
|         [GeneratedRegex(@"<link[^>]*>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)] | ||||
|         private static partial Regex GeneratedHtmlLinkRegex(); | ||||
|         private static readonly Regex HtmlLinkRegex = GeneratedHtmlLinkRegex(); | ||||
|  | ||||
|         ~Document() { | ||||
|             Dispose(); | ||||
|         } | ||||
|  | ||||
|         public void Dispose() { | ||||
|             PdfFile?.Dispose(); | ||||
|             PdfFile = null; | ||||
|             _pdfFile?.Dispose(); | ||||
|             _pdfFile = null; | ||||
|             GC.SuppressFinalize(this); | ||||
|         } | ||||
|  | ||||
|         private Task<string> Render() { | ||||
|         public static async Task<Document> Merge(IEnumerable<Document> docs) { | ||||
|             string html = ""; | ||||
|             var styles = new List<string>(); | ||||
|             foreach (var d in docs) { | ||||
|                 var h = await d.Render(); | ||||
|                 var s = HtmlStyleRegex.Matches(h).Select(m => m.Value).ToList(); | ||||
|                 var l = HtmlLinkRegex.Matches(h).Select(m => m.Value).ToList(); | ||||
|                 if (s.All(styles.Contains)) { | ||||
|                     h = HtmlStyleRegex.Replace(h, ""); | ||||
|                 } else { | ||||
|                     styles.AddRange(s); | ||||
|                 } | ||||
|                 if (l.All(styles.Contains)) { | ||||
|                     h = HtmlLinkRegex.Replace(h, ""); | ||||
|                 } else { | ||||
|                     styles.AddRange(l); | ||||
|                 } | ||||
|                 html += h; | ||||
|             } | ||||
|             html = DocumentHeaderRegex.Replace(html, "<div class='document-break'/>"); | ||||
|             return new InternalDocument("Mehrere Dokumente") { | ||||
|                 _renderedHtml = html, | ||||
|             }; | ||||
|         } | ||||
|  | ||||
|         private async Task<string> Render() { | ||||
|             if (_renderedHtml != null) | ||||
|                 return _renderedHtml; | ||||
|             string name; | ||||
|             if (this is BusinessLetter) { | ||||
|                 name = "BusinessLetter"; | ||||
| @@ -55,14 +98,17 @@ namespace Elwig.Documents { | ||||
|                 name = "CreditNote"; | ||||
|             } else if (this is DeliveryJournal) { | ||||
|                 name = "DeliveryJournal"; | ||||
|             } else if (this is Letterhead) { | ||||
|                 name = "Letterhead"; | ||||
|             } else { | ||||
|                 throw new InvalidOperationException("Invalid document object"); | ||||
|             } | ||||
|             return Render(name); | ||||
|             return await Render(name); | ||||
|         } | ||||
|  | ||||
|         private Task<string> Render(string name) { | ||||
|             return Html.CompileRenderAsync(name, this); | ||||
|         private async Task<string> Render(string name) { | ||||
|             _renderedHtml = await Html.CompileRenderAsync(name, this); | ||||
|             return _renderedHtml; | ||||
|         } | ||||
|  | ||||
|         public async Task Generate() { | ||||
| @@ -71,22 +117,26 @@ namespace Elwig.Documents { | ||||
|                 await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8); | ||||
|                 await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath); | ||||
|             } | ||||
|             PdfFile = pdf; | ||||
|             _pdfFile = pdf; | ||||
|         } | ||||
|  | ||||
|         public void SaveTo(string pdfPath) { | ||||
|             if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||
|             File.Copy(PdfFile.FilePath, pdfPath); | ||||
|             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||
|             File.Copy(_pdfFile.FilePath, pdfPath); | ||||
|         } | ||||
|  | ||||
|         public async Task Print(int copies = 1) { | ||||
|             if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||
|             await Pdf.Print(PdfFile.FilePath, copies); | ||||
|             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||
|             await Pdf.Print(_pdfFile.FilePath, copies); | ||||
|         } | ||||
|  | ||||
|         public void Show() { | ||||
|             if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||
|             Pdf.Show(PdfFile.NewReference(), Title); | ||||
|             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||
|             Pdf.Show(_pdfFile.NewReference(), Title); | ||||
|         } | ||||
|  | ||||
|         private class InternalDocument : Document { | ||||
|             public InternalDocument(string title) : base(title) { } | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -20,6 +20,7 @@ namespace Elwig.Documents { | ||||
|             await e.CompileTemplateAsync("DeliveryNote"); | ||||
|             await e.CompileTemplateAsync("CreditNote"); | ||||
|             await e.CompileTemplateAsync("DeliveryJournal"); | ||||
|             await e.CompileTemplateAsync("Letterhead"); | ||||
|  | ||||
|             Engine = e; | ||||
|             evtHandler(); | ||||
|   | ||||
							
								
								
									
										9
									
								
								Elwig/Documents/Letterhead.cshtml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								Elwig/Documents/Letterhead.cshtml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| @using RazorLight | ||||
| @inherits TemplatePage<Elwig.Documents.Letterhead> | ||||
| @model Elwig.Documents.Letterhead | ||||
| @{ Layout = "BusinessDocument"; } | ||||
| <style> | ||||
|     header, .footer-wrapper { | ||||
|         visibility: hidden; | ||||
|     } | ||||
| </style> | ||||
							
								
								
									
										9
									
								
								Elwig/Documents/Letterhead.cshtml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								Elwig/Documents/Letterhead.cshtml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| using Elwig.Models; | ||||
|  | ||||
| namespace Elwig.Documents { | ||||
|     public class Letterhead : BusinessDocument { | ||||
|         public Letterhead(Member m) : base($"Briefkopf {m.Name}", m, true) { | ||||
|             Aside = ""; | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -59,6 +59,7 @@ namespace Elwig.Documents { | ||||
|         public static async Task Print(string path, int copies = 1) { | ||||
|             var p = new Process() { StartInfo = new() { FileName = PdfToPrinter } }; | ||||
|             p.StartInfo.ArgumentList.Add(path); | ||||
|             p.StartInfo.ArgumentList.Add("/s"); | ||||
|             p.StartInfo.ArgumentList.Add($"copies={copies}"); | ||||
|             p.Start(); | ||||
|             await p.WaitForExitAsync(); | ||||
|   | ||||
| @@ -20,6 +20,9 @@ | ||||
| hr.page-break { | ||||
|     display: none; | ||||
| } | ||||
| .document-break { | ||||
|     break-before: page; | ||||
| } | ||||
|  | ||||
| @page { | ||||
|     size: A4; | ||||
|   | ||||
| @@ -58,7 +58,8 @@ namespace Elwig.Helpers { | ||||
|                     continue; | ||||
|                 } else if (child is T t) { | ||||
|                     yield return t; | ||||
|                 } else if (child is DependencyObject childDepOpj) { | ||||
|                 } | ||||
|                 if (child is DependencyObject childDepOpj) { | ||||
|                     foreach (T childOfChild in FindAllChildren<T>(childDepOpj)) { | ||||
|                         yield return childOfChild; | ||||
|                     } | ||||
|   | ||||
| @@ -157,8 +157,12 @@ namespace Elwig.Helpers { | ||||
|         } | ||||
|  | ||||
|         public static void MailTo(string emailAddress) { | ||||
|             MailTo(new string[] { emailAddress }); | ||||
|         } | ||||
|  | ||||
|         public static void MailTo(IEnumerable<string> emailAddresses) { | ||||
|             Process.Start(new ProcessStartInfo() { | ||||
|                 FileName = $"mailto:{emailAddress}", | ||||
|                 FileName = $"mailto:{string.Join(",%20", emailAddresses)}", | ||||
|                 UseShellExecute = true, | ||||
|             }); | ||||
|         } | ||||
|   | ||||
| @@ -521,6 +521,36 @@ namespace Elwig.Helpers { | ||||
|             return new(true, null); | ||||
|         } | ||||
|  | ||||
|         public static ValidationResult CheckTime(TextBox input, bool required) { | ||||
|             string text = ""; | ||||
|             int pos = input.CaretIndex; | ||||
|             int v = 0; | ||||
|             for (int i = 0; i < input.Text.Length; i++) { | ||||
|                 char ch = input.Text[i]; | ||||
|                 if (v >= 0 && v < 5 && v != 2 && char.IsAsciiDigit(ch)) { | ||||
|                     if ((v == 0 && ch <= '2') || (v == 1 && (text[0] < '2' || ch <= '3')) || (v == 3 && ch <= '5') || v == 4) { | ||||
|                         text += ch; | ||||
|                         v++; | ||||
|                     } | ||||
|                 } else if (v == 2 && ch == ':') { | ||||
|                     text += ch; | ||||
|                     v++; | ||||
|                 } | ||||
|                 if (i == input.CaretIndex - 1) | ||||
|                     pos = text.Length; | ||||
|             } | ||||
|             input.Text = text; | ||||
|             input.CaretIndex = pos; | ||||
|  | ||||
|             if (text.Length == 0) { | ||||
|                 return required ? new(false, "Wert ist nicht optional") : new(true, null); | ||||
|             } else if (v != 5) { | ||||
|                 return new(false, "Zeit ist ungültig"); | ||||
|             } else { | ||||
|                 return new(true, null); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         public static ValidationResult CheckFbNr(TextBox input, bool required, AppDbContext ctx, AreaCom? c) { | ||||
|             var res = CheckInteger(input, required); | ||||
|             if (!res.IsValid) { | ||||
|   | ||||
| @@ -482,6 +482,14 @@ namespace Elwig.Windows { | ||||
|             InputLostFocus((TextBox)sender, Validator.CheckDate); | ||||
|         } | ||||
|  | ||||
|         protected void TimeInput_TextChanged(object sender, RoutedEventArgs evt) { | ||||
|             InputTextChanged((TextBox)sender, Validator.CheckTime); | ||||
|         } | ||||
|  | ||||
|         protected void TimeInput_LostFocus(object sender, RoutedEventArgs evt) { | ||||
|             InputLostFocus((TextBox)sender, Validator.CheckTime); | ||||
|         } | ||||
|  | ||||
|         protected void PlzInput_TextChanged(object sender, RoutedEventArgs evt) { | ||||
|             var plz = (TextBox)sender; | ||||
|             InputTextChanged(plz, Validator.CheckPlz); | ||||
|   | ||||
| @@ -5,7 +5,7 @@ | ||||
|         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||
|         xmlns:local="clr-namespace:Elwig.Windows" | ||||
|         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" | ||||
|         Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="700" MinWidth="1000" | ||||
|         Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="720" MinWidth="1000" | ||||
|         Loaded="Window_Loaded"> | ||||
|     <Window.Resources> | ||||
|         <Style TargetType="Label"> | ||||
| @@ -43,16 +43,13 @@ | ||||
|     <Grid> | ||||
|         <Grid.RowDefinitions> | ||||
|             <RowDefinition Height="19"/> | ||||
|             <RowDefinition Height="0.625*"/> | ||||
|             <RowDefinition Height="*"/> | ||||
|             <RowDefinition Height="*"/> | ||||
|             <RowDefinition Height="*"/> | ||||
|             <RowDefinition Height="24"/> | ||||
|         </Grid.RowDefinitions> | ||||
|         <Grid.ColumnDefinitions> | ||||
|             <ColumnDefinition Width="1*" MinWidth="400"/> | ||||
|             <ColumnDefinition Width="1*"/> | ||||
|             <ColumnDefinition Width="1*"/> | ||||
|             <ColumnDefinition Width="5"/> | ||||
|             <ColumnDefinition Width="2*" MinWidth="560"/> | ||||
|         </Grid.ColumnDefinitions> | ||||
|  | ||||
|         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White"> | ||||
| @@ -62,22 +59,26 @@ | ||||
|                 <MenuItem x:Name="Menu_Print_PrintDeliveryNote" Header="Lieferschein drucken" IsEnabled="False" | ||||
|                           Click="Menu_Print_PrintDeliveryNote_Click"/> | ||||
|                 <MenuItem x:Name="Menu_Print_DeliveryJournal" Header="Lieferjournal"> | ||||
|                     <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen" | ||||
|                     <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen" IsEnabled="False" Tag="Print" | ||||
|                               Click="Menu_Print_DeliveryJournal_ShowToday_Click"/> | ||||
|                     <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintToday" Header="von heute drucken" | ||||
|                     <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintToday" Header="von heute drucken" IsEnabled="False" Tag="Print" | ||||
|                               Click="Menu_Print_DeliveryJournal_PrintToday_Click"/> | ||||
|                     <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowFilter" Header="aus Filtern anzeigen" | ||||
|                     <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowFilter" Header="aus Filtern anzeigen" IsEnabled="False" Tag="Print" | ||||
|                               Click="Menu_Print_DeliveryJournal_ShowFilter_Click"/> | ||||
|                     <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintFilter" Header="aus Filtern drucken" | ||||
|                     <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintFilter" Header="aus Filtern drucken" IsEnabled="False" Tag="Print" | ||||
|                               Click="Menu_Print_DeliveryJournal_PrintFilter_Click"/> | ||||
|                 </MenuItem> | ||||
|             </MenuItem> | ||||
|             <MenuItem Header="Exportieren"> | ||||
|                 <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"/> | ||||
|             </MenuItem> | ||||
|             <MenuItem Header="Einstellungen"> | ||||
|                 <MenuItem x:Name="Menu_Settings_EnableFreeEditing" Header="Freie Bearbeitung aktivieren" | ||||
|                           IsCheckable="True" Checked="Menu_Settings_EnableFreeEditing_Checked" Unchecked="Menu_Settings_EnableFreeEditing_Unchecked"/> | ||||
|             </MenuItem> | ||||
|         </Menu> | ||||
|  | ||||
|         <Grid Grid.RowSpan="4" Grid.Row="1" Margin="5,0,5,0"> | ||||
|         <Grid Grid.Row="1" Margin="5,0,0,0"> | ||||
|             <Grid.RowDefinitions> | ||||
|                 <RowDefinition Height="42"/> | ||||
|                 <RowDefinition Height="*"/> | ||||
| @@ -105,17 +106,49 @@ | ||||
|                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" | ||||
|                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3"> | ||||
|                 <DataGrid.Columns> | ||||
|                     <DataGridTextColumn Header="MgNr."   Binding="{Binding MgNr}" Width="70"/> | ||||
|                     <DataGridTextColumn Header="Datum"   Binding="{Binding Date, StringFormat='dd.MM.yy'}" Width="70"/> | ||||
|                     <DataGridTextColumn Header="Zeit"    Binding="{Binding Time, StringFormat='HH:mm'}" Width="70"/> | ||||
|                     <DataGridTextColumn Header="Sorte"   Binding="{Binding SortIdString}" Width="60"/> | ||||
|                     <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}"  Width="70"> | ||||
|                     <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Datum" Binding="{Binding Date, StringFormat='dd.MM.yy'}" Width="70"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Zeit" Binding="{Binding Time, StringFormat='HH:mm'}" Width="50"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Sorte" Binding="{Binding SortIdString}" Width="50"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg '}" Width="75"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Gradation" Binding="{Binding Kmw, StringFormat='{}{0:N1}° '}" Width="50"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/> | ||||
|                 </DataGrid.Columns> | ||||
|             </DataGrid> | ||||
|  | ||||
| @@ -156,7 +189,21 @@ | ||||
|                     Click="CancelButton_Click"/> | ||||
|         </Grid> | ||||
|  | ||||
|         <GroupBox Header="Mitglied" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5"> | ||||
|         <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/> | ||||
|  | ||||
|         <Grid Grid.Row="1" Grid.Column="2"> | ||||
|             <Grid.RowDefinitions> | ||||
|                 <RowDefinition Height="0.625*"/> | ||||
|                 <RowDefinition Height="*"/> | ||||
|                 <RowDefinition Height="*"/> | ||||
|                 <RowDefinition Height="*"/> | ||||
|             </Grid.RowDefinitions> | ||||
|             <Grid.ColumnDefinitions> | ||||
|                 <ColumnDefinition Width="*"/> | ||||
|                 <ColumnDefinition Width="*"/> | ||||
|             </Grid.ColumnDefinitions> | ||||
|  | ||||
|             <GroupBox Header="Mitglied" Grid.Column="0" Grid.Row="0" Margin="5,5,5,5"> | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition Width="70"/> | ||||
| @@ -176,7 +223,7 @@ | ||||
|                 </Grid> | ||||
|             </GroupBox> | ||||
|  | ||||
|         <GroupBox Header="Lieferung" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5"> | ||||
|             <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5"> | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition Width="100"/> | ||||
| @@ -185,18 +232,21 @@ | ||||
|  | ||||
|                     <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/> | ||||
|                     <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0" | ||||
|                          IsReadOnly="True" IsTabStop="False"/> | ||||
|                              IsReadOnly="True" IsTabStop="False" | ||||
|                              TextChanged="TextBox_TextChanged"/> | ||||
|  | ||||
|                     <Label Content="Datum/Uhrzeit:" Margin="10,40,0,0" Grid.Column="0"/> | ||||
|                     <TextBox x:Name="DateInput" Width="77" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0" | ||||
|                          IsReadOnly="True" IsTabStop="False" | ||||
|                          TextChanged="DateInput_TextChanged"/> | ||||
|                              IsReadOnly="True" | ||||
|                              TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/> | ||||
|                     <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="82,40,0,0" | ||||
|                          IsReadOnly="True" IsTabStop="False"/> | ||||
|                              IsReadOnly="True" | ||||
|                              TextChanged="TimeInput_TextChanged" LostFocus="TimeInput_LostFocus"/> | ||||
|  | ||||
|                     <Label Content="Zweigstelle:" Margin="10,70,0,0" Grid.Column="0"/> | ||||
|                     <ComboBox x:Name="BranchInput" Width="126" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left" | ||||
|                               IsEnabled="False" | ||||
|                               SelectionChanged="BranchInput_SelectionChanged" | ||||
|                               DisplayMemberPath="Name" TextSearch.TextPath="Name"/> | ||||
|  | ||||
|                     <Label Content="Anmerkung:" Margin="10,100,0,10"/> | ||||
| @@ -205,7 +255,7 @@ | ||||
|                 </Grid> | ||||
|             </GroupBox> | ||||
|  | ||||
|         <GroupBox Header="Sorte" Grid.Column="2" Grid.Row="1" Margin="5,5,5,5"> | ||||
|             <GroupBox Header="Sorte" Grid.Column="1" Grid.Row="0" Margin="5,5,5,5"> | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition Width="70"/> | ||||
| @@ -226,7 +276,7 @@ | ||||
|                 </Grid> | ||||
|             </GroupBox> | ||||
|  | ||||
|         <GroupBox Header="Gradation" Grid.Column="2" Grid.Row="2" Margin="5,5,5,5"> | ||||
|             <GroupBox Header="Gradation" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5"> | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition Width="100"/> | ||||
| @@ -255,7 +305,7 @@ | ||||
|                 </Grid> | ||||
|             </GroupBox> | ||||
|  | ||||
|         <GroupBox Header="Gewicht" Grid.Column="2" Grid.Row="3" Margin="5,5,5,5"> | ||||
|             <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5"> | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition Width="70"/> | ||||
| @@ -295,7 +345,7 @@ | ||||
|                 </Grid> | ||||
|             </GroupBox> | ||||
|  | ||||
|         <GroupBox Header="Sonstiges" Grid.Column="2" Grid.Row="4" Margin="5,5,5,10"> | ||||
|             <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="3" Margin="5,5,5,10"> | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition Width="100"/> | ||||
| @@ -335,7 +385,7 @@ | ||||
|                 </Grid> | ||||
|             </GroupBox> | ||||
|  | ||||
|         <GroupBox Header="Teillieferungen" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5"> | ||||
|             <GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5"> | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition/> | ||||
| @@ -366,7 +416,7 @@ | ||||
|                 </Grid> | ||||
|             </GroupBox> | ||||
|  | ||||
|         <GroupBox Header="Herkunft" Grid.Column="1" Grid.Row="4" Margin="5,5,5,10"> | ||||
|             <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="3" Margin="5,5,5,10"> | ||||
|                 <Grid> | ||||
|                     <Grid.ColumnDefinitions> | ||||
|                         <ColumnDefinition Width="100"/> | ||||
| @@ -387,6 +437,7 @@ | ||||
|                               DisplayMemberPath="Name"/> | ||||
|                 </Grid> | ||||
|             </GroupBox> | ||||
|         </Grid> | ||||
|  | ||||
|         <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray"> | ||||
|             <StatusBar.ItemsPanel> | ||||
|   | ||||
| @@ -94,6 +94,11 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private void Window_Loaded(object sender, RoutedEventArgs evt) { | ||||
|             Menu_Print_DeliveryJournal_ShowToday.IsEnabled = App.IsPrintingReady; | ||||
|             Menu_Print_DeliveryJournal_PrintToday.IsEnabled = App.IsPrintingReady; | ||||
|             Menu_Print_DeliveryJournal_ShowFilter.IsEnabled = App.IsPrintingReady; | ||||
|             Menu_Print_DeliveryJournal_PrintFilter.IsEnabled = App.IsPrintingReady; | ||||
|  | ||||
|             OnSecondPassed(null, null); | ||||
|             Timer.Start(); | ||||
|             LockInputs(); | ||||
| @@ -108,7 +113,7 @@ namespace Elwig.Windows { | ||||
|  | ||||
|         private async void Menu_Print_ShowDeliveryNote_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (DeliveryList.SelectedItem is not Delivery d) return; | ||||
|             Mouse.OverrideCursor = Cursors.Wait; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             using var doc = new DeliveryNote(d, Context); | ||||
|             await doc.Generate(); | ||||
|             Mouse.OverrideCursor = null; | ||||
| @@ -117,7 +122,7 @@ namespace Elwig.Windows { | ||||
|  | ||||
|         private async void Menu_Print_PrintDeliveryNote_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (DeliveryList.SelectedItem is not Delivery d) return; | ||||
|             Mouse.OverrideCursor = Cursors.Wait; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             using var doc = new DeliveryNote(d, Context); | ||||
|             await doc.Generate(); | ||||
|             Mouse.OverrideCursor = null; | ||||
| @@ -134,7 +139,7 @@ namespace Elwig.Windows { | ||||
|                 Title = $"Traubentransportscheinliste (BKI) speichern unter - Elwig" | ||||
|             }; | ||||
|             if (d.ShowDialog() == true) { | ||||
|                 Mouse.OverrideCursor = Cursors.Wait; | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|                 using var file = new Bki(d.FileName); | ||||
|                 await file.ExportAsync(year); | ||||
|                 Mouse.OverrideCursor = null; | ||||
| @@ -142,7 +147,7 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void Menu_Print_DeliveryJournal_ShowToday_Click(object sender, RoutedEventArgs evt) { | ||||
|             Mouse.OverrideCursor = Cursors.Wait; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today)); | ||||
|             await doc.Generate(); | ||||
|             Mouse.OverrideCursor = null; | ||||
| @@ -150,7 +155,7 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void Menu_Print_DeliveryJournal_PrintToday_Click(object sender, RoutedEventArgs evt) { | ||||
|             Mouse.OverrideCursor = Cursors.Wait; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today)); | ||||
|             await doc.Generate(); | ||||
|             Mouse.OverrideCursor = null; | ||||
| @@ -158,7 +163,7 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void Menu_Print_DeliveryJournal_ShowFilter_Click(object sender, RoutedEventArgs evt) { | ||||
|             Mouse.OverrideCursor = Cursors.Wait; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             var (f, _, d, _) = await GetFilters(); | ||||
|             var doc = new DeliveryJournal(string.Join(" / ", f), d); | ||||
|             await doc.Generate(); | ||||
| @@ -167,7 +172,7 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void Menu_Print_DeliveryJournal_PrintFilter_Click(object sender, RoutedEventArgs evt) { | ||||
|             Mouse.OverrideCursor = Cursors.Wait; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             var (f, _, d, _) = await GetFilters(); | ||||
|             var doc = new DeliveryJournal(string.Join(" / ", f), d); | ||||
|             await doc.Generate(); | ||||
| @@ -175,11 +180,30 @@ namespace Elwig.Windows { | ||||
|             doc.Show(); | ||||
|         } | ||||
|  | ||||
|         private void Menu_Settings_EnableFreeEditing_Checked(object sender, RoutedEventArgs evt) { | ||||
|             if (IsEditing || IsCreating) { | ||||
|                 DateInput.IsReadOnly = false; | ||||
|                 TimeInput.IsReadOnly = false; | ||||
|                 BranchInput.IsEnabled = true; | ||||
|                 if (IsCreating) TimeInput.Text = ""; | ||||
|                 OnSecondPassed(null, null); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private void Menu_Settings_EnableFreeEditing_Unchecked(object sender, RoutedEventArgs evt) { | ||||
|             DateInput.IsReadOnly = true; | ||||
|             TimeInput.IsReadOnly = true; | ||||
|             BranchInput.IsEnabled = false; | ||||
|             OnSecondPassed(null, null); | ||||
|         } | ||||
|  | ||||
|         private void OnSecondPassed(object? sender, EventArgs? evt) { | ||||
|             if (IsReceipt && IsCreating) { | ||||
|             if (IsReceipt && IsCreating && !Menu_Settings_EnableFreeEditing.IsChecked) { | ||||
|                 var now = DateTime.Now; | ||||
|                 TimeInput.Text = now.ToString("HH:mm"); | ||||
|                 DateInput.Text = now.ToString("dd.MM.yyyy"); | ||||
|                 SetDefaultValue(TimeInput); | ||||
|                 SetDefaultValue(DateInput); | ||||
|             } | ||||
|         } | ||||
|  | ||||
| @@ -254,15 +278,14 @@ namespace Elwig.Windows { | ||||
|             } | ||||
|             if (TodayOnlyInput.IsChecked == true) { | ||||
|                 deliveryQuery = deliveryQuery | ||||
|                     .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) || | ||||
|                                 (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0)); | ||||
|                     .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") > 0)) || | ||||
|                                 (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") <= 0))); | ||||
|                 filterNames.Add(Utils.Today.ToString("dd.MM.yyyy")); | ||||
|             } else if (AllSeasonsInput.IsChecked == false) { | ||||
|                 deliveryQuery = deliveryQuery.Where(d => d.Year == SeasonInput.Value); | ||||
|                 filterNames.Add(SeasonInput.Value.ToString() ?? ""); | ||||
|             } | ||||
|             deliveryQuery = deliveryQuery.OrderBy(d => d.DateString).ThenBy(d => d.TimeString); | ||||
|             IQueryable<DeliveryPart> dpq = deliveryQuery.SelectMany(d => d.Parts); | ||||
|             IQueryable<DeliveryPart> dpq = deliveryQuery.SelectMany(d => d.Parts).OrderBy(p => p.Delivery.DateString).ThenBy(p => p.Delivery.TimeString); | ||||
|  | ||||
|             // TODO add filter for: | ||||
|             //      attributes | ||||
| @@ -378,8 +401,8 @@ namespace Elwig.Windows { | ||||
|                 if (filterPartDate.Count > 0) dpq = dpq.Where(p => filterPartDate.Contains(p.Delivery.DateString.Substring(4))); | ||||
|                 if (filterYearGt > 0) dpq = dpq.Where(p => p.Year >= filterYearGt); | ||||
|                 if (filterYearLt > 0) dpq = dpq.Where(p => p.Year < filterYearLt); | ||||
|                 if (filterTimeGt != null) dpq = dpq.Where(p => filterTimeGt.CompareTo(p.Delivery.TimeString) <= 0); | ||||
|                 if (filterTimeLt != null) dpq = dpq.Where(p => filterTimeLt.CompareTo(p.Delivery.TimeString) > 0); | ||||
|                 if (filterTimeGt != null) dpq = dpq.Where(p => p.Delivery.TimeString != null && filterTimeGt.CompareTo(p.Delivery.TimeString) <= 0); | ||||
|                 if (filterTimeLt != null) dpq = dpq.Where(p => p.Delivery.TimeString != null && filterTimeLt.CompareTo(p.Delivery.TimeString) > 0); | ||||
|                 if (filterVar.Count > 0) dpq = dpq.Where(p => filterVar.Contains(p.SortId)); | ||||
|                 if (filterQual.Count > 0) dpq = dpq.Where(p => filterQual.Contains(p.QualId)); | ||||
|                 if (filterKmwGt > 0) dpq = dpq.Where(p => p.Kmw >= filterKmwGt); | ||||
| @@ -399,14 +422,14 @@ namespace Elwig.Windows { | ||||
|                 } else if (filterKmwGt > 0) { | ||||
|                     filterNames.Add($"ab {filterKmwGt:N1} °KMW"); | ||||
|                 } else if (filterKmwLt > 0) { | ||||
|                     filterNames.Add($"bis {filterKmwLt:N1} °KMW"); | ||||
|                     filterNames.Add($"unter {filterKmwLt:N1} °KMW"); | ||||
|                 } | ||||
|                 if (filterOeGt > 0 && filterOeLt > 0) { | ||||
|                     filterNames.Add($"{filterOeGt:N1}–{filterOeLt:N1} °Oe"); | ||||
|                 } else if (filterOeGt > 0) { | ||||
|                     filterNames.Add($"ab {filterOeGt:N1} °Oe"); | ||||
|                 } else if (filterOeLt > 0) { | ||||
|                     filterNames.Add($"bis {filterOeLt:N1} °Oe"); | ||||
|                     filterNames.Add($"unter {filterOeLt:N1} °Oe"); | ||||
|                 } | ||||
|                 if (filterTimeGt != null && filterTimeLt != null) { | ||||
|                     filterNames.Add($"{filterTimeGt}–{filterTimeLt}"); | ||||
| @@ -417,7 +440,7 @@ namespace Elwig.Windows { | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             return (filterNames, dpq.Select(p => p.Delivery).Distinct(), dpq, filter); | ||||
|             return (filterNames, dpq.Select(p => p.Delivery).Distinct().OrderBy(d => d.DateString).ThenBy(d => d.TimeString), dpq, filter); | ||||
|         } | ||||
|  | ||||
|         private async Task RefreshDeliveryListQuery(bool updateSort = false) { | ||||
| @@ -442,6 +465,7 @@ namespace Elwig.Windows { | ||||
|  | ||||
|             var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList(); | ||||
|             StatusMembers.Text = $"Mitglieder: {members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : ""); | ||||
|             StatusMembers.ToolTip = StatusMembers.Text; | ||||
|             StatusDeliveries.Text = $"Lieferungen: {deliveries.Count}"; | ||||
|  | ||||
|             if (filter.Count == 0) { | ||||
| @@ -498,6 +522,10 @@ namespace Elwig.Windows { | ||||
|                 StatusWeight.Text = "Gewicht: -"; | ||||
|                 StatusGradation.Text = "Gradation: -"; | ||||
|             } | ||||
|  | ||||
|             StatusVarieties.ToolTip = StatusVarieties.Text; | ||||
|             StatusWeight.ToolTip = StatusWeight.Text; | ||||
|             StatusGradation.ToolTip = StatusGradation.Text; | ||||
|         } | ||||
|  | ||||
|         protected override async Task OnRenewContext() { | ||||
| @@ -653,10 +681,10 @@ namespace Elwig.Windows { | ||||
|             if (deliveryNew || InputHasChanged(DateInput)) { | ||||
|                 d.LNr = await Context.NextLNr(d.Date); | ||||
|             } | ||||
|             if (IsCreating) { | ||||
|             if (IsCreating && !InputIsNotDefault(TimeInput)) { | ||||
|                 d.TimeString = DateTime.Now.ToString("HH:mm:ss"); | ||||
|             } else if (InputHasChanged(TimeInput)) { | ||||
|                 d.TimeString = TimeInput.Text + ":00"; | ||||
|             } else if (IsCreating || InputHasChanged(TimeInput)) { | ||||
|                 d.TimeString = (TimeInput.Text != "") ? TimeInput.Text + ":00" : null; | ||||
|             } | ||||
|             d.ZwstId = (BranchInput.SelectedItem as Branch)?.ZwstId; | ||||
|             d.LsNr = LsNrInput.Text; | ||||
| @@ -878,15 +906,14 @@ namespace Elwig.Windows { | ||||
|             await RefreshDeliveryList(); | ||||
|             await RefreshDeliveryParts(); | ||||
|             if (p?.Delivery != null) { | ||||
|                 Mouse.OverrideCursor = Cursors.Wait; | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|                 using var doc = new DeliveryNote(p.Delivery, Context); | ||||
|                 await doc.Generate(); | ||||
|                 Mouse.OverrideCursor = null; | ||||
|                 if (App.Config.Debug) { | ||||
|                     doc.Show(); | ||||
|                 } else { | ||||
|                     await doc.Print(2); | ||||
|                     Activate(); | ||||
|                     doc.Print(2); | ||||
|                 } | ||||
|             } | ||||
|             FinishButton.Cursor = null; | ||||
| @@ -950,7 +977,7 @@ namespace Elwig.Windows { | ||||
|             try { | ||||
|                 if (res == null || res <= 0) | ||||
|                     return; | ||||
|                 Mouse.OverrideCursor = Cursors.Wait; | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|                 ClearOriginalValues(); | ||||
|                 if (res >= p.Weight) { | ||||
|                     ControlUtils.SelectComboBoxItem(WineQualityLevelInput, q => (q as WineQualLevel)?.QualId, "WEI"); | ||||
| @@ -1032,7 +1059,7 @@ namespace Elwig.Windows { | ||||
|                 $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?", | ||||
|                 "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No); | ||||
|             if (r == MessageBoxResult.Yes) { | ||||
|                 Mouse.OverrideCursor = Cursors.Wait; | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|                 Context.Remove(d); | ||||
|                 await Context.SaveChangesAsync(); | ||||
|                 await RefreshDeliveryList(); | ||||
| @@ -1107,8 +1134,8 @@ namespace Elwig.Windows { | ||||
|                 day = day.AddDays(-1); | ||||
|             var lsnrs = await Context.Deliveries | ||||
|                 .Where(d => d.ZwstId == delivery.ZwstId) | ||||
|                 .Where(d => (d.DateString == day.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) || | ||||
|                             (d.DateString == day.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0)) | ||||
|                 .Where(d => (d.DateString == day.ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") > 0)) || | ||||
|                             (d.DateString == day.AddDays(1).ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") <= 0))) | ||||
|                 .Where(d => d.LsNr != delivery.LsNr) | ||||
|                 .OrderBy(d => d.LsNr) | ||||
|                 .Select(d => d.LsNr) | ||||
| @@ -1119,7 +1146,7 @@ namespace Elwig.Windows { | ||||
|             EntityEntry<Delivery>? entry = null; | ||||
|             try { | ||||
|                 Delivery? d = null; | ||||
|                 Mouse.OverrideCursor = Cursors.Wait; | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|                 if (res == "new") { | ||||
|                     d = Context.CreateProxy<Delivery>(); | ||||
|                     d.Date = delivery.Date; | ||||
| @@ -1170,7 +1197,7 @@ namespace Elwig.Windows { | ||||
|                 $"Soll die Teillieferung Nr. {p.DPNr} wirklich unwiderruflich gelöscht werden?", | ||||
|                 "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No); | ||||
|             if (r == MessageBoxResult.Yes) { | ||||
|                 Mouse.OverrideCursor = Cursors.Wait; | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|                 Context.Remove(p); | ||||
|                 await Context.SaveChangesAsync(); | ||||
|                 await RefreshDeliveryParts(); | ||||
| @@ -1260,9 +1287,9 @@ namespace Elwig.Windows { | ||||
|             AbgewertetInput.IsEnabled = false; | ||||
|             ManualWeighingInput.IsEnabled = false; | ||||
|             LsNrInput.IsReadOnly = true; | ||||
|             DateInput.IsReadOnly = true; | ||||
|             TimeInput.IsReadOnly = true; | ||||
|             BranchInput.IsEnabled = false; | ||||
|             DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked; | ||||
|             TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked; | ||||
|             BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked; | ||||
|         } | ||||
|  | ||||
|         private void DisableWeighingButtons() { | ||||
| @@ -1286,15 +1313,25 @@ namespace Elwig.Windows { | ||||
|             if (DateInput.Text == "" || BranchInput.SelectedItem == null) { | ||||
|                 LsNrInput.Text = ""; | ||||
|             } else { | ||||
|                 try { | ||||
|                     var branch = (Branch)BranchInput.SelectedItem; | ||||
|                     var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy"); | ||||
|                     var lnr = await Context.NextLNr(date); | ||||
|                     LsNrInput.Text = Utils.GenerateLsNr(date, branch.ZwstId, lnr); | ||||
|                 } catch { | ||||
|                     LsNrInput.Text = ""; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private void DateInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||
|             if (IsCreating) UpdateLsNr().GetAwaiter().GetResult(); | ||||
|             base.DateInput_TextChanged(sender, evt); | ||||
|             if (IsEditing ||  IsCreating) UpdateLsNr().GetAwaiter().GetResult(); | ||||
|         } | ||||
|  | ||||
|         private void BranchInput_SelectionChanged(object sender, RoutedEventArgs evt) { | ||||
|             base.ComboBox_SelectionChanged(sender, evt); | ||||
|             if (IsEditing || IsCreating) UpdateLsNr().GetAwaiter().GetResult(); | ||||
|         } | ||||
|  | ||||
|         private void UpdateWineVariety(bool valid) { | ||||
|   | ||||
| @@ -55,7 +55,12 @@ | ||||
|             </MenuItem> | ||||
|             <MenuItem Header="Drucken"> | ||||
|                 <MenuItem Header="Stammdatenblatt drucken"/> | ||||
|                 <MenuItem Header="Mitgliederliste drucken"/> | ||||
|                 <MenuItem Header="Briefköpfe drucken"> | ||||
|                     <MenuItem x:Name="Menu_Print_Letterheads_MgNr" Header="nach MgNr. sortiert" IsEnabled="False" Tag="Print" | ||||
|                               Click="Menu_Print_Letterheads_MgNr_Click"/> | ||||
|                     <MenuItem x:Name="Menu_Print_Letterheads_Name" Header="nach Name sortiert" IsEnabled="False" Tag="Print" | ||||
|                               Click="Menu_Print_Letterheads_Name_Click"/> | ||||
|                 </MenuItem> | ||||
|             </MenuItem> | ||||
|             <MenuItem Header="Rundschreiben"> | ||||
|                 <MenuItem Header="Runschreiben ausschicken"/> | ||||
| @@ -88,7 +93,13 @@ | ||||
|                       SelectionChanged="MemberList_SelectionChanged" | ||||
|                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3"> | ||||
|                 <DataGrid.Columns> | ||||
|                     <DataGridTextColumn Header="MgNr."    Binding="{Binding MgNr}"       Width="70"/> | ||||
|                     <DataGridTextColumn Header="MgNr."    Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50"> | ||||
|                         <DataGridTextColumn.CellStyle> | ||||
|                             <Style> | ||||
|                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/> | ||||
|                             </Style> | ||||
|                         </DataGridTextColumn.CellStyle> | ||||
|                     </DataGridTextColumn> | ||||
|                     <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="4*"/> | ||||
|                     <DataGridTextColumn Header="Vorname"  Binding="{Binding GivenName}" Width="3*"/> | ||||
|                 </DataGrid.Columns> | ||||
|   | ||||
| @@ -10,6 +10,7 @@ using Elwig.Models; | ||||
| using System.Threading.Tasks; | ||||
| using Microsoft.EntityFrameworkCore.ChangeTracking; | ||||
| using System.Collections.ObjectModel; | ||||
| using Elwig.Documents; | ||||
|  | ||||
| namespace Elwig.Windows { | ||||
|     public partial class MemberAdminWindow : AdministrationWindow { | ||||
| @@ -54,6 +55,9 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private void Window_Loaded(object sender, RoutedEventArgs evt) { | ||||
|             Menu_Print_Letterheads_MgNr.IsEnabled = App.IsPrintingReady; | ||||
|             Menu_Print_Letterheads_Name.IsEnabled = App.IsPrintingReady; | ||||
|  | ||||
|             ActiveMemberInput.IsChecked = true; | ||||
|             UpdatePhoneNrInputVisibility(); | ||||
|             LockInputs(); | ||||
| @@ -266,7 +270,50 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private void Menu_Member_SendEmail_Click(object sender, RoutedEventArgs evt) { | ||||
|             Utils.MailTo(((Member)MemberList.SelectedItem).EmailAddresses.First().Address); | ||||
|             Utils.MailTo(((Member)MemberList.SelectedItem).EmailAddresses.Select(a => a.Address)); | ||||
|         } | ||||
|  | ||||
|         private async void Menu_Print_Letterheads_MgNr_Click(object sender, RoutedEventArgs evt) { | ||||
|             var n = await Context.Members.CountAsync(m => m.IsActive); | ||||
|             var res = MessageBox.Show( | ||||
|                 $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen", | ||||
|                 MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No); | ||||
|             if (res != MessageBoxResult.Yes) | ||||
|                 return; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             using var doc = await Document.Merge(Context.Members | ||||
|                 .Where(m => m.IsActive && m.ContactViaPost) | ||||
|                 .OrderBy(m => m.MgNr) | ||||
|                 .Select(m => new Letterhead(m))); | ||||
|             await doc.Generate(); | ||||
|             Mouse.OverrideCursor = null; | ||||
|             if (App.Config.Debug) { | ||||
|                 doc.Show(); | ||||
|             } else { | ||||
|                 await doc.Print(); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private async void Menu_Print_Letterheads_Name_Click(object sender, RoutedEventArgs evt) { | ||||
|             var n = await Context.Members.CountAsync(m => m.IsActive); | ||||
|             var res = MessageBox.Show( | ||||
|                 $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen", | ||||
|                 MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No); | ||||
|             if (res != MessageBoxResult.Yes) | ||||
|                 return; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             using var doc = await Document.Merge(Context.Members | ||||
|                 .Where(m => m.IsActive && m.ContactViaPost) | ||||
|                 .OrderBy(m => m.FamilyName) | ||||
|                 .ThenBy(m => m.GivenName) | ||||
|                 .Select(m => new Letterhead(m))); | ||||
|             await doc.Generate(); | ||||
|             Mouse.OverrideCursor = null; | ||||
|             if (App.Config.Debug) { | ||||
|                 doc.Show(); | ||||
|             } else { | ||||
|                 await doc.Print(); | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private void FocusSearchInput(object sender, RoutedEventArgs evt) { | ||||
|   | ||||
| @@ -19,9 +19,9 @@ | ||||
|         <Button x:Name="ChartButton" Content="Chart" Click="ChartButton_Click" | ||||
|                 Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/> | ||||
|  | ||||
|         <Button x:Name="PdfDeliveryButton" Content="Lieferschein Erzeugen" Click="PdfDeliveryButton_Click" Tag="Print" | ||||
|         <Button x:Name="PdfDeliveryButton" Content="Lieferschein Erzeugen" Click="PdfDeliveryButton_Click" Tag="Print" IsEnabled="False" | ||||
|                 Margin="260,190,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/> | ||||
|         <Button x:Name="PdfCreditButton" Content="Gutschrift Erzeugen" Click="PdfCreditButton_Click" Tag="Print" | ||||
|         <Button x:Name="PdfCreditButton" Content="Gutschrift Erzeugen" Click="PdfCreditButton_Click" Tag="Print" IsEnabled="False" | ||||
|                 Margin="260,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/> | ||||
|     </Grid> | ||||
| </Window> | ||||
|   | ||||
| @@ -51,7 +51,7 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void PdfDeliveryButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             Mouse.OverrideCursor = Cursors.Wait; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             using var ctx = new AppDbContext(); | ||||
|             using var doc = new DeliveryNote(await ctx.Deliveries.OrderBy(d => d.Parts.Count).ThenBy(d => d.Year).ThenBy(d => d.DId).LastAsync(), ctx); | ||||
|             await doc.Generate(); | ||||
| @@ -60,7 +60,7 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void PdfCreditButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             Mouse.OverrideCursor = Cursors.Wait; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             using var ctx = new AppDbContext(); | ||||
|             using var doc = new CreditNote(await ctx.Credits.FirstAsync(), ctx); | ||||
|             await doc.Generate(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user