|
@@ -83,7 +83,7 @@ |
|
|
<ItemsControl Background="#D7D7D7" ItemsSource="{Binding orderStatusLists}"> |
|
|
<ItemsControl Background="#D7D7D7" ItemsSource="{Binding orderStatusLists}"> |
|
|
<ItemsControl.ItemTemplate> |
|
|
<ItemsControl.ItemTemplate> |
|
|
<DataTemplate> |
|
|
<DataTemplate> |
|
|
<Border CornerRadius="10" Height="60" Margin="0,10,0,0" Background="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"> |
|
|
|
|
|
|
|
|
<Border CornerRadius="10" Height="60" Margin="0,10,0,0" BorderBrush="Black" BorderThickness="5" Background="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"> |
|
|
<Grid > |
|
|
<Grid > |
|
|
<Grid.ColumnDefinitions> |
|
|
<Grid.ColumnDefinitions> |
|
|
<ColumnDefinition Width="*"/> |
|
|
<ColumnDefinition Width="*"/> |
|
@@ -122,7 +122,7 @@ |
|
|
<ItemsControl Background="#D7D7D7" ItemsSource="{Binding WaitTakeMeal,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"> |
|
|
<ItemsControl Background="#D7D7D7" ItemsSource="{Binding WaitTakeMeal,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"> |
|
|
<ItemsControl.ItemTemplate> |
|
|
<ItemsControl.ItemTemplate> |
|
|
<DataTemplate> |
|
|
<DataTemplate> |
|
|
<Border CornerRadius="10" Height="60" Margin="0,10,0,0" Background="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"> |
|
|
|
|
|
|
|
|
<Border CornerRadius="10" Height="60" Margin="0,10,0,0" BorderBrush="Black" BorderThickness="5" Background="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"> |
|
|
<Grid > |
|
|
<Grid > |
|
|
<Grid.ColumnDefinitions> |
|
|
<Grid.ColumnDefinitions> |
|
|
<ColumnDefinition Width="*"/> |
|
|
<ColumnDefinition Width="*"/> |
|
@@ -160,7 +160,7 @@ |
|
|
<ItemsControl Background="#D7D7D7" ItemsSource="{Binding history,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"> |
|
|
<ItemsControl Background="#D7D7D7" ItemsSource="{Binding history,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"> |
|
|
<ItemsControl.ItemTemplate> |
|
|
<ItemsControl.ItemTemplate> |
|
|
<DataTemplate> |
|
|
<DataTemplate> |
|
|
<Border CornerRadius="10" Height="60" Margin="0,10,0,0" Background="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"> |
|
|
|
|
|
|
|
|
<Border CornerRadius="10" Height="60" Margin="0,10,0,0" BorderThickness="5" BorderBrush="Black" Background="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"> |
|
|
<Grid > |
|
|
<Grid > |
|
|
<Grid.ColumnDefinitions> |
|
|
<Grid.ColumnDefinitions> |
|
|
<ColumnDefinition Width="*"/> |
|
|
<ColumnDefinition Width="*"/> |
|
|