Compare commits

..

3 Commits

5 changed files with 22 additions and 5 deletions

@ -3,6 +3,22 @@ Changelog
========= =========
[v0.10.3][v0.10.3] (2024-08-21) {#v0.10.3}
------------------------------------------
### Behobene Fehler {#v0.10.3-bugfixes}
* Datum für _Anmeldungen bis_ im Leseplan-Fenster (`DeliveryScheduleAdminWindow`) ab jetzt änderbar. (84d8d0cecb)
### Sonstiges {#v0.10.3-misc}
* Wochentag bei Leseplan-Liste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) anzeigen. (fe7f9d675b)
[v0.10.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.3
[v0.10.2][v0.10.2] (2024-08-16) {#v0.10.2} [v0.10.2][v0.10.2] (2024-08-16) {#v0.10.2}
------------------------------------------ ------------------------------------------

@ -7,7 +7,7 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
<ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon> <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
<Version>0.10.2</Version> <Version>0.10.3</Version>
<SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages> <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>

@ -61,7 +61,7 @@
<RowDefinition Height="24"/> <RowDefinition Height="24"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" MinWidth="250"/> <ColumnDefinition Width="1.25*" MinWidth="250"/>
<ColumnDefinition Width="5"/> <ColumnDefinition Width="5"/>
<ColumnDefinition Width="1*" MinWidth="300"/> <ColumnDefinition Width="1*" MinWidth="300"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -123,6 +123,7 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="20"/>
<TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="32"/> <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="32"/>
<TextBlock Text="{Binding ZwstId}" Width="25" TextAlignment="Center"/> <TextBlock Text="{Binding ZwstId}" Width="25" TextAlignment="Center"/>
<TextBlock Text="{Binding Description}" Width="200"/> <TextBlock Text="{Binding Description}" Width="200"/>

@ -200,7 +200,7 @@
<Label Content="Datum/Zwst.:" Margin="10,10,0,10"/> <Label Content="Datum/Zwst.:" Margin="10,10,0,10"/>
<TextBox x:Name="DateInput" Text="{Binding DateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" <TextBox x:Name="DateInput" Text="{Binding DateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Margin="0,10,10,10" Width="77" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right" Margin="0,10,10,10" Width="77" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/> TextChanged="ScheduleDateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
<ComboBox x:Name="BranchInput" SelectedItem="{Binding Branch, Mode=TwoWay}" ItemsSource="{Binding BranchSource, Mode=TwoWay}" <ComboBox x:Name="BranchInput" SelectedItem="{Binding Branch, Mode=TwoWay}" ItemsSource="{Binding BranchSource, Mode=TwoWay}"
DisplayMemberPath="Name" TextSearch.TextPath="Name" DisplayMemberPath="Name" TextSearch.TextPath="Name"
Margin="82,10,10,10" Width="150" Grid.Column="1" HorizontalAlignment="Left"/> Margin="82,10,10,10" Width="150" Grid.Column="1" HorizontalAlignment="Left"/>

@ -297,8 +297,8 @@ namespace Elwig.Windows {
ViewModel.ControlButtonsVisibility = Visibility.Hidden; ViewModel.ControlButtonsVisibility = Visibility.Hidden;
} }
private new void DateInput_TextChanged(object sender, TextChangedEventArgs evt) { private void ScheduleDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
base.DateInput_TextChanged(sender, evt); DateInput_TextChanged(sender, evt);
if (ViewModel.Date is DateOnly date) { if (ViewModel.Date is DateOnly date) {
ViewModel.AncmtToDate = date.AddDays(-2); ViewModel.AncmtToDate = date.AddDays(-2);
} }