Compare commits
	
		
			18 Commits
		
	
	
		
			v0.11.3
			...
			1d97f3c422
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1d97f3c422 | |||
| b6ae1f5675 | |||
| c185437b9a | |||
| a2315e84bd | |||
| 6ba1973087 | |||
| c62947dacd | |||
| f29a609d3b | |||
| 8a61747538 | |||
| 4a7c95e250 | |||
| 4fa5b8f6d4 | |||
| 579ed53487 | |||
| 1fc736ce16 | |||
| ce39797d8b | |||
| 94a6dd5312 | |||
| b67857ae22 | |||
| a48ea8e7e2 | |||
| 0f87446906 | |||
| e0fcaf1f53 | 
							
								
								
									
										88
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										88
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -3,10 +3,90 @@ Changelog | ||||
| ========= | ||||
|  | ||||
|  | ||||
| [v0.13.1][v0.13.1] (2024-09-29) {#v0.13.1} | ||||
| ------------------------------------------ | ||||
|  | ||||
| ### Neue Funktionen {#0.13.1-features} | ||||
|  | ||||
| * Das Extrahieren/Abwerten/Aufteilen von (Teil-)Lieferungen wurde grundlegend überarbeitet und funktioniert ab jetzt in einem einzigen, übersichtlicheren Dialog. (c62947dacd, c185437b9a) | ||||
|  | ||||
| ### Behobene Fehler {#0.13.1-bugfixes} | ||||
|  | ||||
| * Im Mitglieder-Fenster (`MemberAdminWinodw`) wurden bei `Anlieferungsbestätigung -> speichern (PDF)` und `Traubengutschrift -> speichern (PDF)` E-Mails verschickt, anstatt ein PDF gespeichert. (6ba1973087, a2315e84bd) | ||||
|  | ||||
| ### Sonstiges {#0.13.1-misc} | ||||
|  | ||||
| * Abhängigkeiten aktualisiert. (b6ae1f5675) | ||||
|  | ||||
| [v0.13.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.1 | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| [v0.13.0][v0.13.0] (2024-09-25) {#v0.13.0} | ||||
| ------------------------------------------ | ||||
|  | ||||
| > [!NOTE] | ||||
| > Ab dieser Version verhält sich die Berechnung der Unterlieferungen bei Flächenbindungen anders. | ||||
|  | ||||
| ### Behobene Fehler {#0.13.0-bugfixes} | ||||
|  | ||||
| * Im Lieferungen-Fenster (`DeliveryAdminWindow`) war das Extrahieren in eine neue Lieferung seit ca. 6 Monaten (98688168b8) nicht mehr möglich. (8a61747538) | ||||
|  | ||||
| ### Sonstiges {#v0.13.0-misc} | ||||
|  | ||||
| * Es werden alle Lieferungen (inkl. `WEI`, `RSW`, `LDW`) zur Berechnung der Unterlieferung bei Flächenbindungen herangezogen. (4fa5b8f6d4) | ||||
| * In diversen Fenstern die Formatierung von Zahlen verbessert. (579ed53487) | ||||
| * Das Rundschreiben-Fenster (`MailWindow`) ist nun benutzerfreundlicher/-sicherer. (4a7c95e250) | ||||
|  | ||||
| [v0.13.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.0 | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| [v0.12.0][v0.12.0] (2024-09-24) {#v0.12.0} | ||||
| ------------------------------------------ | ||||
|  | ||||
| ### Behobene Fehler {#v0.12.0-bugfixes} | ||||
|  | ||||
| * Das Drucken von Dokumenten ist wieder möglich. (94a6dd5312, a48ea8e7e2) | ||||
|  | ||||
| ### Sonstiges {#v0.12.0-misc} | ||||
|  | ||||
| * Versuch 1: `Database is locked` Fehler beheben. ([#56][i56]) | ||||
|  | ||||
| [v0.12.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.12.0 | ||||
| [i56]: https://git.necronda.net/winzer/elwig/issues/56 | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| [v0.11.4][v0.11.4] (2024-09-22) {#v0.11.4} | ||||
| ------------------------------------------ | ||||
|  | ||||
| > [!WARNING] | ||||
| > Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich! | ||||
| > | ||||
| > Es wird empfohlen die nächste Version zu verwenden. | ||||
|  | ||||
| ### Behobene Fehler {#v0.11.4-bugfixes} | ||||
|  | ||||
| * In den Tooltips für Gewicht und Flächenbindungen wurden die Abstände wieder hergestellt. (e0fcaf1f53) | ||||
|  | ||||
| [v0.11.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.4 | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| [v0.11.3][v0.11.3] (2024-09-22) {#v0.11.3} | ||||
| ------------------------------------------ | ||||
|  | ||||
| ### Sonstiges {#v0.11.3-misc} | ||||
| > [!WARNING] | ||||
| > Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich! | ||||
| > | ||||
| > Es wird empfohlen Version 0.12.0 zu verwenden. | ||||
|  | ||||
| ### Behobene Fehler {#v0.11.3-bugfixes} | ||||
|  | ||||
| * Im Mitglieder-Fenster (`MemberAdminWindow`) wurde das Berechnen der Mitgliederdaten pro Jahr und Mitglied rückgängig gemacht. (1d187c25f3) | ||||
|  | ||||
| @@ -19,9 +99,9 @@ Changelog | ||||
| ------------------------------------------ | ||||
|  | ||||
| > [!WARNING] | ||||
| > Aufgrund eines Fehlers kann in dieser Version das Öffnen des Mitglieder-Fensters deutlich länger dauern! | ||||
| > Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich! | ||||
| > | ||||
| > Es wird empfohlen die nächste Version zu verwenden. | ||||
| > Es wird empfohlen Version 0.12.0 zu verwenden. | ||||
|  | ||||
| ### Neue Funktionen {#v0.11.2-features} | ||||
|  | ||||
| @@ -235,7 +315,7 @@ Changelog | ||||
|  | ||||
| > [!NOTE] | ||||
| > Mitglieder können ab dieser Version als juristische Person markiert werden. | ||||
| > Es ist empfohlen, dies bei entsprechenden Mitglieder zu überprüfen und einzusetzen (z.B. Bezirksbauernkammer, Lagerhaus). | ||||
| > Es wird empfohlen, dies bei entsprechenden Mitglieder zu überprüfen und einzusetzen (z.B. Bezirksbauernkammer, Lagerhaus). | ||||
|  | ||||
| ### Neue Funktionen {#v0.10.0-features} | ||||
|  | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
|                             BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" | ||||
|                             BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" | ||||
|                             SnapsToDevicePixels="True"> | ||||
|                         <Grid> | ||||
|                         <Grid Background="{Binding Path=Background, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"> | ||||
|                             <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Bottom"> | ||||
|                                 <ScrollViewer.Margin> | ||||
|                                     <Binding ElementName="UnitBlock" Path="ActualWidth"> | ||||
|   | ||||
| @@ -1,56 +0,0 @@ | ||||
| <Window x:Class="Elwig.Dialogs.AbwertenDialog" | ||||
|         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||
|         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||
|         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||
|         WindowStartupLocation="CenterOwner" | ||||
|         FocusManager.FocusedElement="{Binding ElementName=WeightInput}" | ||||
|         Title="Teillieferung abwerten" Height="190" Width="400"> | ||||
|     <Window.Resources> | ||||
|         <Style TargetType="Label"> | ||||
|             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||
|             <Setter Property="VerticalAlignment" Value="Top"/> | ||||
|             <Setter Property="Padding" Value="2,4,2,4"/> | ||||
|             <Setter Property="Height" Value="25"/> | ||||
|         </Style> | ||||
|         <Style TargetType="TextBox"> | ||||
|             <Setter Property="HorizontalAlignment" Value="Stretch"/> | ||||
|             <Setter Property="VerticalAlignment" Value="Top"/> | ||||
|             <Setter Property="FontSize" Value="14"/> | ||||
|             <Setter Property="Padding" Value="2"/> | ||||
|             <Setter Property="Height" Value="25"/> | ||||
|             <Setter Property="TextWrapping" Value="NoWrap"/> | ||||
|         </Style> | ||||
|         <Style TargetType="Button"> | ||||
|             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||
|             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||
|             <Setter Property="Width" Value="100"/> | ||||
|             <Setter Property="Height" Value="25"/> | ||||
|         </Style> | ||||
|     </Window.Resources> | ||||
|     <Grid> | ||||
|         <Grid.ColumnDefinitions> | ||||
|             <ColumnDefinition Width="70"/> | ||||
|             <ColumnDefinition/> | ||||
|         </Grid.ColumnDefinitions> | ||||
|  | ||||
|         <TextBlock Margin="10,10,10,10" Grid.ColumnSpan="2" TextWrapping="Wrap" TextAlignment="Center"> | ||||
|             Welche Menge der Teillieferung <Run x:Name="TextLsNr" FontWeight="Bold" Text="20201010A000/1"/><LineBreak/> | ||||
|             von <Run x:Name="TextMember" FontWeight="Bold" Text="Max Mustermann"/><LineBreak/> | ||||
|             mit <Run x:Name="TextWeight" FontWeight="Bold" Text="1 000 kg"/> soll abgewertet werden? | ||||
|         </TextBlock> | ||||
|  | ||||
|         <Label Content="Gewicht:" Margin="10,70,10,10"/> | ||||
|         <Grid Grid.Column="1" Width="70" Height="25" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"> | ||||
|             <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2" | ||||
|                      TextChanged="WeightInput_TextChanged"/> | ||||
|             <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/> | ||||
|         </Grid> | ||||
|  | ||||
|         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False" IsDefault="True" | ||||
|                 Click="ConfirmButton_Click"/> | ||||
|         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/> | ||||
|     </Grid> | ||||
| </Window> | ||||
| @@ -1,33 +0,0 @@ | ||||
| using Elwig.Helpers; | ||||
| using System.Windows; | ||||
| using System.Windows.Controls; | ||||
|  | ||||
| namespace Elwig.Dialogs { | ||||
|     public partial class AbwertenDialog : Window { | ||||
|  | ||||
|         public int Weight; | ||||
|  | ||||
|         public AbwertenDialog(string lsnr, string name, int weight) { | ||||
|             Weight = weight; | ||||
|             InitializeComponent(); | ||||
|             TextLsNr.Text = lsnr; | ||||
|             TextMember.Text = name; | ||||
|             TextWeight.Text = $"{weight:N0}{Utils.UnitSeparator}kg"; | ||||
|         } | ||||
|  | ||||
|         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             DialogResult = true; | ||||
|             Weight = int.Parse(WeightInput.Text); | ||||
|             Close(); | ||||
|         } | ||||
|  | ||||
|         private void UpdateButtons() { | ||||
|             ConfirmButton.IsEnabled = int.TryParse(WeightInput.Text, out var w) && w > 0 && w <= Weight; | ||||
|         } | ||||
|  | ||||
|         private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||
|             Validator.CheckInteger(WeightInput, true, 5); | ||||
|             UpdateButtons(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -57,8 +57,8 @@ | ||||
|                   Checked="CheckBox_Changed" Unchecked="CheckBox_Changed" | ||||
|                   IsChecked="{Binding DeletePaymentData}"/> | ||||
|  | ||||
|         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False" | ||||
|         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" IsEnabled="False" | ||||
|                 Click="ConfirmButton_Click"/> | ||||
|         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/> | ||||
|         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True"/> | ||||
|     </Grid> | ||||
| </Window> | ||||
|   | ||||
| @@ -1,57 +0,0 @@ | ||||
| <Window x:Class="Elwig.Dialogs.DeliveryExtractionDialog" | ||||
|         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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||||
|         xmlns:local="clr-namespace:Elwig.Dialogs" | ||||
|         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||
|         WindowStartupLocation="CenterOwner" | ||||
|         FocusManager.FocusedElement="{Binding ElementName=WeightInput}" | ||||
|         Title="Teillieferung extrahieren" Height="210" Width="380"> | ||||
|     <Window.Resources> | ||||
|         <Style TargetType="Label"> | ||||
|             <Setter Property="HorizontalAlignment" Value="Left"/> | ||||
|             <Setter Property="VerticalAlignment" Value="Top"/> | ||||
|             <Setter Property="Padding" Value="2,4,2,4"/> | ||||
|             <Setter Property="Height" Value="25"/> | ||||
|         </Style> | ||||
|         <Style TargetType="TextBox"> | ||||
|             <Setter Property="HorizontalAlignment" Value="Stretch"/> | ||||
|             <Setter Property="VerticalAlignment" Value="Top"/> | ||||
|             <Setter Property="FontSize" Value="14"/> | ||||
|             <Setter Property="Padding" Value="2"/> | ||||
|             <Setter Property="Height" Value="25"/> | ||||
|             <Setter Property="TextWrapping" Value="NoWrap"/> | ||||
|         </Style> | ||||
|         <Style TargetType="Button"> | ||||
|             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||
|             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||
|             <Setter Property="Width" Value="100"/> | ||||
|             <Setter Property="Height" Value="25"/> | ||||
|         </Style> | ||||
|     </Window.Resources> | ||||
|     <Grid> | ||||
|         <Grid.ColumnDefinitions> | ||||
|             <ColumnDefinition Width="200"/> | ||||
|             <ColumnDefinition/> | ||||
|         </Grid.ColumnDefinitions> | ||||
|  | ||||
|         <TextBlock Margin="10,10,0,10" TextWrapping="Wrap"> | ||||
|             Was soll mit der Teillieferung <Run x:Name="TextLsNr" FontWeight="Bold" Text="20201010A000/1"/><LineBreak/> | ||||
|             von <Run x:Name="TextMember" FontWeight="Bold" Text="Max Mustermann"/> geschehen? | ||||
|         </TextBlock> | ||||
|         <RadioButton x:Name="NewDeliveryButton" Content="Neue Lieferung erstellen" | ||||
|                      Margin="10,80,0,10" HorizontalAlignment="Left" VerticalAlignment="Top" | ||||
|                      Checked="Selection_Changed" Unchecked="Selection_Changed"/> | ||||
|         <RadioButton x:Name="AddToDeliveryButton" Content="Zu Lieferung hinzufügen" | ||||
|                      Margin="10,100,0,10" HorizontalAlignment="Left" VerticalAlignment="Top" | ||||
|                      Checked="Selection_Changed" Unchecked="Selection_Changed"/> | ||||
|  | ||||
|         <ListBox x:Name="DeliveryList" Grid.Column="1" Margin="10,10,10,45" | ||||
|                  SelectionChanged="DeliveryList_SelectionChanged"/> | ||||
|  | ||||
|         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.ColumnSpan="2" IsEnabled="False" IsDefault="True" | ||||
|                 Click="ConfirmButton_Click"/> | ||||
|         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.ColumnSpan="2" IsCancel="True"/> | ||||
|     </Grid> | ||||
| </Window> | ||||
| @@ -1,37 +0,0 @@ | ||||
| using System.Collections.Generic; | ||||
| using System.Windows; | ||||
|  | ||||
| namespace Elwig.Dialogs { | ||||
|     public partial class DeliveryExtractionDialog : Window { | ||||
|  | ||||
|         public string? AddTo; | ||||
|  | ||||
|         public DeliveryExtractionDialog(string lsnr, string name, bool single, IEnumerable<string> lsnrs) { | ||||
|             InitializeComponent(); | ||||
|             TextLsNr.Text = lsnr; | ||||
|             TextMember.Text = name; | ||||
|             NewDeliveryButton.IsEnabled = !single; | ||||
|             DeliveryList.IsEnabled = false; | ||||
|             DeliveryList.ItemsSource = lsnrs; | ||||
|         } | ||||
|  | ||||
|         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             DialogResult = true; | ||||
|             AddTo = NewDeliveryButton.IsChecked == true ? "new" : DeliveryList.SelectedItem as string; | ||||
|             Close(); | ||||
|         } | ||||
|  | ||||
|         private void UpdateButtons() { | ||||
|             ConfirmButton.IsEnabled = NewDeliveryButton.IsChecked == true || (AddToDeliveryButton.IsChecked == true && DeliveryList.SelectedItem != null); | ||||
|             DeliveryList.IsEnabled = AddToDeliveryButton.IsChecked == true; | ||||
|         } | ||||
|  | ||||
|         private void Selection_Changed(object sender, RoutedEventArgs evt) { | ||||
|             UpdateButtons(); | ||||
|         } | ||||
|  | ||||
|         private void DeliveryList_SelectionChanged(object sender, RoutedEventArgs evt) { | ||||
|             UpdateButtons(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
							
								
								
									
										104
									
								
								Elwig/Dialogs/DeliverySplittingDialog.xaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										104
									
								
								Elwig/Dialogs/DeliverySplittingDialog.xaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,104 @@ | ||||
| <local:ContextWindow | ||||
|         x:Class="Elwig.Dialogs.DeliverySplittingDialog" | ||||
|         AutomationProperties.AutomationId="DeliverySplittingDialog" | ||||
|         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" | ||||
|         xmlns:ctrl="clr-namespace:Elwig.Controls" | ||||
|         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True" | ||||
|         WindowStartupLocation="CenterOwner" | ||||
|         DataContext="{Binding RelativeSource={RelativeSource Self}}" | ||||
|         Title="Lieferung abwerten oder aufteilen" Height="400" Width="600"> | ||||
|     <Window.Resources> | ||||
|         <Style TargetType="Button"> | ||||
|             <Setter Property="HorizontalAlignment" Value="Right"/> | ||||
|             <Setter Property="VerticalAlignment" Value="Bottom"/> | ||||
|             <Setter Property="Width" Value="100"/> | ||||
|             <Setter Property="Height" Value="25"/> | ||||
|         </Style> | ||||
|     </Window.Resources> | ||||
|     <Grid> | ||||
|  | ||||
|         <RadioButton x:Name="DepreciateModeInput" GroupName="ModeInput" Content="Abwerten" Margin="15,10,10,10" IsChecked="True" | ||||
|                      VerticalAlignment="Top" HorizontalAlignment="Left" | ||||
|                      Checked="ModeInput_Changed"/> | ||||
|         <RadioButton x:Name="MemberModeInput" GroupName="ModeInput" Content="Auf Mitglied übertragen" Margin="15,30,10,10" | ||||
|                      VerticalAlignment="Top" HorizontalAlignment="Left" | ||||
|                      Checked="ModeInput_Changed"/> | ||||
|         <RadioButton x:Name="DeliveryModeInput" GroupName="ModeInput" Content="Zu anderer Lieferung hinzufügen" Margin="15,50,10,10" | ||||
|                      VerticalAlignment="Top" HorizontalAlignment="Left" | ||||
|                      Checked="ModeInput_Changed"/> | ||||
|  | ||||
|         <TextBox x:Name="MgNrInput" FontSize="14" Padding="2" Visibility="Hidden" | ||||
|                  Width="48" Margin="220,10,0,0" Height="25" TextAlignment="Right" | ||||
|                  TextChanged="MgNrInput_TextChanged" | ||||
|                  VerticalAlignment="Top" HorizontalAlignment="Left"/> | ||||
|         <ComboBox x:Name="MemberInput" FontSize="14" Visibility="Hidden" | ||||
|                   Margin="273,10,40,10" IsEditable="True" Height="25" | ||||
|                   ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName" | ||||
|                   SelectionChanged="MemberInput_SelectionChanged" | ||||
|                   VerticalAlignment="Top" HorizontalAlignment="Stretch"/> | ||||
|         <Button x:Name="MemberReferenceButton" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="" Padding="0" | ||||
|                 Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen" FontSize="14" Visibility="Hidden" | ||||
|                 Click="MemberReferenceButton_Click"/> | ||||
|  | ||||
|         <ComboBox x:Name="DeliveryInput" FontSize="14" Visibility="Hidden" | ||||
|                   Margin="220,10,10,10" Height="25" | ||||
|                   TextSearch.TextPath="LsNr" | ||||
|                   SelectionChanged="DeliveryInput_SelectionChanged" | ||||
|                   VerticalAlignment="Top" HorizontalAlignment="Stretch"> | ||||
|             <ComboBox.ItemTemplate> | ||||
|                 <DataTemplate> | ||||
|                     <StackPanel Orientation="Horizontal"> | ||||
|                         <TextBlock Text="{Binding LsNr}" Width="100"/> | ||||
|                         <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="80" TextAlignment="Right" Margin="0,0,10,0"/> | ||||
|                         <TextBlock Text="{Binding Member.AdministrativeName}"/> | ||||
|                     </StackPanel> | ||||
|                 </DataTemplate> | ||||
|             </ComboBox.ItemTemplate> | ||||
|         </ComboBox> | ||||
|  | ||||
|         <TextBlock x:Name="InfoBlock" Margin="230,45,10,10" FontSize="14" TextAlignment="Right" | ||||
|                    VerticalAlignment="Top" HorizontalAlignment="Stretch" | ||||
|                    Text="Insgesamt 0 kg / 0 kg ausgewählt."/> | ||||
|  | ||||
|         <ListBox x:Name="DeliveryPartList" Margin="10,75,10,40" ItemsSource="{Binding DeliveryParts, Mode=TwoWay}"> | ||||
|             <ListBox.ItemContainerStyle> | ||||
|                 <Style TargetType="{x:Type ListBoxItem}"> | ||||
|                     <Setter Property="Focusable" Value="False"/> | ||||
|                 </Style> | ||||
|             </ListBox.ItemContainerStyle> | ||||
|             <ListBox.ItemTemplate> | ||||
|                 <DataTemplate> | ||||
|                     <StackPanel Orientation="Horizontal"> | ||||
|                         <TextBlock Text="{Binding Part.DPNr}" Width="20" TextAlignment="Right" | ||||
|                                    VerticalAlignment="Center"  Margin="0,0,5,0" FontSize="14"/> | ||||
|                         <TextBlock Text="{Binding Part.SortId}" Width="40" TextAlignment="Center" | ||||
|                                    VerticalAlignment="Center" Margin="0,0,0,0" FontSize="14"/> | ||||
|                         <TextBlock Text="{Binding Part.Kmw, StringFormat='{}{0:N1}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0" | ||||
|                                    VerticalAlignment="Center"/> | ||||
|                         <TextBlock Text="{Binding Part.QualId}" Width="30" | ||||
|                                    VerticalAlignment="Center"/> | ||||
|                         <TextBlock Text="{Binding Part.Weight, StringFormat='{}{0:N0} kg'}" Width="70" TextAlignment="Right" | ||||
|                                    VerticalAlignment="Center" Margin="0,0,10,0" FontSize="14"/> | ||||
|                         <TextBlock Text="{Binding Part.Attribute.Name}" Width="60" | ||||
|                                    VerticalAlignment="Center"/> | ||||
|                         <TextBlock Text="{Binding Part.Cultivation.Name}" Width="50" | ||||
|                                    VerticalAlignment="Center"/> | ||||
|                         <CheckBox IsChecked="{Binding SplitCompletely, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="Vollständig" Tag="{Binding Part.DPNr}" | ||||
|                                   VerticalAlignment="Center" Margin="20,0,5,0" | ||||
|                                   Checked="SplitCompletelyInput_Changed" Unchecked="SplitCompletelyInput_Changed"/> | ||||
|                         <ctrl:UnitTextBox Text="{Binding SplitWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Unit="kg" Width="70" Height="25" IsEnabled="{Binding SplitWeightEnabled}" Tag="{Binding Part.DPNr}" | ||||
|                                           VerticalAlignment="Center" Margin="5,0,5,0" FontSize="14" Padding="2" Background="White" | ||||
|                                           TextChanged="SplitWeightInput_TextChanged"/> | ||||
|                     </StackPanel> | ||||
|                 </DataTemplate> | ||||
|             </ListBox.ItemTemplate> | ||||
|         </ListBox> | ||||
|  | ||||
|         <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" IsEnabled="False" | ||||
|                 Click="ConfirmButton_Click"/> | ||||
|         <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True"/> | ||||
|     </Grid> | ||||
| </local:ContextWindow> | ||||
							
								
								
									
										163
									
								
								Elwig/Dialogs/DeliverySplittingDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										163
									
								
								Elwig/Dialogs/DeliverySplittingDialog.xaml.cs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,163 @@ | ||||
| using Elwig.Helpers; | ||||
| using Elwig.Models.Entities; | ||||
| using Elwig.Windows; | ||||
| using Microsoft.EntityFrameworkCore; | ||||
| using System; | ||||
| using System.Collections.ObjectModel; | ||||
| using System.Linq; | ||||
| using System.Threading.Tasks; | ||||
| using System.Windows; | ||||
| using System.Windows.Controls; | ||||
| using System.Windows.Data; | ||||
|  | ||||
| namespace Elwig.Dialogs { | ||||
|     public partial class DeliverySplittingDialog : ContextWindow { | ||||
|  | ||||
|         public class Row { | ||||
|             public DeliveryPart Part { get; set; } | ||||
|             public bool SplitCompletely { get; set; } | ||||
|             public string? SplitWeightString { get; set; } | ||||
|             public int? SplitWeight { | ||||
|                 get => int.TryParse(SplitWeightString, out var v) ? v : null; | ||||
|                 set => SplitWeightString = $"{value}"; | ||||
|             } | ||||
|             public bool SplitWeightEnabled { get; set; } | ||||
|         } | ||||
|  | ||||
|         private readonly Delivery _delivery; | ||||
|  | ||||
|         public int? MgNr { get; set; } | ||||
|         public string? LsNr { get; set; } | ||||
|         public int[]? Weights => DeliveryParts.Select(r => r.SplitCompletely ? r.Part.Weight : r.SplitWeight ?? 0).ToArray(); | ||||
|  | ||||
|         public ObservableCollection<Row> DeliveryParts { get; set; } | ||||
|  | ||||
|         public DeliverySplittingDialog(Delivery d) { | ||||
|             _delivery = d; | ||||
|             DeliveryParts = new(d.Parts.Select(p => new Row { | ||||
|                 Part = p, | ||||
|                 SplitCompletely = false, | ||||
|                 SplitWeight = null, | ||||
|                 SplitWeightEnabled = true, | ||||
|             }).ToList()); | ||||
|             InitializeComponent(); | ||||
|         } | ||||
|  | ||||
|         protected override async Task OnRenewContext(AppDbContext ctx) { | ||||
|             ControlUtils.RenewItemsSource(MemberInput, await ctx.Members | ||||
|                 .Where(m => m.IsActive) | ||||
|                 .OrderBy(m => m.Name) | ||||
|                 .ThenBy(m => m.GivenName) | ||||
|                 .ToListAsync()); | ||||
|             ControlUtils.RenewItemsSource(DeliveryInput, await ctx.Deliveries | ||||
|                 .Where(d => d.DateString == $"{_delivery.Date:yyyy-MM-dd}" && d.ZwstId == _delivery.ZwstId) | ||||
|                 .OrderBy(d => d.LsNr) | ||||
|                 .Include(d => d.Member) | ||||
|                 .Include(d => d.Parts) | ||||
|                 .ToListAsync()); | ||||
|             if (DeliveryInput.SelectedItem == null) | ||||
|                 ControlUtils.SelectItem(DeliveryInput, _delivery); | ||||
|             CheckValidity(); | ||||
|         } | ||||
|  | ||||
|         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (DepreciateModeInput.IsChecked == true) { | ||||
|                 MgNr = null; | ||||
|                 LsNr = null; | ||||
|             } else if (MemberModeInput.IsChecked == true) { | ||||
|                 MgNr = ((Member)MemberInput.SelectedItem).MgNr; | ||||
|                 LsNr = null; | ||||
|             } else if (DeliveryModeInput.IsChecked == true) { | ||||
|                 MgNr = null; | ||||
|                 LsNr = ((Delivery)DeliveryInput.SelectedItem).LsNr; | ||||
|             } | ||||
|             DialogResult = true; | ||||
|             Close(); | ||||
|         } | ||||
|  | ||||
|         private void ModeInput_Changed(object sender, RoutedEventArgs evt) { | ||||
|             if (!IsLoaded) return; | ||||
|             CheckValidity(); | ||||
|             if (DepreciateModeInput.IsChecked == true) { | ||||
|                 MgNrInput.Visibility = Visibility.Hidden; | ||||
|                 MemberInput.Visibility = Visibility.Hidden; | ||||
|                 MemberReferenceButton.Visibility = Visibility.Hidden; | ||||
|                 DeliveryInput.Visibility = Visibility.Hidden; | ||||
|             } else if (MemberModeInput.IsChecked == true) { | ||||
|                 MgNrInput.Visibility = Visibility.Visible; | ||||
|                 MemberInput.Visibility = Visibility.Visible; | ||||
|                 MemberReferenceButton.Visibility = Visibility.Visible; | ||||
|                 DeliveryInput.Visibility = Visibility.Hidden; | ||||
|             } else if (DeliveryModeInput.IsChecked == true) { | ||||
|                 MgNrInput.Visibility = Visibility.Hidden; | ||||
|                 MemberInput.Visibility = Visibility.Hidden; | ||||
|                 MemberReferenceButton.Visibility = Visibility.Hidden; | ||||
|                 DeliveryInput.Visibility = Visibility.Visible; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private void CheckValidity() { | ||||
|             var weight = DeliveryParts.Sum(r => r.SplitCompletely ? r.Part.Weight : r.SplitWeight ?? 0); | ||||
|             var total = DeliveryParts.Sum(r => r.Part.Weight); | ||||
|             InfoBlock.Text = $"Insgesamt {weight:N0} kg / {total:N0} kg ausgewählt."; | ||||
|             ConfirmButton.IsEnabled = DeliveryParts.Any(r => r.SplitCompletely || r.SplitWeight > 0) && ( | ||||
|                 DepreciateModeInput.IsChecked == true || | ||||
|                 (MemberModeInput.IsChecked == true && MemberInput.SelectedItem != null && !DeliveryParts.All(r => r.SplitCompletely)) || | ||||
|                 (DeliveryModeInput.IsChecked == true && DeliveryInput.SelectedItem != null)); | ||||
|         } | ||||
|  | ||||
|         private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||
|             var res = Validator.CheckMgNr((TextBox)sender, true); | ||||
|             var text = MgNrInput.Text; | ||||
|             var caret = MgNrInput.CaretIndex; | ||||
|             ControlUtils.SelectItemWithPk(MemberInput, res.IsValid ? int.Parse(MgNrInput.Text) : null); | ||||
|             MgNrInput.Text = text; | ||||
|             MgNrInput.CaretIndex = caret; | ||||
|         } | ||||
|  | ||||
|         private void MemberInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) { | ||||
|             var m = MemberInput.SelectedItem as Member; | ||||
|             MgNrInput.Text = m?.MgNr.ToString(); | ||||
|             CheckValidity(); | ||||
|         } | ||||
|  | ||||
|         private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (MemberInput.SelectedItem is not Member m) return; | ||||
|             App.FocusMember(m.MgNr); | ||||
|         } | ||||
|  | ||||
|         private void DeliveryInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) { | ||||
|             CheckValidity(); | ||||
|         } | ||||
|  | ||||
|         private void SplitCompletelyInput_Changed(object sender, RoutedEventArgs evt) { | ||||
|             var checkbox = (CheckBox)sender; | ||||
|             var dpnr = int.Parse(checkbox.Tag.ToString()!); | ||||
|             var row = DeliveryParts.First(d => d.Part.DPNr == dpnr); | ||||
|             if (checkbox.IsChecked == true) { | ||||
|                 row.SplitWeightEnabled = false; | ||||
|                 row.SplitWeight = row.Part.Weight; | ||||
|             } else if (checkbox.IsChecked == false) { | ||||
|                 row.SplitWeightEnabled = true; | ||||
|                 row.SplitWeight = null; | ||||
|             } | ||||
|             CollectionViewSource.GetDefaultView(DeliveryParts).Refresh(); | ||||
|             CheckValidity(); | ||||
|         } | ||||
|  | ||||
|         private void SplitWeightInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||
|             var textbox = (TextBox)sender; | ||||
|             Validator.CheckInteger(textbox, false, 6); | ||||
|             var dpnr = int.Parse(textbox.Tag.ToString()!); | ||||
|             var row = DeliveryParts.First(d => d.Part.DPNr == dpnr); | ||||
|             var w = int.TryParse(textbox.Text, out var v) ? v : (int?)null; | ||||
|             if (w >= row.Part.Weight) { | ||||
|                 row.SplitCompletely = true; | ||||
|                 row.SplitWeightEnabled = false; | ||||
|                 row.SplitWeight = row.Part.Weight; | ||||
|                 CollectionViewSource.GetDefaultView(DeliveryParts).Refresh(); | ||||
|             } | ||||
|             CheckValidity(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -81,11 +81,11 @@ namespace Elwig.Documents { | ||||
|         } | ||||
|  | ||||
|         private static string FormatRow( | ||||
|             int obligation, int right, int delivery, int? payment = null, int? area = null, | ||||
|             int obligation, int right, int delivery, int? totalDelivery = null, int? payment = null, int? area = null, | ||||
|             bool isGa = false, bool showPayment = false, bool showArea = false | ||||
|         ) { | ||||
|             totalDelivery ??= delivery; | ||||
|             payment ??= delivery; | ||||
|             var baseline = showPayment ? payment : delivery; | ||||
|  | ||||
|             if (showArea) { | ||||
|                 return $"<td>{(area == null ? "" : $"{area:N0}")}</td>" + | ||||
| @@ -95,15 +95,15 @@ namespace Elwig.Documents { | ||||
|  | ||||
|             return $"<td>{(obligation == 0 ? "-" : $"{obligation:N0}")}</td>" + | ||||
|                 $"<td>{(right == 0 ? "-" : $"{right:N0}")}</td>" + | ||||
|                 $"<td>{(baseline < obligation ? $"<b>{obligation - baseline:N0}</b>" : "-")}</td>" + | ||||
|                 $"<td>{(baseline >= obligation && delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" + | ||||
|                 $"<td>{(totalDelivery < obligation ? $"<b>{obligation - totalDelivery:N0}</b>" : "-")}</td>" + | ||||
|                 $"<td>{(delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" + | ||||
|                 $"<td>{(obligation == 0 && right == 0 ? "-" : (delivery > right ? ((isGa ? "<b>" : "") + $"{delivery - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" + | ||||
|                 (showPayment ? $"<td>{(isGa ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" : "") + | ||||
|                 $"<td>{delivery:N0}</td>"; | ||||
|                 $"<td>{totalDelivery:N0}</td>"; | ||||
|         } | ||||
|  | ||||
|         private static string FormatRow(MemberBucket bucket, bool isGa = false, bool showPayment = false, bool showArea = false) { | ||||
|             return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.Payment, bucket.Area, isGa, showPayment, showArea); | ||||
|             return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.DeliveryTotal, bucket.Payment, bucket.Area, isGa, showPayment, showArea); | ||||
|         } | ||||
|  | ||||
|         public string PrintBucketTable( | ||||
|   | ||||
| @@ -153,7 +153,7 @@ namespace Elwig.Documents { | ||||
|  | ||||
|         public async Task Print(int copies = 1) { | ||||
|             if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet"); | ||||
|             await Pdf.Print(PdfPath, copies); | ||||
|             await Pdf.Print(PdfPath, copies, DoublePaged); | ||||
|         } | ||||
|  | ||||
|         public void Show() { | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <UseWPF>true</UseWPF> | ||||
|     <PreserveCompilationContext>true</PreserveCompilationContext> | ||||
|     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon> | ||||
|     <Version>0.11.3</Version> | ||||
|     <Version>0.13.1</Version> | ||||
|     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages> | ||||
|     <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||||
|     <ApplicationManifest>app.manifest</ApplicationManifest> | ||||
| @@ -25,15 +25,17 @@ | ||||
|   </Target> | ||||
|  | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" /> | ||||
|     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" /> | ||||
|     <PackageReference Include="LinqKit" Version="1.3.0" /> | ||||
|     <PackageReference Include="MailKit" Version="4.7.1.1" /> | ||||
|     <PackageReference Include="MailKit" Version="4.8.0" /> | ||||
|     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.33" /> | ||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.8" /> | ||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" /> | ||||
|     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" /> | ||||
|     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" /> | ||||
|     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" /> | ||||
|     <PackageReference Include="NJsonSchema" Version="11.0.2" /> | ||||
|     <PackageReference Include="PdfiumViewer" Version="2.13.0" /> | ||||
|     <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" /> | ||||
|     <PackageReference Include="RazorLight" Version="2.3.1" /> | ||||
|     <PackageReference Include="ScottPlot.WPF" Version="5.0.39" /> | ||||
|     <PackageReference Include="System.IO.Ports" Version="8.0.0" /> | ||||
|   | ||||
| @@ -17,7 +17,7 @@ namespace Elwig.Helpers { | ||||
|  | ||||
|     public record struct AreaComBucket(int Area, int Obligation, int Right); | ||||
|     public record struct UnderDelivery(int Weight, int Diff); | ||||
|     public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment); | ||||
|     public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int DeliveryTotal, int Payment); | ||||
|     public record struct MemberStat(string Variety, string Discr, int Weight); | ||||
|     public record struct ModifierStat(string ModId, string Name, int Count, decimal? Min, decimal? Max, decimal Sum); | ||||
|  | ||||
| @@ -78,7 +78,7 @@ namespace Elwig.Helpers { | ||||
|         public bool HasBackendChanged => SavedLastWriteTime != LastWriteTime; | ||||
|  | ||||
|         public static string? ConnectionStringOverride { get; set; } = null; | ||||
|         public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default"; | ||||
|         public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default; Pooling=False"; | ||||
|  | ||||
|         private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaComBucket>>> _memberAreaCommitmentBuckets = []; | ||||
|         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = []; | ||||
| @@ -203,10 +203,10 @@ namespace Elwig.Helpers { | ||||
|             return c + 1; | ||||
|         } | ||||
|  | ||||
|         public async Task<int> NextLNr(DateOnly date) { | ||||
|         public async Task<int> NextLNr(DateOnly date, string zwstid) { | ||||
|             var dateStr = date.ToString("yyyy-MM-dd"); | ||||
|             int c = 0; | ||||
|             (await Deliveries.Where(d => d.DateString == dateStr).Select(d => d.LNr).ToListAsync()) | ||||
|             (await Deliveries.Where(d => d.DateString == dateStr && d.ZwstId == zwstid).Select(d => d.LNr).ToListAsync()) | ||||
|                 .ForEach(a => { if (a <= c + 100) c = a; }); | ||||
|             return c + 1; | ||||
|         } | ||||
| @@ -442,6 +442,7 @@ namespace Elwig.Helpers { | ||||
|                     rightsAndObligations.GetValueOrDefault(id).Right, | ||||
|                     deliveryBuckets.GetValueOrDefault(id), | ||||
|                     deliveryBucketsStrict.GetValueOrDefault(id), | ||||
|                     deliveryBuckets.GetValueOrDefault(id) + deliveryBuckets.GetValueOrDefault(id + "_"), | ||||
|                     paymentBuckets.GetValueOrDefault(id) | ||||
|                 ); | ||||
|             } | ||||
|   | ||||
| @@ -9,7 +9,7 @@ namespace Elwig.Helpers { | ||||
|     public static class AppDbUpdater { | ||||
|  | ||||
|         // Don't forget to update value in Tests/fetch-resources.bat! | ||||
|         public static readonly int RequiredSchemaVersion = 30; | ||||
|         public static readonly int RequiredSchemaVersion = 31; | ||||
|  | ||||
|         private static int VersionOffset = 0; | ||||
|  | ||||
|   | ||||
| @@ -8,16 +8,12 @@ using System.Windows; | ||||
| using System.Text.RegularExpressions; | ||||
| using System.Linq; | ||||
| using System.Net.Sockets; | ||||
| using System.Text; | ||||
| using PdfiumViewer; | ||||
| using System.Drawing.Printing; | ||||
|  | ||||
| namespace Elwig.Helpers.Printing { | ||||
|     public static class Pdf { | ||||
|  | ||||
|         private static readonly string PdfToPrinter = new string[] { App.ExePath } | ||||
|             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? []) | ||||
|             .Select(x => Path.Combine(x, "PDFtoPrinter.exe")) | ||||
|             .Where(File.Exists) | ||||
|             .FirstOrDefault() ?? throw new FileNotFoundException("PDFtoPrinter executable not found"); | ||||
|         private static readonly string WinziPrint = new string[] { App.ExePath } | ||||
|             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? []) | ||||
|             .Select(x => Path.Combine(x, "WinziPrint.exe")) | ||||
| @@ -92,21 +88,24 @@ namespace Elwig.Helpers.Printing { | ||||
|             }); | ||||
|         } | ||||
|  | ||||
|         public static async Task Print(string path, int copies = 1) { | ||||
|             try { | ||||
|                 var p = new Process() { StartInfo = new() { | ||||
|                     FileName = PdfToPrinter, | ||||
|                     CreateNoWindow = true, | ||||
|                     UseShellExecute = false, | ||||
|                 } }; | ||||
|                 p.StartInfo.ArgumentList.Add(path); | ||||
|                 p.StartInfo.ArgumentList.Add("/s"); | ||||
|                 p.StartInfo.ArgumentList.Add($"copies={copies}"); | ||||
|                 p.Start(); | ||||
|                 await p.WaitForExitAsync(); | ||||
|             } catch (Exception e) { | ||||
|                 MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken"); | ||||
|         public static async Task Print(string path, int copies = 1, bool doublePaged = false) { | ||||
|             await Print(path, new() { | ||||
|                 Copies = (short)copies, | ||||
|                 Collate = true, | ||||
|                 Duplex = doublePaged ? Duplex.Vertical : Duplex.Simplex, | ||||
|             }); | ||||
|         } | ||||
|  | ||||
|         public static Task Print(string path, PrinterSettings settings) { | ||||
|             try { | ||||
|                 using var doc = PdfDocument.Load(path); | ||||
|                 using var printDoc = doc.CreatePrintDocument(PdfPrintMode.CutMargin); | ||||
|                 printDoc.PrinterSettings = settings; | ||||
|                 printDoc.Print(); | ||||
|             } catch (Exception e) { | ||||
|                 MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|             } | ||||
|             return Task.CompletedTask; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -267,9 +267,9 @@ namespace Elwig.Helpers { | ||||
|             return d.ShowDialog() == true ? (d.Weight, d.Reason) : null; | ||||
|         } | ||||
|  | ||||
|         public static int? ShowAbwertenDialog(string lsnr, string name, int weight) { | ||||
|             var d = new AbwertenDialog(lsnr, name, weight); | ||||
|             return d.ShowDialog() == true ? d.Weight : null; | ||||
|         public static (string?, int[])? ShowDeliverySplittingDialog(Delivery delivery) { | ||||
|             var d = new DeliverySplittingDialog(delivery); | ||||
|             return d.ShowDialog() == true ? (d.MgNr?.ToString() ?? d.LsNr, d.Weights ?? []) : null; | ||||
|         } | ||||
|  | ||||
|         public static double? ShowLinearPriceIncreaseDialog() { | ||||
| @@ -277,11 +277,6 @@ namespace Elwig.Helpers { | ||||
|             return d.ShowDialog() == true ? d.Price : null; | ||||
|         } | ||||
|  | ||||
|         public static string? ShowDeliveryExtractionDialog(string lsnr, string name, bool single, IEnumerable<string> lsnrs) { | ||||
|             var d = new DeliveryExtractionDialog(lsnr, name, single, lsnrs); | ||||
|             return d.ShowDialog() == true ? d.AddTo : null; | ||||
|         } | ||||
|  | ||||
|         public static Footer GenerateFooter(string lineBreak, string seperator) { | ||||
|             return new Footer(lineBreak, seperator); | ||||
|         } | ||||
|   | ||||
							
								
								
									
										14
									
								
								Elwig/Resources/Sql/30-31.sql
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								Elwig/Resources/Sql/30-31.sql
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| -- schema version 30 to 31 | ||||
|  | ||||
| PRAGMA writable_schema = ON; | ||||
|  | ||||
| DROP VIEW v_under_delivery_bucket_strict; | ||||
| CREATE VIEW v_under_delivery_bucket_strict AS | ||||
| SELECT c.year, c.mgnr, c.bucket, c.min_kg, SUM(COALESCE(p.weight, 0)) AS weight | ||||
| FROM v_area_commitment_bucket_strict c | ||||
|     LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket) OR (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket || '_') | ||||
| GROUP BY c.year, c.mgnr, c.bucket | ||||
| ORDER BY c.year, c.mgnr, c.bucket; | ||||
|  | ||||
| PRAGMA schema_version = 3001; | ||||
| PRAGMA writable_schema = OFF; | ||||
| @@ -242,8 +242,8 @@ namespace Elwig.Services { | ||||
|             AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true); | ||||
|             int rowNum = 1; | ||||
|             foreach (var row in data) { | ||||
|                 if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++; | ||||
|                 AddToolTipRow(grid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5); | ||||
|                 if (rowNum == 2) rowNum++; | ||||
|             } | ||||
|             return grid; | ||||
|         } | ||||
|   | ||||
| @@ -430,8 +430,9 @@ namespace Elwig.Services { | ||||
|         } | ||||
|  | ||||
|         public static async Task<DeliveryPart> UpdateDeliveryPart(this DeliveryAdminViewModel vm, int? oldYear, int? oldDid, int? oldDpnr, bool dateHasChanged, bool timeHasChanged, bool timeIsDefault) { | ||||
|             using var ctx = new AppDbContext(); | ||||
|             DeliveryPart p; | ||||
|  | ||||
|             using (var ctx = new AppDbContext()) { | ||||
|                 int year = oldYear ?? Utils.CurrentYear; | ||||
|                 int did = oldDid ?? await ctx.NextDId(year); | ||||
|                 int dpnr = oldDpnr ?? await ctx.NextDPNr(year, did); | ||||
| @@ -443,7 +444,7 @@ namespace Elwig.Services { | ||||
|                 var originalMemberKgNr = oldDelivery?.Member.DefaultKgNr; | ||||
|  | ||||
|                 var date = DateOnly.ParseExact(vm.Date!, "dd.MM.yyyy"); | ||||
|             int? newLnr = (deliveryNew || dateHasChanged) ? await ctx.NextLNr(date) : null; | ||||
|                 int? newLnr = (deliveryNew || dateHasChanged) ? await ctx.NextLNr(date, vm.Branch!.ZwstId) : null; | ||||
|                 string? newLsNr = (newLnr != null) ? Utils.GenerateLsNr(date, vm.Branch!.ZwstId, newLnr.Value) : null; | ||||
|  | ||||
|                 string? newTimeString = null; | ||||
| @@ -465,7 +466,7 @@ namespace Elwig.Services { | ||||
|                     Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment, | ||||
|                 }; | ||||
|  | ||||
|             var p = new DeliveryPart { | ||||
|                 p = new DeliveryPart { | ||||
|                     Year = year, | ||||
|                     DId = did, | ||||
|                     DPNr = dpnr, | ||||
| @@ -494,7 +495,6 @@ namespace Elwig.Services { | ||||
|                     WeighingReason = vm.ManualWeighingReason, | ||||
|                 }; | ||||
|  | ||||
|             try { | ||||
|                 if (oldDelivery != null && ctx.Entry(oldDelivery) is EntityEntry<Delivery> entry) { | ||||
|                     entry.State = EntityState.Detached; | ||||
|                 } | ||||
| @@ -524,15 +524,135 @@ namespace Elwig.Services { | ||||
|                 } | ||||
|  | ||||
|                 await ctx.SaveChangesAsync(); | ||||
|             } 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, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|             } | ||||
|  | ||||
|             App.HintContextChange(); | ||||
|  | ||||
|             return p; | ||||
|         } | ||||
|  | ||||
|         public static async Task<Delivery> SplitDeliveryToMember(int year, int did, int[] weights, int mgnr) { | ||||
|             Delivery n; | ||||
|  | ||||
|             using (var ctx = new AppDbContext()) { | ||||
|                 bool anyLeft = false; | ||||
|                 var d = (await ctx.Deliveries.FindAsync(year, did))!; | ||||
|                 var lnr = await ctx.NextLNr(d.Date, d.ZwstId); | ||||
|                 n = new Delivery { | ||||
|                     Year = year, | ||||
|                     DId = await ctx.NextDId(d.Year), | ||||
|                     DateString = d.DateString, | ||||
|                     TimeString = d.TimeString, | ||||
|                     ZwstId = d.ZwstId, | ||||
|                     LNr = lnr, | ||||
|                     LsNr = Utils.GenerateLsNr(d.Date, d.ZwstId, lnr), | ||||
|                     MgNr = mgnr, | ||||
|                     Comment = d.Comment, | ||||
|                 }; | ||||
|                 ctx.Add(n); | ||||
|                 await ctx.SaveChangesAsync(); | ||||
|  | ||||
|                 var dpnr = 1; | ||||
|                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) { | ||||
|                     if (w <= 0) { | ||||
|                         anyLeft = true; | ||||
|                         continue; | ||||
|                     } else if (w >= p.Weight) { | ||||
|                         await ctx.Database.ExecuteSqlAsync($"UPDATE delivery_part SET year = {n.Year}, did = {n.DId}, dpnr = {dpnr++} WHERE (year, did, dpnr) = ({p.Year}, {p.DId}, {p.DPNr})"); | ||||
|                     } else { | ||||
|                         anyLeft = true; | ||||
|                         p.Weight -= w; | ||||
|                         ctx.Update(p); | ||||
|                         var s = ctx.CreateProxy<DeliveryPart>(); | ||||
|                         var values = ctx.Entry(p).CurrentValues; | ||||
|                         ctx.Entry(s).CurrentValues.SetValues(values); | ||||
|                         s.Year = n.Year; | ||||
|                         s.DId = n.DId; | ||||
|                         s.DPNr = dpnr++; | ||||
|                         s.Weight = w; | ||||
|                         ctx.Add(s); | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                 await ctx.SaveChangesAsync(); | ||||
|                 if (!anyLeft) | ||||
|                     await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})"); | ||||
|             } | ||||
|  | ||||
|             App.HintContextChange(); | ||||
|  | ||||
|             return n; | ||||
|         } | ||||
|  | ||||
|         public static async Task<Delivery> SplitDeliveryToLsNr(int year, int did, int[] weights, string lsnr) { | ||||
|             Delivery n; | ||||
|  | ||||
|             using (var ctx = new AppDbContext()) { | ||||
|                 var anyLeft = false; | ||||
|                 n = (await ctx.Deliveries.FirstAsync(d => d.LsNr == lsnr))!; | ||||
|                 var d = (await ctx.Deliveries.FindAsync(year, did))!; | ||||
|                 var dpnr = await ctx.NextDPNr(n.Year, n.DId); | ||||
|                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) { | ||||
|                     if (w <= 0) { | ||||
|                         anyLeft = true; | ||||
|                         continue; | ||||
|                     } else if (w >= p.Weight) { | ||||
|                         await ctx.Database.ExecuteSqlAsync($"UPDATE delivery_part SET year = {n.Year}, did = {n.DId}, dpnr = {dpnr++} WHERE (year, did, dpnr) = ({p.Year}, {p.DId}, {p.DPNr})"); | ||||
|                     } else { | ||||
|                         anyLeft = true; | ||||
|                         p.Weight -= w; | ||||
|                         ctx.Update(p); | ||||
|                         var s = ctx.CreateProxy<DeliveryPart>(); | ||||
|                         var values = ctx.Entry(p).CurrentValues; | ||||
|                         ctx.Entry(s).CurrentValues.SetValues(values); | ||||
|                         s.Year = n.Year; | ||||
|                         s.DId = n.DId; | ||||
|                         s.DPNr = dpnr++; | ||||
|                         s.Weight = w; | ||||
|                         ctx.Add(s); | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                 await ctx.SaveChangesAsync(); | ||||
|                 if (!anyLeft && n.LsNr != d.LsNr) | ||||
|                     await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})"); | ||||
|             } | ||||
|  | ||||
|             App.HintContextChange(); | ||||
|  | ||||
|             return n; | ||||
|         } | ||||
|  | ||||
|         public static async Task DepreciateDelivery(int year, int did, int[] weights) { | ||||
|             using (var ctx = new AppDbContext()) { | ||||
|                 var d = (await ctx.Deliveries.FindAsync(year, did))!; | ||||
|                 var dpnr = await ctx.NextDPNr(year, did); | ||||
|                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) { | ||||
|                     if (w <= 0) { | ||||
|                         continue; | ||||
|                     } else if (w >= p.Weight) { | ||||
|                         p.QualId = "WEI"; | ||||
|                         p.HkId = "OEST"; | ||||
|                         ctx.Update(p); | ||||
|                     } else { | ||||
|                         p.Weight -= w; | ||||
|                         ctx.Update(p); | ||||
|                         var n = ctx.CreateProxy<DeliveryPart>(); | ||||
|                         var values = ctx.Entry(p).CurrentValues; | ||||
|                         ctx.Entry(n).CurrentValues.SetValues(values); | ||||
|                         n.DPNr = dpnr++; | ||||
|                         n.Weight = w; | ||||
|                         n.QualId = "WEI"; | ||||
|                         n.HkId = "OEST"; | ||||
|                         ctx.Add(n); | ||||
|                     } | ||||
|                 } | ||||
|                 await ctx.SaveChangesAsync(); | ||||
|             } | ||||
|  | ||||
|             App.HintContextChange(); | ||||
|         } | ||||
|  | ||||
|         public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) { | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             try { | ||||
| @@ -637,7 +757,7 @@ namespace Elwig.Services { | ||||
|                     } else { | ||||
|                         await ElwigData.Export(path, list, filterNames); | ||||
|                         await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); | ||||
|                         MessageBox.Show($"Hochladen von {list.Count} Lieferungen erfolgreich!", "Lieferungen hochgeladen", | ||||
|                         MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen", | ||||
|                             MessageBoxButton.OK, MessageBoxImage.Information); | ||||
|                     } | ||||
|                 } catch (HttpRequestException exc) { | ||||
| @@ -830,8 +950,8 @@ namespace Elwig.Services { | ||||
|             wGrid.ColumnDefinitions.Add(new() { Width = new(50) }); | ||||
|             int rowNum = 0; | ||||
|             foreach (var row in weightData) { | ||||
|                 if (rowNum == 1 || (rowNum != 0 && row.Item1 != null)) rowNum++; | ||||
|                 AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5); | ||||
|                 if (rowNum == 1) rowNum++; | ||||
|             } | ||||
|  | ||||
|             var gGrid = new Grid(); | ||||
| @@ -845,8 +965,8 @@ namespace Elwig.Services { | ||||
|             AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true); | ||||
|             rowNum = 1; | ||||
|             foreach (var row in gradationData) { | ||||
|                 if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++; | ||||
|                 AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5); | ||||
|                 if (rowNum == 2) rowNum++; | ||||
|             } | ||||
|  | ||||
|             return (wGrid, gGrid); | ||||
|   | ||||
| @@ -171,6 +171,9 @@ namespace Elwig.Services { | ||||
|                     .GroupBy(d => d.Year) | ||||
|                     .ToDictionaryAsync(g => g.Key, g => g.Any()); | ||||
|  | ||||
|                 if (m.MgNr != vm.MgNr) | ||||
|                     return; | ||||
|  | ||||
|                 await App.MainDispatcher.BeginInvoke(() => { | ||||
|                     var (d1Grid, _) = DeliveryService.GenerateToolTip(d1GridData, []); | ||||
|                     var (d2Grid, _) = DeliveryService.GenerateToolTip(d2GridData, []); | ||||
| @@ -496,7 +499,7 @@ namespace Elwig.Services { | ||||
|                     } else { | ||||
|                         await ElwigData.Export(path, members, areaComs, filterNames); | ||||
|                         await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); | ||||
|                         MessageBox.Show($"Hochladen von {members.Count} Mitgliedern erfolgreich!", "Mitglieder hochgeladen", | ||||
|                         MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen", | ||||
|                             MessageBoxButton.OK, MessageBoxImage.Information); | ||||
|                     } | ||||
|                 } catch (HttpRequestException exc) { | ||||
|   | ||||
| @@ -226,14 +226,22 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) { | ||||
|             int? fbnr = null; | ||||
|             AreaCommitmentSaveButton.IsEnabled = false; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|  | ||||
|             int fbnr; | ||||
|             try { | ||||
|                 fbnr = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr); | ||||
|             } 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, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 AreaCommitmentSaveButton.IsEnabled = true; | ||||
|                 return; | ||||
|             } finally { | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|  | ||||
|             IsEditing = false; | ||||
|             IsCreating = false; | ||||
|             AreaCommitmentList.IsEnabled = true; | ||||
|   | ||||
| @@ -6,6 +6,7 @@ using System.Linq; | ||||
| using System.Threading.Tasks; | ||||
| using System.Windows; | ||||
| using System.Windows.Controls; | ||||
| using System.Windows.Input; | ||||
|  | ||||
| namespace Elwig.Windows { | ||||
|     public partial class BaseDataWindow : AdministrationWindow { | ||||
| @@ -316,12 +317,19 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) { | ||||
|             SaveButton.IsEnabled = false; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|  | ||||
|             try { | ||||
|                 await Save(); | ||||
|             } 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, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 SaveButton.IsEnabled = true; | ||||
|                 return; | ||||
|             } finally { | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|  | ||||
|             IsEditing = false; | ||||
|   | ||||
| @@ -661,6 +661,9 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void SaveButton_Click(object sender, RoutedEventArgs e) { | ||||
|             SaveButton.IsEnabled = false; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|  | ||||
|             try { | ||||
|                 using (var ctx = new AppDbContext()) { | ||||
|                     var origData = BillingData.FromJson(PaymentVar.Data); | ||||
| @@ -677,7 +680,12 @@ namespace Elwig.Windows { | ||||
|                 var str = "Der Eintrag konnte nicht in der Datenbank gespeichert werden!\n\n" + exc.Message; | ||||
|                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message; | ||||
|                 MessageBox.Show(str, "Auszahlungsvariante speichern", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 SaveButton.IsEnabled = true; | ||||
|                 return; | ||||
|             } finally { | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|  | ||||
|             LockContext = true; | ||||
|             SetHasChanged(false); | ||||
|         } | ||||
|   | ||||
| @@ -274,10 +274,10 @@ | ||||
|                     <TextBlock FontWeight="Bold">Alt+Einfg</TextBlock> | ||||
|                 </Button.ToolTip> | ||||
|             </Button> | ||||
|             <Button x:Name="AbwertenButton" Content="Abwerten" IsEnabled="False"  | ||||
|                     ToolTip="Ausgewählte Teillieferung vollständig oder teilweise abwerten" | ||||
|             <Button x:Name="DepreciateButton" Content="Abwert./Aufteil." IsEnabled="False" | ||||
|                     ToolTip="Lieferung vollständig oder teilweise abwerten bzw. auf anderes Mitglied aufteilen" | ||||
|                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2" | ||||
|                     Click="AbwertenButton_Click"/> | ||||
|                     Click="DepreciateButton_Click"/> | ||||
|             <Button x:Name="EditDeliveryButton" Content="Bearbeiten" IsEnabled="False" | ||||
|                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2" | ||||
|                     Click="EditDeliveryButton_Click"> | ||||
| @@ -391,19 +391,14 @@ | ||||
|                              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" | ||||
|                     <ListBox x:Name="DeliveryPartList" Margin="5,135,5,5" Grid.ColumnSpan="2" | ||||
|                                 SelectionChanged="DeliveryPartList_SelectionChanged"> | ||||
|                         <ListBox.ItemTemplate> | ||||
|                             <DataTemplate> | ||||
|                                 <StackPanel Orientation="Horizontal"> | ||||
|                                         <TextBlock Text="{Binding DPNr}" Width="20"/> | ||||
|                                     <TextBlock Text="{Binding DPNr}" Width="13" TextAlignment="Right" Margin="0,0,7,0"/> | ||||
|                                     <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 Kmw, StringFormat='{}{0:N1}°'}" 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"/> | ||||
| @@ -412,15 +407,6 @@ | ||||
|                             </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> | ||||
|  | ||||
|   | ||||
| @@ -155,6 +155,10 @@ namespace Elwig.Windows { | ||||
|         private async void Menu_DeliveryNote_Email_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (DeliveryList.SelectedItem is not Delivery d) | ||||
|                 return; | ||||
|             var res = MessageBox.Show("Soll eine E-Mail verschickt werden?", "Lieferschein verschicken", | ||||
|                 MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes); | ||||
|             if (res != MessageBoxResult.Yes) | ||||
|                 return; | ||||
|             await DeliveryService.GenerateDeliveryNote(d.Year, d.DId, ExportMode.Email); | ||||
|         } | ||||
|  | ||||
| @@ -386,14 +390,14 @@ namespace Elwig.Windows { | ||||
|             await RefreshDeliveryParts(); | ||||
|  | ||||
|             var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList(); | ||||
|             ViewModel.StatusMembers = $"{members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : ""); | ||||
|             ViewModel.StatusDeliveries = $"{deliveries.Count}"; | ||||
|             ViewModel.StatusMembers = $"{members.Count:N0}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : ""); | ||||
|             ViewModel.StatusDeliveries = $"{deliveries.Count:N0}"; | ||||
|  | ||||
|             if (filter.Count == 0) { | ||||
|                 var deliveryParts = deliveryPartsQuery; | ||||
|                 ViewModel.StatusDeliveries = $"{deliveries.Count} ({await deliveryParts.CountAsync()})"; | ||||
|                 ViewModel.StatusDeliveries = $"{deliveries.Count:N0} ({await deliveryParts.CountAsync():N0})"; | ||||
|                 var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync(); | ||||
|                 ViewModel.StatusVarieties = $"{varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : ""); | ||||
|                 ViewModel.StatusVarieties = $"{varieties.Count:N0}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : ""); | ||||
|                 var (wText, wData, gText, gData) = await DeliveryService.GenerateToolTipData(deliveryParts); | ||||
|                 ViewModel.StatusWeight = wText; | ||||
|                 ViewModel.StatusGradation = gText; | ||||
| @@ -638,15 +642,11 @@ namespace Elwig.Windows { | ||||
|         private void DeliveryPartList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) { | ||||
|             RefreshInputs(); | ||||
|             if (DeliveryPartList.SelectedItem is DeliveryPart p) { | ||||
|                 AbwertenButton.IsEnabled = p.QualId != "WEI"; | ||||
|                 DepreciateButton.IsEnabled = true; | ||||
|                 EditDeliveryButton.IsEnabled = true; | ||||
|                 ExtractDeliveryPartButton.IsEnabled = !IsCreating; | ||||
|                 DeleteDeliveryPartButton.IsEnabled = DeliveryList.SelectedItem is Delivery { Parts.Count: > 1 } && !IsCreating; | ||||
|             } else { | ||||
|                 AbwertenButton.IsEnabled = false; | ||||
|                 DepreciateButton.IsEnabled = false; | ||||
|                 EditDeliveryButton.IsEnabled = false; | ||||
|                 ExtractDeliveryPartButton.IsEnabled = false; | ||||
|                 DeleteDeliveryPartButton.IsEnabled = false; | ||||
|             } | ||||
|         } | ||||
|  | ||||
| @@ -694,7 +694,10 @@ namespace Elwig.Windows { | ||||
|             NewDeliveryPartButton.IsEnabled = false; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             DeliveryPartList.IsEnabled = false; | ||||
|             var p = await ViewModel.UpdateDeliveryPart( | ||||
|  | ||||
|             DeliveryPart? p; | ||||
|             try { | ||||
|                 p = await ViewModel.UpdateDeliveryPart( | ||||
|                     (DeliveryList.SelectedItem as Delivery)?.Year, | ||||
|                     (DeliveryList.SelectedItem as Delivery)?.DId, | ||||
|                     (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr, | ||||
| @@ -702,6 +705,17 @@ namespace Elwig.Windows { | ||||
|                     InputHasChanged(TimeInput), | ||||
|                     !InputIsNotDefault(TimeInput) | ||||
|                 ); | ||||
|             } 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, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 FinishButton.IsEnabled = true; | ||||
|                 SaveButton.IsEnabled = true; | ||||
|                 Mouse.OverrideCursor = null; | ||||
|                 DeliveryPartList.IsEnabled = true; | ||||
|                 return; | ||||
|             } | ||||
|  | ||||
|             EmptyScale(); | ||||
|             await RefreshList(); | ||||
|             await RefreshDeliveryParts(); | ||||
| @@ -718,7 +732,10 @@ namespace Elwig.Windows { | ||||
|             NewDeliveryPartButton.IsEnabled = false; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             DeliveryPartList.IsEnabled = false; | ||||
|             var p = await ViewModel.UpdateDeliveryPart( | ||||
|  | ||||
|             DeliveryPart? p; | ||||
|             try { | ||||
|                 p = await ViewModel.UpdateDeliveryPart( | ||||
|                     (DeliveryList.SelectedItem as Delivery)?.Year, | ||||
|                     (DeliveryList.SelectedItem as Delivery)?.DId, | ||||
|                     (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr, | ||||
| @@ -726,6 +743,17 @@ namespace Elwig.Windows { | ||||
|                     InputHasChanged(TimeInput), | ||||
|                     !InputIsNotDefault(TimeInput) | ||||
|                 ); | ||||
|             } 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, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 FinishButton.IsEnabled = true; | ||||
|                 SaveButton.IsEnabled = true; | ||||
|                 Mouse.OverrideCursor = null; | ||||
|                 DeliveryPartList.IsEnabled = true; | ||||
|                 return; | ||||
|             } | ||||
|  | ||||
|             EmptyScale(); | ||||
|             await RefreshList(); | ||||
|             await RefreshDeliveryParts(); | ||||
| @@ -743,6 +771,7 @@ namespace Elwig.Windows { | ||||
|                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             Mouse.OverrideCursor = null; | ||||
|             DeliveryList.SelectedItem = null; | ||||
|             await RenewContext(); | ||||
| @@ -826,43 +855,29 @@ namespace Elwig.Windows { | ||||
|             LockSearchInputs(); | ||||
|         } | ||||
|  | ||||
|         private async void AbwertenButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (DeliveryPartList.SelectedItem is not DeliveryPart p) return; | ||||
|             var res = Utils.ShowAbwertenDialog($"{p.Delivery.LsNr}/{p.DPNr}", p.Delivery.Member.AdministrativeName, p.Weight); | ||||
|             if (res == null || res <= 0) | ||||
|         private async void DepreciateButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (DeliveryList.SelectedItem is not Delivery d) return; | ||||
|             var res = Utils.ShowDeliverySplittingDialog(d); | ||||
|             if (res == null) | ||||
|                 return; | ||||
|  | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             try { | ||||
|                 using var ctx = new AppDbContext(); | ||||
|                 ClearOriginalValues(); | ||||
|                 if (res >= p.Weight) { | ||||
|                     ControlUtils.SelectItemWithPk(WineQualityLevelInput, "WEI"); | ||||
|                     ControlUtils.SelectItemWithPk(WineOriginInput, "OEST"); | ||||
|                     p.QualId = "WEI"; | ||||
|                     p.HkId = "OEST"; | ||||
|                     ctx.Update(p); | ||||
|                 var id = res.Value.Item1; | ||||
|                 var weights = res.Value.Item2; | ||||
|                 if (id == null) { | ||||
|                     // abwerten | ||||
|                     await DeliveryService.DepreciateDelivery(d.Year, d.DId, weights); | ||||
|                 } else if (id.All(char.IsAsciiDigit)) { | ||||
|                     // auf Mitglied übertragen | ||||
|                     var n = await DeliveryService.SplitDeliveryToMember(d.Year, d.DId, weights, int.Parse(id)); | ||||
|                     await Task.Delay(500); | ||||
|                     ControlUtils.SelectItemWithPk(DeliveryList, n.Year, n.DId); | ||||
|                 } else { | ||||
|                     var w = p.Weight - res.Value; | ||||
|                     ViewModel.Weight = w; | ||||
|                     p.Weight = w; | ||||
|                     ctx.Update(p); | ||||
|  | ||||
|                     var d = p.Delivery; | ||||
|                     var p2 = ctx.CreateProxy<DeliveryPart>(); | ||||
|                     var values = ctx.Entry(p).CurrentValues; | ||||
|                     ctx.Entry(p2).CurrentValues.SetValues(values); | ||||
|                     p2.DPNr = await ctx.NextDPNr(d.Year, d.DId); | ||||
|                     p2.Weight = res.Value; | ||||
|                     p2.QualId = "WEI"; | ||||
|                     p2.HkId = "OEST"; | ||||
|                     ctx.Add(p2); | ||||
|  | ||||
|                     ctx.UpdateDeliveryPartModifiers(p2, [], p.Modifiers); | ||||
|                     // zu existierender Lieferung hinzufügen | ||||
|                     var n = await DeliveryService.SplitDeliveryToLsNr(d.Year, d.DId, weights, id); | ||||
|                     ControlUtils.SelectItemWithPk(DeliveryList, n.Year, n.DId); | ||||
|                 } | ||||
|                 await ctx.SaveChangesAsync(); | ||||
|                 await RefreshDeliveryParts(); | ||||
|                 FinishInputFilling(); | ||||
|             } 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; | ||||
| @@ -900,9 +915,7 @@ namespace Elwig.Windows { | ||||
|             UnlockInputs(); | ||||
|             LockSearchInputs(); | ||||
|  | ||||
|             AbwertenButton.IsEnabled = false; | ||||
|             ExtractDeliveryPartButton.IsEnabled = false; | ||||
|             DeleteDeliveryPartButton.IsEnabled = false; | ||||
|             DepreciateButton.IsEnabled = false; | ||||
|         } | ||||
|  | ||||
|         protected override void ShortcutDelete() { | ||||
| @@ -940,12 +953,9 @@ namespace Elwig.Windows { | ||||
|             SaveButton.IsEnabled = false; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|  | ||||
|             IsEditing = false; | ||||
|             IsCreating = false; | ||||
|             DeliveryList.IsEnabled = true; | ||||
|             DeliveryPartList.IsEnabled = true; | ||||
|  | ||||
|             var p = await ViewModel.UpdateDeliveryPart( | ||||
|             DeliveryPart? p; | ||||
|             try { | ||||
|                 p = await ViewModel.UpdateDeliveryPart( | ||||
|                     (DeliveryList.SelectedItem as Delivery)?.Year, | ||||
|                     (DeliveryList.SelectedItem as Delivery)?.DId, | ||||
|                     (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr, | ||||
| @@ -953,8 +963,20 @@ namespace Elwig.Windows { | ||||
|                     InputHasChanged(TimeInput), | ||||
|                     !InputIsNotDefault(TimeInput) | ||||
|                 ); | ||||
|  | ||||
|             } 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, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 SaveButton.IsEnabled = true; | ||||
|                 return; | ||||
|             } finally { | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|  | ||||
|             IsEditing = false; | ||||
|             IsCreating = false; | ||||
|             DeliveryList.IsEnabled = true; | ||||
|             DeliveryPartList.IsEnabled = true; | ||||
|  | ||||
|             HideSaveResetCancelButtons(); | ||||
|             ShowNewEditDeleteButtons(); | ||||
| @@ -965,9 +987,7 @@ namespace Elwig.Windows { | ||||
|             await RefreshDeliveryParts(); | ||||
|             RefreshInputs(); | ||||
|  | ||||
|             AbwertenButton.IsEnabled = p.QualId != "WEI"; | ||||
|             ExtractDeliveryPartButton.IsEnabled = DeliveryPartList.SelectedItem != null && !IsCreating; | ||||
|             DeleteDeliveryPartButton.IsEnabled = DeliveryList.SelectedItem is Delivery { Parts.Count: > 1 } && !IsCreating; | ||||
|             DepreciateButton.IsEnabled = true; | ||||
|         } | ||||
|  | ||||
|         protected override void ShortcutReset() { | ||||
| @@ -998,91 +1018,7 @@ namespace Elwig.Windows { | ||||
|             LockInputs(); | ||||
|             UnlockSearchInputs(); | ||||
|  | ||||
|             AbwertenButton.IsEnabled = DeliveryPartList.SelectedItem is DeliveryPart p && p.QualId != "WEI"; | ||||
|             ExtractDeliveryPartButton.IsEnabled = DeliveryPartList.SelectedItem != null && !IsCreating; | ||||
|             DeleteDeliveryPartButton.IsEnabled = DeliveryList.SelectedItem is Delivery { Parts.Count: > 1 } && !IsCreating; | ||||
|         } | ||||
|  | ||||
|         private async void ExtractDeliveryPartButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (DeliveryPartList.SelectedItem is not DeliveryPart p) | ||||
|                 return; | ||||
|  | ||||
|             var delivery = p.Delivery; | ||||
|             var day = delivery.Date; | ||||
|             var count = delivery.Parts.Count; | ||||
|  | ||||
|             if (delivery.Time <= new TimeOnly(3, 0)) | ||||
|                 day = day.AddDays(-1); | ||||
|  | ||||
|             string? res; | ||||
|             using (var ctx = new AppDbContext()) { | ||||
|                 var lsnrs = await ctx.Deliveries | ||||
|                     .Where(d => d.ZwstId == delivery.ZwstId) | ||||
|                     .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) | ||||
|                     .ToListAsync(); | ||||
|  | ||||
|                 res = Utils.ShowDeliveryExtractionDialog($"{delivery.LsNr}/{p.DPNr}", delivery.Member.AdministrativeName, count == 1, lsnrs); | ||||
|                 if (res == null) | ||||
|                     return; | ||||
|             } | ||||
|  | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             try { | ||||
|                 using var ctx = new AppDbContext(); | ||||
|                 if (res == "new") { | ||||
|                     var lnr = await ctx.NextLNr(delivery.Date); | ||||
|                     ctx.Add(new Delivery { | ||||
|                         Year = p.Year, | ||||
|                         DId = await ctx.NextDId(p.Year), | ||||
|                         LNr = lnr, | ||||
|                         DateString = $"{delivery.Date:yyyy-MM-dd}", | ||||
|                         TimeString = $"{delivery.Time:HH:mm:ss}", | ||||
|                         ZwstId = delivery.ZwstId, | ||||
|                         MgNr = delivery.MgNr, | ||||
|                         Comment = delivery.Comment, | ||||
|                         LsNr = Utils.GenerateLsNr(delivery.Date, delivery.ZwstId, lnr), | ||||
|                     }); | ||||
|                     await ctx.SaveChangesAsync(); | ||||
|                 } | ||||
|                 Delivery? d = await ctx.Deliveries.Where(d => d.LsNr == res).FirstOrDefaultAsync(); | ||||
|                 if (d == null) return; | ||||
|  | ||||
|                 await ctx.Database.ExecuteSqlAsync($"UPDATE delivery_part SET year = {d.Year}, did = {d.DId}, dpnr = {await ctx.NextDPNr(d.Year, d.DId)} WHERE (year, did, dpnr) = ({p.Year}, {p.DId}, {p.DPNr})"); | ||||
|                 if (count == 1) { | ||||
|                     await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({delivery.Year}, {delivery.DId})"); | ||||
|                 } | ||||
|                 await ctx.SaveChangesAsync(); | ||||
|  | ||||
|                 await RefreshList(); | ||||
|                 ControlUtils.SelectItem(DeliveryList, d); | ||||
|             } 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, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|             } | ||||
|             Mouse.OverrideCursor = null; | ||||
|         } | ||||
|  | ||||
|         private async void DeleteDeliveryPartButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (DeliveryPartList.SelectedItem is not DeliveryPart p) | ||||
|                 return; | ||||
|  | ||||
|             var r = MessageBox.Show( | ||||
|                 $"Soll die Teillieferung Nr. {p.DPNr} wirklich unwiderruflich gelöscht werden?", | ||||
|                 "Lieferung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel); | ||||
|             if (r == MessageBoxResult.OK) { | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|                 using (var ctx = new AppDbContext()) { | ||||
|                     ctx.Remove(p); | ||||
|                     await ctx.SaveChangesAsync(); | ||||
|                 } | ||||
|                 await RefreshDeliveryParts(); | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|             DepreciateButton.IsEnabled = DeliveryPartList.SelectedItem != null; | ||||
|         } | ||||
|  | ||||
|         private void ShowSaveResetCancelButtons() { | ||||
| @@ -1105,22 +1041,22 @@ namespace Elwig.Windows { | ||||
|  | ||||
|         private void ShowNewEditDeleteButtons() { | ||||
|             NewDeliveryButton.IsEnabled = ViewModel.IsReceipt; | ||||
|             AbwertenButton.IsEnabled = DeliveryPartList.SelectedItem is DeliveryPart p && p.QualId == "WEI"; | ||||
|             DepreciateButton.IsEnabled = DeliveryList.SelectedItem != null; | ||||
|             EditDeliveryButton.IsEnabled = DeliveryPartList.SelectedItem != null; | ||||
|             DeleteDeliveryButton.IsEnabled = DeliveryList.SelectedItem != null; | ||||
|             NewDeliveryButton.Visibility = ViewModel.IsReceipt ? Visibility.Visible : Visibility.Hidden; | ||||
|             AbwertenButton.Visibility = !ViewModel.IsReceipt ? Visibility.Visible : Visibility.Hidden; | ||||
|             DepreciateButton.Visibility = !ViewModel.IsReceipt ? Visibility.Visible : Visibility.Hidden; | ||||
|             EditDeliveryButton.Visibility = Visibility.Visible; | ||||
|             DeleteDeliveryButton.Visibility = Visibility.Visible; | ||||
|         } | ||||
|  | ||||
|         private void HideNewEditDeleteButtons() { | ||||
|             NewDeliveryButton.IsEnabled = false; | ||||
|             AbwertenButton.IsEnabled = false; | ||||
|             DepreciateButton.IsEnabled = false; | ||||
|             EditDeliveryButton.IsEnabled = false; | ||||
|             DeleteDeliveryButton.IsEnabled = false; | ||||
|             NewDeliveryButton.Visibility = Visibility.Hidden; | ||||
|             AbwertenButton.Visibility = Visibility.Hidden; | ||||
|             DepreciateButton.Visibility = Visibility.Hidden; | ||||
|             EditDeliveryButton.Visibility = Visibility.Hidden; | ||||
|             DeleteDeliveryButton.Visibility = Visibility.Hidden; | ||||
|         } | ||||
| @@ -1197,7 +1133,7 @@ namespace Elwig.Windows { | ||||
|                     var branch = (Branch)BranchInput.SelectedItem; | ||||
|                     var date = DateOnly.ParseExact(ViewModel.Date!, "dd.MM.yyyy"); | ||||
|                     using var ctx = new AppDbContext(); | ||||
|                     var lnr = await ctx.NextLNr(date); | ||||
|                     var lnr = await ctx.NextLNr(date, branch.ZwstId); | ||||
|                     ViewModel.LsNr = Utils.GenerateLsNr(date, branch.ZwstId, lnr); | ||||
|                 } catch { | ||||
|                     ViewModel.LsNr = ""; | ||||
|   | ||||
| @@ -341,6 +341,8 @@ namespace Elwig.Windows { | ||||
|  | ||||
|         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) { | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             SaveButton.IsEnabled = false; | ||||
|  | ||||
|             int year = -1, dsnr = -1, mgnr = -1; | ||||
|             string? sortid = null; | ||||
|             try { | ||||
| @@ -350,8 +352,12 @@ namespace Elwig.Windows { | ||||
|                 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, "Anmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|             } | ||||
|                 SaveButton.IsEnabled = true; | ||||
|                 return; | ||||
|             } finally { | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|  | ||||
|             IsEditing = false; | ||||
|             IsCreating = false; | ||||
|             DeliveryAncmtList.IsEnabled = true; | ||||
|   | ||||
| @@ -201,14 +201,20 @@ namespace Elwig.Windows { | ||||
|  | ||||
|         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) { | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             SaveButton.IsEnabled = false; | ||||
|  | ||||
|             try { | ||||
|                 await ViewModel.UpdateDeliverySchedule(ViewModel.SelectedDeliverySchedule?.Year, ViewModel.SelectedDeliverySchedule?.DsNr); | ||||
|             } 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, "Leseplan aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|             } | ||||
|                 SaveButton.IsEnabled = true; | ||||
|                 return; | ||||
|             } finally { | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|  | ||||
|             IsEditing = false; | ||||
|             IsCreating = false; | ||||
|             DeliveryScheduleList.IsEnabled = true; | ||||
|   | ||||
| @@ -86,14 +86,16 @@ | ||||
|                         <Label x:Name="DocumentFooterLabel" Content="Fußtext:" Margin="10,40,0,10"/> | ||||
|                         <TextBox x:Name="DeliveryConfirmationFooterInput" Grid.Column="1" | ||||
|                                  Margin="0,40,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" | ||||
|                                  AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"/> | ||||
|                                  AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap" | ||||
|                                  TextChanged="DocumentInput_TextChanged"/> | ||||
|                         <TextBox x:Name="CreditNoteFooterInput" Grid.Column="1" | ||||
|                                  Margin="0,10,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" | ||||
|                                  AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"/> | ||||
|                                  AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap" | ||||
|                                  TextChanged="DocumentInput_TextChanged"/> | ||||
|                     </Grid> | ||||
|                 </GroupBox> | ||||
|  | ||||
|                 <TextBox x:Name="PostalLocation" Grid.Column="1" | ||||
|                 <TextBox x:Name="PostalLocation" Grid.Column="1" TextChanged="PostalLocation_TextChanged" | ||||
|                          Margin="10,30,10,10" Width="120" HorizontalAlignment="Left"/> | ||||
|                 <Label Content=", am" Margin="130,30,10,10" FontSize="14" Grid.Column="1"/> | ||||
|                 <TextBox x:Name="PostalDate" Grid.Column="1" Text="01.01.2020" | ||||
| @@ -195,41 +197,42 @@ | ||||
|                     <Grid> | ||||
|                         <GroupBox Header="Zusenden an..." Margin="10,10,10,10" Height="150" Width="220" VerticalAlignment="Top" HorizontalAlignment="Left"> | ||||
|                             <StackPanel> | ||||
|                                 <RadioButton x:Name="PostalAllInput" Margin="10,10,10,2.5"> | ||||
|                                 <RadioButton x:Name="PostalAllInput" Margin="10,10,10,2.5" Click="PostalInput_Changed"> | ||||
|                                     <TextBlock> | ||||
|                                         ... alle (<Run Text="{Binding Path=PostalAllCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>) | ||||
|                                         ...alle (<Run Text="{Binding Path=PostalAllCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>) | ||||
|                                     </TextBlock> | ||||
|                                 </RadioButton> | ||||
|                                 <RadioButton x:Name="PostalWishInput" Margin="10,2.5,10,2.5" IsChecked="True"> | ||||
|                                 <RadioButton x:Name="PostalWishInput" Margin="10,2.5,10,2.5" Click="PostalInput_Changed" IsChecked="True"> | ||||
|                                     <TextBlock> | ||||
|                                         ...Mitglieder, die Zusendung<LineBreak/> | ||||
|                                         per Post wünschen (<Run Text="{Binding Path=PostalWishCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>) | ||||
|                                     </TextBlock> | ||||
|                                 </RadioButton> | ||||
|                                 <RadioButton x:Name="PostalNoEmailInput" Margin="10,2.5,10,2.5"> | ||||
|                                 <RadioButton x:Name="PostalNoEmailInput" Margin="10,2.5,10,2.5" Click="PostalInput_Changed"> | ||||
|                                     <TextBlock> | ||||
|                                         ...Mitglieder, die keine<LineBreak/> | ||||
|                                         E-Mail erhalten würden (<Run Text="{Binding Path=PostalNoEmailCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>) | ||||
|                                     </TextBlock> | ||||
|                                 </RadioButton> | ||||
|                                 <RadioButton x:Name="PostalNobodyInput" Margin="10,2.5,10,10" Content="...niemanden (0)"/> | ||||
|                                 <RadioButton x:Name="PostalNobodyInput" Margin="10,2.5,10,10" Content="...niemanden (0)"  Click="PostalInput_Changed"/> | ||||
|                             </StackPanel> | ||||
|                         </GroupBox> | ||||
|  | ||||
|                         <GroupBox Header="Sortieren nach" Margin="10,180,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left"> | ||||
|                             <StackPanel Margin="5,5,0,5"> | ||||
|                                 <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" IsChecked="True"/> | ||||
|                                 <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name"/> | ||||
|                                 <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name"/> | ||||
|                                 <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" Click="OrderInput_Changed" IsChecked="True"/> | ||||
|                                 <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name" Click="OrderInput_Changed"/> | ||||
|                                 <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name" Click="OrderInput_Changed"/> | ||||
|                             </StackPanel> | ||||
|                         </GroupBox> | ||||
|  | ||||
|                         <CheckBox x:Name="DoublePagedInput" Margin="20,270,10,10" Content="Doppelseitig drucken" | ||||
|                                   VerticalAlignment="Top" HorizontalAlignment="Left"/> | ||||
|                                   VerticalAlignment="Top" HorizontalAlignment="Left" | ||||
|                                   Checked="DoublePagedInput_Changed" Unchecked="DoublePagedInput_Changed"/> | ||||
|  | ||||
|                         <TextBox x:Name="PostalSender1" IsEnabled="False" | ||||
|                         <TextBox x:Name="PostalSender1" TextChanged="PostalSender_TextChanged" IsEnabled="False" | ||||
|                                  Margin="10,300,10,10"/> | ||||
|                         <TextBox x:Name="PostalSender2" | ||||
|                         <TextBox x:Name="PostalSender2" TextChanged="PostalSender_TextChanged" | ||||
|                                  Margin="10,330,10,10"/> | ||||
|                     </Grid> | ||||
|                 </GroupBox> | ||||
|   | ||||
| @@ -200,6 +200,48 @@ namespace Elwig.Windows { | ||||
|             await UpdateRecipients(ctx); | ||||
|         } | ||||
|  | ||||
|         private void ResetDocuments() { | ||||
|             DisposeDocs(); | ||||
|             if (IsLoaded) { | ||||
|                 PreviewButton.IsEnabled = false; | ||||
|                 PrintButton.IsEnabled = false; | ||||
|                 EmailButton.IsEnabled = false; | ||||
|                 ProgressBar.Value = 0; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private void LockInputs() { | ||||
|             DocumentAddButton.IsEnabled = false; | ||||
|             DocumentRemoveButton.IsEnabled = false; | ||||
|             SelectDocumentButton.IsEnabled = false; | ||||
|             foreach (var tb in ControlUtils.FindAllChildren<TextBox>(this, [])) | ||||
|                 tb.IsReadOnly = true; | ||||
|             foreach (var cb in ControlUtils.FindAllChildren<ComboBox>(this, [])) | ||||
|                 cb.IsEnabled = false; | ||||
|             foreach (var cb in ControlUtils.FindAllChildren<CheckBox>(this, [])) | ||||
|                 cb.IsEnabled = false; | ||||
|             foreach (var lb in ControlUtils.FindAllChildren<ListBox>(this, [])) | ||||
|                 lb.IsEnabled = false; | ||||
|             foreach (var rb in ControlUtils.FindAllChildren<RadioButton>(this, [])) | ||||
|                 rb.IsEnabled = false; | ||||
|         } | ||||
|  | ||||
|         private void UnlockInputs() { | ||||
|             DocumentAddButton.IsEnabled = true; | ||||
|             DocumentRemoveButton.IsEnabled = true; | ||||
|             SelectDocumentButton.IsEnabled = true; | ||||
|             foreach (var tb in ControlUtils.FindAllChildren<TextBox>(this, [])) | ||||
|                 tb.IsReadOnly = false; | ||||
|             foreach (var cb in ControlUtils.FindAllChildren<ComboBox>(this, [])) | ||||
|                 cb.IsEnabled = true; | ||||
|             foreach (var cb in ControlUtils.FindAllChildren<CheckBox>(this, [])) | ||||
|                 cb.IsEnabled = true; | ||||
|             foreach (var lb in ControlUtils.FindAllChildren<ListBox>(this, [])) | ||||
|                 lb.IsEnabled = true; | ||||
|             foreach (var rb in ControlUtils.FindAllChildren<RadioButton>(this, [])) | ||||
|                 rb.IsEnabled = true; | ||||
|         } | ||||
|  | ||||
|         private void ContinueButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             TabControl.SelectedIndex = 1; | ||||
|             TabControl.AllowDrop = false; | ||||
| @@ -210,7 +252,7 @@ namespace Elwig.Windows { | ||||
|             TabControl.AllowDrop = true; | ||||
|         } | ||||
|  | ||||
|         private void Document_Drop(object sender, DragEventArgs evt) { | ||||
|         private async void Document_Drop(object sender, DragEventArgs evt) { | ||||
|             if (evt.Data.GetDataPresent(DataFormats.FileDrop)) { | ||||
|                 var files = (string[])evt.Data.GetData(DataFormats.FileDrop); | ||||
|                 foreach (var file in files) { | ||||
| @@ -218,6 +260,8 @@ namespace Elwig.Windows { | ||||
|                         SelectedDocs.Add(new(DocType.Custom, Path.GetFileName(file), file)); | ||||
|                     } | ||||
|                 } | ||||
|                 using var ctx = new AppDbContext(); | ||||
|                 await UpdateRecipients(ctx); | ||||
|             } | ||||
|         } | ||||
|  | ||||
| @@ -260,8 +304,9 @@ namespace Elwig.Windows { | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         private void DocumentAddButton_Click(object sender, RoutedEventArgs evt) { | ||||
|         private async void DocumentAddButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             var idx = AvaiableDocumentsList.SelectedIndex; | ||||
|             using var ctx = new AppDbContext(); | ||||
|             if (AvaiableDocumentsList.SelectedItem is not string s) | ||||
|                 return; | ||||
|             if (idx == 0) { | ||||
| @@ -270,20 +315,22 @@ namespace Elwig.Windows { | ||||
|                 SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true))); | ||||
|                 RecipientsDeliveryMembersInput.IsChecked = true; | ||||
|             } else if (idx >= 2) { | ||||
|                 using var ctx = new AppDbContext(); | ||||
|                 var name = s.Split(" – ")[^1]; | ||||
|                 var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!; | ||||
|                 var pv = await ctx.PaymentVariants.SingleAsync(v => v.Year == Year && v.Name == name)!; | ||||
|                 SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr))); | ||||
|                 RecipientsDeliveryMembersInput.IsChecked = true; | ||||
|             } | ||||
|             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1; | ||||
|             await UpdateRecipients(ctx); | ||||
|         } | ||||
|  | ||||
|         private void DocumentRemoveButton_Click(object sender, RoutedEventArgs evt) { | ||||
|         private async void DocumentRemoveButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             DeleteCommand.Execute(null); | ||||
|             using var ctx = new AppDbContext(); | ||||
|             await UpdateRecipients(ctx); | ||||
|         } | ||||
|  | ||||
|         private void SelectDocumentButton_Click(object sender, RoutedEventArgs evt) { | ||||
|         private async void SelectDocumentButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             var d = new OpenFileDialog() { | ||||
|                 Title = "Dokument auswählen - Elwig", | ||||
|                 DefaultExt = "pdf", | ||||
| @@ -296,6 +343,8 @@ namespace Elwig.Windows { | ||||
|                         SelectedDocs.Add(new(DocType.Custom, Path.GetFileName(file), file)); | ||||
|                     } | ||||
|                 } | ||||
|                 using var ctx = new AppDbContext(); | ||||
|                 await UpdateRecipients(ctx); | ||||
|             } | ||||
|         } | ||||
|  | ||||
| @@ -334,6 +383,7 @@ namespace Elwig.Windows { | ||||
|  | ||||
|         private void Date_TextChanged(object sender, RoutedEventArgs evt) { | ||||
|             Validator.CheckDate((TextBox)sender, true); | ||||
|             ResetDocuments(); | ||||
|         } | ||||
|  | ||||
|         private void Date_LostFocus(object sender, RoutedEventArgs evt) { | ||||
| @@ -375,6 +425,8 @@ namespace Elwig.Windows { | ||||
|                     query = query.Where(m => m.Deliveries.Any(d => d.Year == Year)); | ||||
|                 } else if (RecipientsNonDeliveryMembersInput.IsChecked == true) { | ||||
|                     query = query.Where(m => m.IsActive && !m.Deliveries.Any(d => d.Year == Year)); | ||||
|                 } else if  (RecipientsActiveMembersInput.IsChecked == true && SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation || d.Type == DocType.CreditNote)) { | ||||
|                     query = query.Where(m => m.IsActive || m.Deliveries.Any(d => d.Year == Year)); | ||||
|                 } else { | ||||
|                     query = query.Where(m => m.IsActive); | ||||
|                 } | ||||
| @@ -403,6 +455,7 @@ namespace Elwig.Windows { | ||||
|             PostalWishCount = Recipients.Count(m => m.ContactViaPost); | ||||
|             var m = EmailAllInput.IsChecked == true ? 3 : EmailWishInput.IsChecked == true ? 2 : 1; | ||||
|             PostalNoEmailCount = PostalAllCount - (m == 3 ? EmailAllCount : m == 2 ? EmailWishCount : 0); | ||||
|             ResetDocuments(); | ||||
|         } | ||||
|  | ||||
|         private async Task UpdateTextParameters() { | ||||
| @@ -458,6 +511,7 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void GenerateButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             LockInputs(); | ||||
|             PreviewButton.IsEnabled = false; | ||||
|             PrintButton.IsEnabled = false; | ||||
|             EmailButton.IsEnabled = false; | ||||
| @@ -520,6 +574,7 @@ namespace Elwig.Windows { | ||||
|                         dcData[year] = await DeliveryConfirmationDeliveryData.ForSeason(ctx.DeliveryParts, year); | ||||
|                     } catch (Exception exc) { | ||||
|                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                         UnlockInputs(); | ||||
|                         GenerateButton.IsEnabled = true; | ||||
|                         Mouse.OverrideCursor = null; | ||||
|                         return; | ||||
| @@ -536,6 +591,7 @@ namespace Elwig.Windows { | ||||
|                         ); | ||||
|                     } catch (Exception exc) { | ||||
|                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                         UnlockInputs(); | ||||
|                         GenerateButton.IsEnabled = true; | ||||
|                         Mouse.OverrideCursor = null; | ||||
|                         return; | ||||
| @@ -626,6 +682,7 @@ namespace Elwig.Windows { | ||||
|                 } | ||||
|             } catch (Exception exc) { | ||||
|                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 UnlockInputs(); | ||||
|                 GenerateButton.IsEnabled = true; | ||||
|                 Mouse.OverrideCursor = null; | ||||
|                 return; | ||||
| @@ -665,6 +722,7 @@ namespace Elwig.Windows { | ||||
|                     PrintDocument = print; | ||||
|                 } catch (Exception exc) { | ||||
|                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                     UnlockInputs(); | ||||
|                     GenerateButton.IsEnabled = true; | ||||
|                     Mouse.OverrideCursor = null; | ||||
|                     return; | ||||
| @@ -672,6 +730,7 @@ namespace Elwig.Windows { | ||||
|             } | ||||
|             ProgressBar.Value = 100.0; | ||||
|  | ||||
|             UnlockInputs(); | ||||
|             GenerateButton.IsEnabled = true; | ||||
|             Mouse.OverrideCursor = null; | ||||
|             PreviewButton.IsEnabled = true; | ||||
| @@ -705,9 +764,12 @@ namespace Elwig.Windows { | ||||
|  | ||||
|         private async void PrintButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (PrintDocument == null) return; | ||||
|  | ||||
|             PrintButton.IsEnabled = false; | ||||
|             var res = MessageBox.Show($"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?\n" + | ||||
|                 $"Sind die \"Duplex-Einstellungen\" des Standarddruckers entsprechend eingestellt (doppelseitig bzw. einseitig)?", | ||||
|             GenerateButton.IsEnabled = false; | ||||
|             LockInputs(); | ||||
|  | ||||
|             var res = MessageBox.Show($"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?", | ||||
|                 "Rundschreiben drucken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No); | ||||
|             if (res == MessageBoxResult.Yes) { | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
| @@ -718,20 +780,26 @@ namespace Elwig.Windows { | ||||
|                 } | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|  | ||||
|             PrintButton.IsEnabled = true; | ||||
|             GenerateButton.IsEnabled = true; | ||||
|             UnlockInputs(); | ||||
|         } | ||||
|  | ||||
|         private async void EmailButton_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (App.Config.Smtp == null || EmailDocuments == null) return; | ||||
|  | ||||
|             EmailButton.IsEnabled = false; | ||||
|             GenerateButton.IsEnabled = false; | ||||
|             LockInputs(); | ||||
|  | ||||
|             SmtpClient? client = null; | ||||
|             try { | ||||
|                 Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|                 client = await Utils.GetSmtpClient(); | ||||
|                 Mouse.OverrideCursor = null; | ||||
|  | ||||
|                 var res = MessageBox.Show($"Sollen {EmailDocuments.Count} E-Mails verschickt werden?", | ||||
|                 var res = MessageBox.Show($"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?", | ||||
|                     "Rundschreiben verschicken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No); | ||||
|                 if (res != MessageBoxResult.Yes) { | ||||
|                     return; | ||||
| @@ -755,6 +823,8 @@ namespace Elwig.Windows { | ||||
|                     msg.Body = body; | ||||
|                     await client!.SendAsync(msg); | ||||
|                 } | ||||
|  | ||||
|                 MessageBox.Show("Erfolgreich alle E-Mails verschickt!", "Rundschreiben verschicken", MessageBoxButton.OK, MessageBoxImage.Information); | ||||
|             } catch (Exception exc) { | ||||
|                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|             } finally { | ||||
| @@ -762,11 +832,14 @@ namespace Elwig.Windows { | ||||
|                     await client.DisconnectAsync(true); | ||||
|                 client?.Dispose(); | ||||
|                 EmailButton.IsEnabled = true; | ||||
|                 GenerateButton.IsEnabled = true; | ||||
|                 UnlockInputs(); | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         public void AddDeliveryConfirmation() { | ||||
|             if (!GenerateButton.IsEnabled) return; | ||||
|             AvaiableDocumentsList.SelectedIndex = 1; | ||||
|             if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation)) | ||||
|                 return; | ||||
| @@ -776,6 +849,7 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         public void AddCreditNote(int index) { | ||||
|             if (!GenerateButton.IsEnabled) return; | ||||
|             AvaiableDocumentsList.SelectedIndex = 2 + index; | ||||
|             if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.CreditNote)) | ||||
|                 return; | ||||
| @@ -786,5 +860,29 @@ namespace Elwig.Windows { | ||||
|             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1; | ||||
|             RecipientsDeliveryMembersInput.IsChecked = true; | ||||
|         } | ||||
|  | ||||
|         private void DocumentInput_TextChanged(object sender, TextChangedEventArgs evt) { | ||||
|             ResetDocuments(); | ||||
|         } | ||||
|  | ||||
|         private void PostalLocation_TextChanged(object sender, TextChangedEventArgs evt) { | ||||
|             ResetDocuments(); | ||||
|         } | ||||
|  | ||||
|         private void PostalInput_Changed(object sender, RoutedEventArgs evt) { | ||||
|             ResetDocuments(); | ||||
|         } | ||||
|  | ||||
|         private void OrderInput_Changed(object sender, RoutedEventArgs evt) { | ||||
|             ResetDocuments(); | ||||
|         } | ||||
|  | ||||
|         private void DoublePagedInput_Changed(object sender, RoutedEventArgs evt) { | ||||
|             ResetDocuments(); | ||||
|         } | ||||
|  | ||||
|         private void PostalSender_TextChanged(object sender, TextChangedEventArgs evt) { | ||||
|             ResetDocuments(); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -206,7 +206,7 @@ namespace Elwig.Windows { | ||||
|                 } else { | ||||
|                     await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]); | ||||
|                     await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); | ||||
|                     MessageBox.Show($"Hochladen von {deliveries.Count} Lieferungen erfolgreich!", "Lieferungen hochladen", | ||||
|                     MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen", | ||||
|                         MessageBoxButton.OK, MessageBoxImage.Information); | ||||
|                 } | ||||
|             } catch (HttpRequestException exc) { | ||||
|   | ||||
| @@ -196,7 +196,7 @@ namespace Elwig.Windows { | ||||
|                 show.Click += Menu_DeliveryConfirmation_Show_Click; | ||||
|                 i.Items.Add(show); | ||||
|                 var pdf = new MenuItem { Header = "...speichern... (PDF)" }; | ||||
|                 pdf.Click += Menu_DeliveryConfirmation_Email_Click; | ||||
|                 pdf.Click += Menu_DeliveryConfirmation_SavePdf_Click; | ||||
|                 i.Items.Add(pdf); | ||||
|                 var print = new MenuItem { Header = "...drucken" }; | ||||
|                 print.Click += Menu_DeliveryConfirmation_Print_Click; | ||||
| @@ -217,7 +217,7 @@ namespace Elwig.Windows { | ||||
|                     show.Click += Menu_CreditNote_Show_Click; | ||||
|                     i2.Items.Add(show); | ||||
|                     var pdf = new MenuItem { Header = "...speichern... (PDF)" }; | ||||
|                     pdf.Click += Menu_CreditNote_Email_Click; | ||||
|                     pdf.Click += Menu_CreditNote_SavePdf_Click; | ||||
|                     i2.Items.Add(pdf); | ||||
|                     var print = new MenuItem { Header = "...drucken" }; | ||||
|                     print.Click += Menu_CreditNote_Print_Click; | ||||
| @@ -391,14 +391,22 @@ namespace Elwig.Windows { | ||||
|         } | ||||
|  | ||||
|         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) { | ||||
|             int? mgnr = null; | ||||
|             Mouse.OverrideCursor = Cursors.AppStarting; | ||||
|             SaveButton.IsEnabled = false; | ||||
|  | ||||
|             int mgnr; | ||||
|             try { | ||||
|                 mgnr = await ViewModel.UpdateMember(ViewModel.SelectedMember?.MgNr); | ||||
|             } 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, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); | ||||
|                 SaveButton.IsEnabled = true; | ||||
|                 return; | ||||
|             } finally { | ||||
|                 Mouse.OverrideCursor = null; | ||||
|             } | ||||
|  | ||||
|             IsEditing = false; | ||||
|             IsCreating = false; | ||||
|             MemberList.IsEnabled = true; | ||||
| @@ -498,6 +506,10 @@ namespace Elwig.Windows { | ||||
|  | ||||
|         private async void Menu_MemberDataSheet_Email_Click(object sender, RoutedEventArgs evt) { | ||||
|             if (ViewModel.SelectedMember is not Member m) return; | ||||
|             var res = MessageBox.Show("Soll eine E-Mail verschickt werden?", "Stammdatenblatt verschicken", | ||||
|                 MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes); | ||||
|             if (res != MessageBoxResult.Yes) | ||||
|                 return; | ||||
|             await MemberService.GenerateMemberDataSheet(m, ExportMode.Email); | ||||
|         } | ||||
|  | ||||
| @@ -526,6 +538,10 @@ namespace Elwig.Windows { | ||||
|             var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag; | ||||
|             if (ViewModel.SelectedMember is not Member m || year == null) | ||||
|                 return; | ||||
|             var res = MessageBox.Show("Soll eine E-Mail verschickt werden?", "Anlieferungsbestätigung verschicken", | ||||
|                 MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes); | ||||
|             if (res != MessageBoxResult.Yes) | ||||
|                 return; | ||||
|             await MemberService.GenerateDeliveryConfirmation(m, (int)year, ExportMode.Email); | ||||
|         } | ||||
|  | ||||
| @@ -558,6 +574,10 @@ namespace Elwig.Windows { | ||||
|             var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag; | ||||
|             if (ViewModel.SelectedMember is not Member m || year == null || avnr == null) | ||||
|                 return; | ||||
|             var res = MessageBox.Show("Soll eine E-Mail verschickt werden?", "Traubengutschrift verschicken", | ||||
|                 MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes); | ||||
|             if (res != MessageBoxResult.Yes) | ||||
|                 return; | ||||
|             await MemberService.GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.Email); | ||||
|         } | ||||
|  | ||||
|   | ||||
| @@ -1,5 +1,4 @@ | ||||
| ::mkdir "C:\Program Files\Elwig" | ||||
| ::curl --fail -s -L "https://github.com/emendelson/pdftoprinter/raw/main/PDFtoPrinter.exe" -z "C:\Program Files\Elwig\PDFtoPrinter.exe" -o "C:\Program Files\Elwig\PDFtoPrinter.exe" | ||||
| mkdir "C:\ProgramData\Elwig\resources" | ||||
| copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources" | ||||
| copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources" | ||||
|   | ||||
| @@ -25,7 +25,6 @@ | ||||
|     </Task> | ||||
|   </UsingTask> | ||||
|   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild"> | ||||
|     <Exec Command="curl --fail -s -L "https://github.com/emendelson/pdftoprinter/raw/main/PDFtoPrinter.exe" -z "$(ProjectDir)\Files\PDFtoPrinter.exe" -o "$(ProjectDir)\Files\PDFtoPrinter.exe"" /> | ||||
|     <Exec Command="dotnet publish "$(ProjectDir)\..\Elwig\Elwig.csproj" "/p:PublishProfile=$(ProjectDir)\..\Elwig\Properties\PublishProfiles\FolderProfile.pubxml"" /> | ||||
|     <GetFileVersion AssemblyPath="..\Elwig\bin\Publish\Elwig.exe"> | ||||
|       <Output TaskParameter="Version" PropertyName="ElwigFileVersion" /> | ||||
| @@ -36,7 +35,6 @@ | ||||
|   </Target> | ||||
|   <ItemGroup> | ||||
|     <None Include="Files\config.ini" /> | ||||
|     <None Include="Files\PDFtoPrinter.exe" /> | ||||
|     <None Include="Files\WinziPrint.exe" /> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
| @@ -10,9 +10,6 @@ | ||||
|       <Component Directory="InstallFolder"> | ||||
|         <File Source="$(ProjectDir)\Files\WinziPrint.exe" Id="WinziPrint.exe"/> | ||||
|       </Component> | ||||
|       <Component Directory="InstallFolder"> | ||||
|         <File Source="$(ProjectDir)\Files\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/> | ||||
|       </Component> | ||||
|     </ComponentGroup> | ||||
|   </Fragment> | ||||
| </Wix> | ||||
|   | ||||
| @@ -15,7 +15,7 @@ namespace Tests.E2ETests { | ||||
|         [OneTimeSetUp] | ||||
|         public static async Task SetupDatabase() { | ||||
|             if (File.Exists(Utils.TestDatabasePath)) File.Delete(Utils.TestDatabasePath); | ||||
|             using var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{Utils.TestDatabasePath}\"; Mode=ReadWriteCreate; Foreign Keys=True; Cache=Default"); | ||||
|             using var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{Utils.TestDatabasePath}\"; Mode=ReadWriteCreate; Foreign Keys=True; Cache=Default; Pooling=False"); | ||||
|             await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Create.sql"); | ||||
|             await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Insert.sql"); | ||||
|             await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.E2EInsert.sql"); | ||||
|   | ||||
| @@ -1 +1 @@ | ||||
| curl --fail -s -L "https://elwig.at/files/create.sql?v=30" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql" | ||||
| curl --fail -s -L "https://elwig.at/files/create.sql?v=31" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user