winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

DeliveryAncmtAdminWindow: Mark cancelled schedules with Strikethrough
All checks were successful
Test / Run tests (push) Successful in 1m38s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-09-17 23:06:18 +02:00
parent 871bc299bd
commit 74200083ab
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Elwig/Models/Entities/DeliverySchedule.cs
View File

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Linq; using System.Linq;
using System.Windows;
namespace Elwig.Models.Entities { namespace Elwig.Models.Entities {
[Table("delivery_schedule"), PrimaryKey("Year", "DsNr")] [Table("delivery_schedule"), PrimaryKey("Year", "DsNr")]
@ -47,6 +48,8 @@ namespace Elwig.Models.Entities {
[Column("cancelled")] [Column("cancelled")]
public bool IsCancelled { get; set; } public bool IsCancelled { get; set; }
[NotMapped]
public TextDecorationCollection? TextDecoration => IsCancelled ? TextDecorations.Strikethrough : null;
[Column("ancmt_from")] [Column("ancmt_from")]
public long? AncmtFromUnix { get; set; } public long? AncmtFromUnix { get; set; }

4
Elwig/Windows/DeliveryAncmtAdminWindow.xaml
View File

@ -129,7 +129,7 @@
<TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="24"/> <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="24"/>
<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" TextDecorations="{Binding TextDecoration}"/>
<TextBlock TextAlignment="Right"> <TextBlock TextAlignment="Right">
<TextBlock Text="{Binding AnnouncedWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg <TextBlock Text="{Binding AnnouncedWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg
/ <TextBlock Text="{Binding MaxWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg / <TextBlock Text="{Binding MaxWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg
@ -288,7 +288,7 @@
<TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="28"/> <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="28"/>
<TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="35"/> <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="35"/>
<TextBlock Text="{Binding ZwstId}" Width="30" TextAlignment="Center"/> <TextBlock Text="{Binding ZwstId}" Width="30" TextAlignment="Center"/>
<TextBlock Text="{Binding Description}"/> <TextBlock Text="{Binding Description}" TextDecorations="{Binding TextDecoration}"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>