|
@@ -14,8 +14,8 @@
|
|
<RowDefinition Height="*"></RowDefinition>
|
|
<RowDefinition Height="*"></RowDefinition>
|
|
</Grid.RowDefinitions>
|
|
</Grid.RowDefinitions>
|
|
|
|
|
|
- <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="50">
|
|
|
|
- <ComboBox Margin="5" Width="200" Height="25" Name="cbManager" DisplayMemberPath="" FontSize="16" SelectionChanged="cbStatus_SelectionChanged"/>
|
|
|
|
|
|
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="50" Margin="0,0,0,-13">
|
|
|
|
+ <ComboBox Margin="5" Width="200" Height="25" Name="cbManager" DisplayMemberPath="" FontSize="16" SelectionChanged="cbManager_SelectionChanged" />
|
|
<ComboBox Margin="5" Width="200" Height="25" Name="cbExecutor" DisplayMemberPath="" FontSize="16" SelectionChanged="cbExecutor_SelectionChanged"/>
|
|
<ComboBox Margin="5" Width="200" Height="25" Name="cbExecutor" DisplayMemberPath="" FontSize="16" SelectionChanged="cbExecutor_SelectionChanged"/>
|
|
<ComboBox Margin="5" Width="200" Height="25" Name="cbStatus" FontSize="16" DisplayMemberPath="Name" SelectionChanged="cbStatus_SelectionChanged"/>
|
|
<ComboBox Margin="5" Width="200" Height="25" Name="cbStatus" FontSize="16" DisplayMemberPath="Name" SelectionChanged="cbStatus_SelectionChanged"/>
|
|
<Button Height="25" Name="btnClearFilter" Content="Очистка фильтра" Width="200" Margin ="5" FontSize="16" Click="btnClearFilter_Click"/>
|
|
<Button Height="25" Name="btnClearFilter" Content="Очистка фильтра" Width="200" Margin ="5" FontSize="16" Click="btnClearFilter_Click"/>
|
|
@@ -24,40 +24,36 @@
|
|
<StackPanel Background="#e6e6e6" Margin="0,15,0,0" Grid.Row="1">
|
|
<StackPanel Background="#e6e6e6" Margin="0,15,0,0" Grid.Row="1">
|
|
<TextBlock Text="Название задачи" FontSize="26" Margin="35, 15, 0, 0" VerticalAlignment ="Center" FontWeight="Bold"></TextBlock>
|
|
<TextBlock Text="Название задачи" FontSize="26" Margin="35, 15, 0, 0" VerticalAlignment ="Center" FontWeight="Bold"></TextBlock>
|
|
<TextBlock Text="Дата создания задачи" Margin="800, -35, 0, 0" FontSize="26" VerticalAlignment ="Center" FontWeight="Bold"></TextBlock>
|
|
<TextBlock Text="Дата создания задачи" Margin="800, -35, 0, 0" FontSize="26" VerticalAlignment ="Center" FontWeight="Bold"></TextBlock>
|
|
- <TextBlock Text="Исполнитель" HorizontalAlignment="Center" Margin="600, -35, 0, 0" VerticalAlignment ="Center" FontSize="26" FontWeight="Bold"></TextBlock>
|
|
|
|
- <TextBlock Text="Менеджер" HorizontalAlignment="Center" Margin="1100, -35, 0, 0" VerticalAlignment ="Center" FontSize="26" FontWeight="Bold"></TextBlock>
|
|
|
|
- <TextBlock Text="Статус" HorizontalAlignment="Right" Margin="0, -35, 125, 0" VerticalAlignment ="Center" FontSize="26" FontWeight="Bold"></TextBlock>
|
|
|
|
|
|
+ <TextBlock Text="Исполнитель" HorizontalAlignment="Center" Margin="550, -35, 0, 0" VerticalAlignment ="Center" FontSize="26" FontWeight="Bold"></TextBlock>
|
|
|
|
+ <TextBlock Text="Менеджер" HorizontalAlignment="Center" Margin="1065, -35, 0, 0" VerticalAlignment ="Center" FontSize="26" FontWeight="Bold"></TextBlock>
|
|
|
|
+ <TextBlock Text="Статус" HorizontalAlignment="Right" Margin="0, -35, 170, 0" VerticalAlignment ="Center" FontSize="26" FontWeight="Bold"></TextBlock>
|
|
</StackPanel>
|
|
</StackPanel>
|
|
|
|
|
|
- <ListView Grid.Row="1" Name="LViewTask" Height="720" Width="1900" HorizontalAlignment="Center" VerticalAlignment="Top" Background="{x:Null}" BorderBrush="{x:Null}" Margin="0,83,0,0">
|
|
|
|
-
|
|
|
|
- <ListView.ItemTemplate>
|
|
|
|
- <DataTemplate>
|
|
|
|
- <Grid HorizontalAlignment="Center" Width="1900" Height="109">
|
|
|
|
-
|
|
|
|
- <TextBlock Text="{Binding Title}" FontSize="26" Margin="50, 0, 0, 0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="750" TextWrapping="Wrap"></TextBlock>
|
|
|
|
- <TextBlock Text="{Binding CreateDateTime, StringFormat='{}{0:dd MMMM yyyy г.}', ConverterCulture='ru-RU'}" Margin="800, 32, 0, 0" FontSize="26"></TextBlock>
|
|
|
|
- <TextBlock Text="{Binding FioUser}" HorizontalAlignment="Center" Margin="600, 0, 0, 0" VerticalAlignment ="Center" FontSize="26"></TextBlock>
|
|
|
|
- <TextBlock Text="{Binding FioManager}" HorizontalAlignment="Center" Margin="1100, 0, 0, 0" VerticalAlignment ="Center" FontSize="26"></TextBlock>
|
|
|
|
- <TextBlock Text="{Binding Status}" Margin="1670, 0, 0, 0" VerticalAlignment ="Center" FontSize="26"></TextBlock>
|
|
|
|
-
|
|
|
|
- </Grid>
|
|
|
|
- </DataTemplate>
|
|
|
|
- </ListView.ItemTemplate>
|
|
|
|
-
|
|
|
|
|
|
+ <ListView Grid.Row="1" Name="LViewTask" Height="720" Width="1900" HorizontalAlignment="Center" VerticalAlignment="Top" Background="{x:Null}" BorderBrush="{x:Null}" Margin="0,83,0,0" Loaded="LViewTask_Loaded" MouseDoubleClick="LViewTask_MouseDoubleClick">
|
|
<ListView.ItemContainerStyle>
|
|
<ListView.ItemContainerStyle>
|
|
<Style TargetType="ListViewItem">
|
|
<Style TargetType="ListViewItem">
|
|
-
|
|
|
|
- <Setter Property= "Width" Value="1870"/>
|
|
|
|
|
|
+ <Setter Property="Margin" Value="0,0,0,10"/>
|
|
|
|
+ <Setter Property="Width" Value="1870"/>
|
|
<Setter Property="Background" Value="#99d3ff"/>
|
|
<Setter Property="Background" Value="#99d3ff"/>
|
|
<Style.Resources>
|
|
<Style.Resources>
|
|
<Style TargetType="Border">
|
|
<Style TargetType="Border">
|
|
<Setter Property="CornerRadius" Value="30"/>
|
|
<Setter Property="CornerRadius" Value="30"/>
|
|
</Style>
|
|
</Style>
|
|
</Style.Resources>
|
|
</Style.Resources>
|
|
-
|
|
|
|
</Style>
|
|
</Style>
|
|
</ListView.ItemContainerStyle>
|
|
</ListView.ItemContainerStyle>
|
|
|
|
+
|
|
|
|
+ <ListView.ItemTemplate>
|
|
|
|
+ <DataTemplate>
|
|
|
|
+ <Grid HorizontalAlignment="Center" Width="1900" Height="109">
|
|
|
|
+ <TextBlock Text="{Binding Title}" FontSize="26" Margin="50, 0, 0, 0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="750" TextWrapping="Wrap"></TextBlock>
|
|
|
|
+ <TextBlock Text="{Binding CreateDateTime, StringFormat='{}{0:dd MMMM yyyy г.}', ConverterCulture='ru-RU'}" Margin="800, 32, 0, 0" FontSize="26"></TextBlock>
|
|
|
|
+ <TextBlock Text="{Binding FioUser}" Margin="1150, 0, 0, 0" VerticalAlignment="Center" FontSize="26"></TextBlock>
|
|
|
|
+ <TextBlock Text="{Binding FioManager}" Margin="1425, 0, 0, 0" VerticalAlignment="Center" FontSize="26"></TextBlock>
|
|
|
|
+ <TextBlock Text="{Binding Status}" Margin="1670, 0, 0, 0" VerticalAlignment="Center" FontSize="26"></TextBlock>
|
|
|
|
+ </Grid>
|
|
|
|
+ </DataTemplate>
|
|
|
|
+ </ListView.ItemTemplate>
|
|
</ListView>
|
|
</ListView>
|
|
|
|
|
|
<Button Grid.Row="3" HorizontalAlignment="Left" Name="BtnDeleteTask" Content="Удалить задачу" Width="196" Height="40" BorderThickness="0" Style="{StaticResource StandartButtons}" Margin="1650,820,0,15" Click="BtnDeleteTask_Click">
|
|
<Button Grid.Row="3" HorizontalAlignment="Left" Name="BtnDeleteTask" Content="Удалить задачу" Width="196" Height="40" BorderThickness="0" Style="{StaticResource StandartButtons}" Margin="1650,820,0,15" Click="BtnDeleteTask_Click">
|