diff --git a/Elwig/Windows/SeasonFinishWindow.xaml b/Elwig/Windows/SeasonFinishWindow.xaml index b512049..4b94551 100644 --- a/Elwig/Windows/SeasonFinishWindow.xaml +++ b/Elwig/Windows/SeasonFinishWindow.xaml @@ -29,6 +29,13 @@ Margin="50,80,0,0" FontSize="12" Height="40"> <TextBlock TextAlignment="Center">Lieferungen auf Flächen-<LineBreak/>bindungen aufteilen</TextBlock> </Button> + <CheckBox x:Name="AllowAttrIntoLowerBinsInput" Content="Lieferungen auch auf "schlechtere" Flächenbindungen aufteilen" IsChecked="True" + VerticalAlignment="Top" HorizontalAlignment="Left" Margin="255,72,0,0"/> + <CheckBox x:Name="AvoidUnderDeliveriesInput" Content="Unterlieferungen vermeiden" IsEnabled="False" + VerticalAlignment="Top" HorizontalAlignment="Left" Margin="255,92,0,0"/> + <CheckBox x:Name="HonorGebundenInput" Margin="255,112,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"> + <TextBlock>Bei Lieferungen das Feld <Italic>Gebunden</Italic> berücksichtigen</TextBlock> + </CheckBox> <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigungen" Click="DeliveryConfirmationButton_Click" diff --git a/Elwig/Windows/SeasonFinishWindow.xaml.cs b/Elwig/Windows/SeasonFinishWindow.xaml.cs index 31122df..89d7e48 100644 --- a/Elwig/Windows/SeasonFinishWindow.xaml.cs +++ b/Elwig/Windows/SeasonFinishWindow.xaml.cs @@ -35,7 +35,10 @@ namespace Elwig.Windows { Mouse.OverrideCursor = Cursors.AppStarting; var b = new Billing(year); await b.FinishSeason(); - await b.CalculateBins(true, false, false); + await b.CalculateBins( + AllowAttrIntoLowerBinsInput.IsChecked ?? false, + AvoidUnderDeliveriesInput.IsChecked ?? false, + HonorGebundenInput.IsChecked ?? false); Mouse.OverrideCursor = null; }