Обновление проекта (Вывод задач)

esoft/Entities/esoftModel.Context.cs

@@ -16,17 +16,26 @@ namespace esoft.Entities
     public partial class esoftEntities : DbContext
     {
 
+        private static esoftEntities _context;
+
         public esoftEntities()
             : base("name=esoftEntities")
         {
         }
+
+        public static esoftEntities GetContext()
+        {
+            if (_context == null)
+                _context = new esoftEntities();
+            
+            return _context;
+        }
     
         protected override void OnModelCreating(DbModelBuilder modelBuilder)
         {
             throw new UnintentionalCodeFirstException();
         }
-
-
+    
         public virtual DbSet<Executor> Executor { get; set; }
         public virtual DbSet<Manager> Manager { get; set; }
         public virtual DbSet<sysdiagrams> sysdiagrams { get; set; }

esoft/Entities/esoftModel.edmx.diagram

@@ -4,7 +4,7 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="e33b8bc406474395a40caa7ca1e1fe61" Name="Diagram1" ZoomLevel="74">
+      <Diagram DiagramId="e33b8bc406474395a40caa7ca1e1fe61" Name="Diagram1" ZoomLevel="111">
         <EntityTypeShape EntityType="esoftModel.Executor" Width="1.5" PointX="6.375" PointY="2.25" IsExpanded="true" />
         <EntityTypeShape EntityType="esoftModel.Manager" Width="1.5" PointX="6.375" PointY="5.625" IsExpanded="true" />
         <EntityTypeShape EntityType="esoftModel.sysdiagrams" Width="1.5" PointX="9.125" PointY="6.25" IsExpanded="true" />

esoft/MainWindow.xaml.cs

@@ -30,7 +30,7 @@ namespace esoft
             PreviewKeyDown += (s, e) => { if (e.Key == Key.F12) Application.Current.MainWindow.WindowState = WindowState.Maximized; };
 
             //Открытие страницы LoginPage при запуске программы
-            FrameMain.Navigate(new Pages.AddEditServicePage());
+            FrameMain.Navigate(new Pages.ServicesPage());
 
         }
 

esoft/Pages/AddEditServicePage.xaml

@@ -37,20 +37,39 @@
 
                     <Separator Height="10" Background="{x:Null}" />
 
-                    <StackPanel Orientation="Horizontal" Width="480" HorizontalAlignment = "Left">
-                        <Separator Width="20" Background="{x:Null}"/>
-                        <TextBlock Style="{StaticResource BlockCommon}" Text="ФИО исполнителя:" FontSize="20"></TextBlock>
-                        <Separator Width="5" Background="{x:Null}" />
-                        <ComboBox Name="cbExecutor" Width="276" Height="20"></ComboBox>
+                    <StackPanel Orientation="Horizontal" Width="700" HorizontalAlignment = "Left">
+                        <StackPanel Orientation="Horizontal" Width="480" HorizontalAlignment = "Left">
+                            <Separator Width="20" Background="{x:Null}"/>
+                            <TextBlock Style="{StaticResource BlockCommon}" Text="ФИО исполнителя:" FontSize="20"></TextBlock>
+                            <Separator Width="5" Background="{x:Null}" />
+                            <ComboBox Name="cbExecutor" Width="276" Height="20" DisplayMemberPath="ID"></ComboBox>
+                        </StackPanel>
+                        
+                        <Separator Width="17" Background="{x:Null}" />
+                        
+                        <StackPanel Orientation="Horizontal" Width="200">
+                            <TextBlock Style="{StaticResource BlockCommon}" Text="Крайний срок:" FontSize="20"></TextBlock>
+                        </StackPanel>
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Width="480" HorizontalAlignment = "Left">
-                        <Separator Width="20" Background="{x:Null}"/>
-                        <TextBlock Style="{StaticResource BlockCommon}" Text="ФИО менеджера:" FontSize="20"></TextBlock>
+                    <Separator Height="0" Background="{x:Null}" />
+
+                    <StackPanel Orientation="Horizontal" Width="700" HorizontalAlignment = "Left">
+                        <StackPanel Orientation="Horizontal" Width="480" HorizontalAlignment = "Left">
+                            <Separator Width="20" Background="{x:Null}"/>
+                            <TextBlock Style="{StaticResource BlockCommon}" Text="ФИО менеджера:" FontSize="20"></TextBlock>
+                            <Separator Width="17" Background="{x:Null}" />
+                            <ComboBox Name="cbManager" Width="276" Height="20" DisplayMemberPath="ID"></ComboBox>
+                        </StackPanel>
+                        
                         <Separator Width="17" Background="{x:Null}" />
-                        <ComboBox Name="cbManager" Width="276" Height="20"></ComboBox>
+                        
+                        <StackPanel Orientation="Horizontal" Width="200">
+                            <DatePicker Name="DPickerDateDeadLine" Background="White" Height="25" FontSize="14" Width="190" />
+                        </StackPanel>
                     </StackPanel>
 
+
                     <Separator Height="10" Background="{x:Null}" />
 
                     <StackPanel Orientation="Horizontal" Width="480" HorizontalAlignment = "Left">
@@ -96,11 +115,21 @@
 
                     <Separator Height="10" Background="{x:Null}" />
 
-                    <StackPanel Orientation="Horizontal" Width="480" HorizontalAlignment = "Left">
-                        <Separator Width="20" Background="{x:Null}"/>
-                        <TextBlock Style="{StaticResource BlockCommon}" Text="Описание:" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Top"></TextBlock>
-                        <Separator Width="20" Background="{x:Null}" />
-                        <TextBox x:Name="TBoxDescription" Width="336" Height="65" TextWrapping="Wrap" AcceptsReturn="True"></TextBox>
+                    <StackPanel Orientation="Horizontal" Width="700" HorizontalAlignment = "Left">
+                        <StackPanel Orientation="Horizontal" Width="480" HorizontalAlignment = "Left">
+                            <Separator Width="20" Background="{x:Null}"/>
+                            <TextBlock Style="{StaticResource BlockCommon}" Text="Описание:" FontSize="20" HorizontalAlignment="Left" VerticalAlignment="Top"></TextBlock>
+                            <Separator Width="20" Background="{x:Null}" />
+                            <TextBox x:Name="TBoxDescription" Width="336" Height="65" TextWrapping="Wrap" AcceptsReturn="True"></TextBox>
+                        </StackPanel>
+
+                        <Button Grid.Row="3" Name="BtnSaveTask" Content="Сохранить" Width="191" Height="NaN" BorderThickness="0" Style="{StaticResource  StandartButtons}" Margin="16,10,0,15" Click ="BtnSaveTask_Click">
+                            <Button.Resources>
+                                <Style TargetType="Border">
+                                    <Setter Property="CornerRadius" Value="10"/>
+                                </Style>
+                            </Button.Resources>
+                        </Button>
                     </StackPanel>
 
                 </StackPanel>

esoft/Pages/AddEditServicePage.xaml.cs

@@ -25,6 +25,13 @@ namespace esoft.Pages
         public AddEditServicePage()
         {
             InitializeComponent();
+            cbExecutor.ItemsSource = esoftEntities.GetContext().Executor.ToList();
+            cbManager.ItemsSource = esoftEntities.GetContext().Manager.ToList();
+        }
+
+        private void BtnSaveTask_Click(object sender, RoutedEventArgs e)
+        {
+
         }
     }
 }

esoft/Pages/ServicesPage.xaml

@@ -38,39 +38,34 @@
         </StackPanel>
         <TextBlock Grid.Row="1" Width="auto" FontWeight="Bold" Name="BlockRecords"/>
 
-        <DataGrid x:Name="DGridTask" Width="1850" Height="790" HorizontalAlignment="Center" VerticalAlignment="Top" Grid.Row="2">
+        <DataGrid x:Name="DGridTask" Width="1850" Height="790" HorizontalAlignment="Center" VerticalAlignment="Top" Grid.Row="2" FontSize="25" AutoGenerateColumns="False" IsReadOnly="True">
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Название задачи" Binding="{Binding Title}" Width="*"></DataGridTextColumn>
-
-                <DataGridTemplateColumn Header="Дата задачи" Width="*">
+                <DataGridTextColumn Header="Название задачи" Binding="{Binding Title}" Width="750"></DataGridTextColumn>
+                <DataGridTextColumn Header="Дата задачи" Binding="{Binding CreateDateTime, StringFormat=\{0:dd.MM.yyyy\}}" Width="160"></DataGridTextColumn>
+                <DataGridTextColumn Header="Исполнитель" Binding="{Binding ExecutorID}" Width="331"></DataGridTextColumn>
+                <DataGridTextColumn Header="Менеджер" Binding="{Binding Executor.ManagerID}" Width="331"></DataGridTextColumn>
+                <DataGridTextColumn Header="Статус" Binding="{Binding Status}" Width="220"></DataGridTextColumn>
+                
+                <DataGridTemplateColumn Width="50">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <DatePicker Name="DPickerDateCreate" Background="White" Height="20" FontSize="10" />
+                            <Button x:Name="BtnEdit" Content="📝" Click="BtnEdit_Click" BorderThickness="0" Background="#b3faff"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-
-                <DataGridTemplateColumn Header="Исполнитель" Width="*">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox Name="cbExecutor" Width="276" Height="20"></ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-
-                <DataGridTemplateColumn Header="Менеджер" Width="*">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <ComboBox Name="cbExecutor" Width="276" Height="20"></ComboBox>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
-
             </DataGrid.Columns>
 
         </DataGrid>
 
-        <Button Grid.Row="3" HorizontalAlignment="Left" Name="BtnAddService" Content="Добавить задачу" Width="196" Height="NaN" BorderThickness="0" Style="{StaticResource  StandartButtons}" Margin="1650,10,0,15">
+        <Button Grid.Row="3" HorizontalAlignment="Left" Name="BtnDeleteTask" Content="Удалить задачу" Width="196" Height="NaN" BorderThickness="0" Style="{StaticResource  StandartButtons}" Margin="1650,10,0,15" Click="BtnDeleteTask_Click">
+            <Button.Resources>
+                <Style TargetType="Border">
+                    <Setter Property="CornerRadius" Value="10"/>
+                </Style>
+            </Button.Resources>
+        </Button>
+
+        <Button Grid.Row="3" HorizontalAlignment="Left" Name="BtnAddTask" Content="Добавить задачу" Width="196" Height="NaN" BorderThickness="0" Style="{StaticResource  StandartButtons}" Margin="1420,10,0,15" Click="BtnAddTask_Click">
             <Button.Resources>
                 <Style TargetType="Border">
                     <Setter Property="CornerRadius" Value="10"/>

esoft/Pages/ServicesPage.xaml.cs

@@ -1,6 +1,8 @@
-using System;
+using esoft.Entities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
@@ -23,6 +25,22 @@ namespace esoft.Pages
         public ServicesPage()
         {
             InitializeComponent();
+            DGridTask.ItemsSource = esoftEntities.GetContext().Task.ToList();
+        }
+
+        private void BtnEdit_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void BtnAddTask_Click(object sender, RoutedEventArgs e)
+        {
+            NavigationService.Navigate(new AddEditServicePage());
+        }
+
+        private void BtnDeleteTask_Click(object sender, RoutedEventArgs e)
+        {
+
         }
     }
 }

esoft/esoft.csproj

@@ -195,6 +195,7 @@
       <DependentUpon>esoftModel.edmx</DependentUpon>
       <LastGenOutput>esoftModel.cs</LastGenOutput>
     </Content>
+    <Resource Include="Images\edit.png" />
     <Resource Include="Images\esoft.ico" />
     <Resource Include="Images\esoft logo.png" />
   </ItemGroup>