Praktika_05_04

Esoft/Esoft.csproj

@@ -101,6 +101,9 @@
     <Compile Include="Pages\Diagram.xaml.cs">
       <DependentUpon>Diagram.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\ExecutorList.xaml.cs">
+      <DependentUpon>ExecutorList.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\General.xaml.cs">
       <DependentUpon>General.xaml</DependentUpon>
     </Compile>
@@ -144,6 +147,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\ExecutorList.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\General.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

Esoft/MainWindow.xaml

@@ -59,10 +59,10 @@
                     </Grid>
                 </Button>
                 <Separator Height="20" Background="Transparent"/>
-                <Button Name="ExecutorList" Style="{DynamicResource NaviButtons}" Width="281">
+                <Button Name="ExecutorList" Style="{DynamicResource NaviButtons}" Click="ExecutorList_Click">
                     <Grid Width="280">
-                        <TextBlock Text="Исполнители" Style="{StaticResource Text_Style}" FontFamily="Arial Black" Margin="49,0,0,0" Width="244"/>
-                        <Image Source="/Resources/EmployeeList.png" Style="{StaticResource ImageStyle}" Margin="-2,0,0,0"/>
+                    <TextBlock Text="Исполнители" Style="{StaticResource Text_Style}" FontFamily="Arial Black"/>
+                    <Image Source="/Resources/EmployeeList.png" Style="{StaticResource ImageStyle}"/>
                     </Grid>
                 </Button>
                 <Separator Height="20" Background="Transparent"/>

Esoft/MainWindow.xaml.cs

@@ -101,7 +101,10 @@ namespace Esoft
         {
             MainFrame.Navigate(new Pages.TaskList());
         }
-
+        private void ExecutorList_Click(object sender, RoutedEventArgs e)
+        {
+            MainFrame.Navigate(new Pages.ExecutorList());
+        }
         private void Chart_Click(object sender, RoutedEventArgs e)
         {
             //MainFrame.Navigate(new Pages.Chart());

Esoft/Pages/AddTask.xaml

@@ -9,7 +9,7 @@
       Title="AddTask">
 
     <Grid>
-        <Label Style="{StaticResource LabelStyle}" FontFamily="Segoe UI Black">
+        <Label Style="{StaticResource LabelStyle}" FontFamily="Segoe UI Black" Background="#FFDAB3F7">
            
         </Label>
 

Esoft/Pages/Authorization.xaml

@@ -8,11 +8,11 @@
       Height="445" Width="720"
         ResizeMode="NoResize"
       
-                  Title="Авторизация в Esoft" Background="#b3deff">
+                  Title="Авторизация в Esoft" Background="#FFDBBCED">
 
     <Grid x:Name="grid" Cursor="">
 
-        <Label Style="{StaticResource LabelStyle}" Margin="263,86,237,0" VerticalAlignment="Top" Height="51" BorderBrush="#FF25AFD2" Content="АВТОРИЗАЦИЯ" FontSize="40">
+        <Label Style="{StaticResource LabelStyle}" Margin="264,106,192,0" VerticalAlignment="Top" Height="37" BorderBrush="#FF25AFD2" Content="АВТОРИЗАЦИЯ" FontSize="40">
             <Label.OpacityMask>
                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                     <GradientStop Color="Black"/>
@@ -31,13 +31,13 @@
 
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,80,10,10">
             <StackPanel Orientation="Vertical">
-                <TextBox Name="TBoxLogin" Tag="Логин" Style="{DynamicResource TextBoxStyle}"/>
+                <TextBox Name="TBoxLogin" Tag="Логин" Style="{DynamicResource TextBoxStyle}" Background="#FFAEDAFD"/>
                 <Separator Height="15" Visibility="Hidden"/>
-                <TextBox Name="TBoxPassword" Tag="Пароль" Style="{DynamicResource TextBoxStyle}"/>
+                <TextBox Name="TBoxPassword" Tag="Пароль" Style="{DynamicResource TextBoxStyle}" Background="#FFAEDBFF"/>
             </StackPanel>
             <Separator Height="15" Visibility="Hidden"/>
             <StackPanel>
-                <Button Name="BtnLogin" Content="Войти" Style="{DynamicResource AuthoButtons}" Click="BtnLogin_Click" Foreground="#FF1414A9"/>
+                <Button Name="BtnLogin" Content="Войти" Style="{DynamicResource AuthoButtons}" Click="BtnLogin_Click" Foreground="#FF1414A9" Background="#FFC356ED"/>
             </StackPanel>
 
         </StackPanel>

Esoft/Pages/ExecutorList.xaml

@@ -0,0 +1,45 @@
+<Page x:Class="Esoft.Pages.ExecutorList"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Esoft.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="ExecutorList">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="30"/>
+            <RowDefinition Height="30"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.RowSpan="2" Width="725">
+
+
+            <Separator Background="Transparent" BorderThickness="0" Width="7"/>
+            <!--<ComboBox Margin="5" Padding="6 5" Width="200" Height="40" Name="CmbExecutorSort" FontSize="20" DisplayMemberPath="" SelectedValuePath="ID" Text="{Binding ExecutorID}" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" />-->
+
+            <Separator Background="Transparent" BorderThickness="0" Width="7"/>
+
+            <Separator Background="Transparent" BorderThickness="0" Width="7"/>
+
+        </StackPanel>
+        <DataGrid RowStyle="{DynamicResource DataGridRowStyle1}" ColumnHeaderStyle="{DynamicResource DataGridColumnHeaderStyle1}" Style="{DynamicResource DataGridStyle1}" Grid.Row="2" x:Name="DGTasks" AutoGenerateColumns="False" IsReadOnly="True" ItemsSource="{Binding}" RenderTransformOrigin="0.5,0.5" Margin="10,0,12,45" Background="#FFDDB3FB">
+            <DataGrid.Columns>
+                
+                <DataGridTextColumn Header="Исполнители" Binding="{Binding Executor.User.MiddleName}" Width="2000"/>
+                <DataGridTemplateColumn Width="0">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            
+                            
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+            </DataGrid.Columns>
+        </DataGrid>
+
+    </Grid>
+</Page>
+

Esoft/Pages/ExecutorList.xaml.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Esoft.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для ExecutorList.xaml
+    /// </summary>
+    public partial class ExecutorList : System.Windows.Controls.Page
+    {
+        private user6Entities _context = new user6Entities();
+        //private List<string> listUsers = new List<string>();
+        public ExecutorList()
+        {
+            InitializeComponent();
+
+  
+            //CmbExecutorSort.ItemsSource = user6Entities.GetContext().Executor.ToList();
+
+
+            DGTasks.ItemsSource = user6Entities.GetContext().Task.ToList();
+
+            //foreach (var user in _context.User.ToList())
+            //{
+            //    listUsers.Add(user.getFamilia());
+            //}
+            //CmbExecutorSort.ItemsSource = listUsers;
+
+        }
+    }
+}
+
+

Esoft/Pages/General.xaml

@@ -8,7 +8,7 @@
       d:DesignHeight="630" d:DesignWidth="820"
       Title="General">
 
-    <Grid>
+    <Grid Background="#FFCC71F9">
         <TextBlock FontSize="50" VerticalAlignment="Center" Text="Цель проекта – помочь компаниям адаптироваться к изменениям в бизнес-среде и сэкономить на автоматизации с помощью программных решений." Style="{StaticResource BlockHeader}" TextWrapping="Wrap" Width="780" FontFamily="Arial Black"/>
     </Grid>
 </Page>

Esoft/Pages/TaskList.xaml

@@ -33,7 +33,7 @@
             </Button>
 
         </StackPanel>
-        <DataGrid RowStyle="{DynamicResource DataGridRowStyle1}" ColumnHeaderStyle="{DynamicResource DataGridColumnHeaderStyle1}" Style="{DynamicResource DataGridStyle1}" Grid.Row="2" x:Name="DGTasks" AutoGenerateColumns="False" IsReadOnly="True" ItemsSource="{Binding}" RenderTransformOrigin="0.5,0.5" Margin="10,0,12,45">
+        <DataGrid RowStyle="{DynamicResource DataGridRowStyle1}" ColumnHeaderStyle="{DynamicResource DataGridColumnHeaderStyle1}" Style="{DynamicResource DataGridStyle1}" Grid.Row="2" x:Name="DGTasks" AutoGenerateColumns="False" IsReadOnly="True" ItemsSource="{Binding}" RenderTransformOrigin="0.5,0.5" Margin="10,0,12,45" Background="#FFDDB3FB">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Задача" Binding="{Binding Title}" Width="320"/>
                 <DataGridTextColumn Header="Статус" Binding="{Binding Status}" Width="80"/>