Procházet zdrojové kódy

Выпадающий список

Antonov před 2 roky
rodič
revize
5aac746c75
5 změnil soubory, kde provedl 109 přidání a 79 odebrání
  1. 1 1
      LR1/App.config
  2. 1 0
      LR1/LR1.csproj
  3. 23 0
      LR1/Model/ListTitle.cs
  4. 83 77
      LR1/Workers.xaml
  5. 1 1
      LR1/Workers.xaml.cs

+ 1 - 1
LR1/App.config

@@ -8,7 +8,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   </startup>
   <connectionStrings>
   <connectionStrings>
-    <add name="WorkersEntities" connectionString="metadata=res://*/Entities.TitleWorkers.csdl|res://*/Entities.TitleWorkers.ssdl|res://*/Entities.TitleWorkers.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=VPMT.RU,61134;initial catalog=Workers;user id=user1;password=user1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+    <add name="WorkersEntities" connectionString="metadata=res://*/Entities.TitleWorkers.csdl|res://*/Entities.TitleWorkers.ssdl|res://*/Entities.TitleWorkers.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=srv-wsr\is20;initial catalog=Workers;user id=user1;password=user1;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
   </connectionStrings>
   </connectionStrings>
   <entityFramework>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">

+ 1 - 0
LR1/LR1.csproj

@@ -89,6 +89,7 @@
     <Compile Include="MainPage.xaml.cs">
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
     </Compile>
+    <Compile Include="Model\ListTitle.cs" />
     <Compile Include="Workers.xaml.cs">
     <Compile Include="Workers.xaml.cs">
       <DependentUpon>Workers.xaml</DependentUpon>
       <DependentUpon>Workers.xaml</DependentUpon>
     </Compile>
     </Compile>

+ 23 - 0
LR1/Model/ListTitle.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using LR1.Entities;
+using LR1.Model;
+
+namespace LR1.Model
+{
+    public class ListTitle:ObservableCollection<Title>
+    {
+        public ListTitle()
+        {
+            var queryTitle = from title in Workers.DataEntitiesEmployee.Titles select title;
+            foreach (Title titl in queryTitle)
+            {
+                this.Add(titl);
+            }
+        }
+    }
+}

+ 83 - 77
LR1/Workers.xaml

@@ -1,77 +1,83 @@
-<Page x:Class="LR1.Workers"
-      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:LR1"
-      xmlns:command="clr-namespace:LR1.Commands"
-      mc:Ignorable="d" 
-      d:DesignHeight="500" d:DesignWidth="800"
-      Title="Workers" Loaded="Page_Loaded">
-
-    <Grid Background="{DynamicResource BackgroundStyle}">
-        <Menu Margin="0,10,0,0" Height="35" VerticalAlignment="Top" HorizontalAlignment="Center" Width="760">
-            <Menu.Background>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFD9D6D6" Offset="1"/>
-                    <GradientStop Color="White" Offset="0"/>
-                </LinearGradientBrush>
-            </Menu.Background>
-            <MenuItem Header="Действие" Height="35" Width="74" FontSize="14">
-                <MenuItem Header="Отменить" Command="Undo"/>
-                <Separator/>
-                <MenuItem Header="Создать" Command="command:DataCommands.Add"/>
-                <MenuItem Header="Редактировать" Command="command:DataCommands.Edit"/>
-                <MenuItem Header="Сохранить" Command="command:DataCommands.Save"/>
-                <MenuItem Header="Найти" Command="command:DataCommands.Find"/>
-                <Separator/>
-                <MenuItem Header="Удалить" Command="Delete"/>
-            </MenuItem>
-            <MenuItem Header="Отчет" FontSize="14"/>
-        </Menu>
-
-        <ToolBar HorizontalAlignment="Center" Height="35" Margin="0,50,0,0" VerticalAlignment="Top" Width="760">
-            <Button x:Name="Undo" Command="Undo" ToolTip="Отменить редактирование/создание" Height="27" Width="30">
-                <Image Source="Images\Undo.png" Style="{DynamicResource ImageStyle}"/>
-            </Button>
-            <Button x:Name="Add" Command="command:DataCommands.Add" ToolTip="Добавить/Создание" Height="27" Width="30">
-                <Image Source="Images\Add.png" Style="{DynamicResource ImageStyle}"/>
-            </Button>
-            <Button x:Name="Edit" Command="command:DataCommands.Edit" ToolTip="Изменить/Редактировать" Height="27" Width="30">
-                <Image Source="Images\Edit.png" Style="{DynamicResource ImageStyle}"/>
-            </Button>
-            <Button x:Name="Binocl" Command="command:DataCommands.Find" ToolTip="Поиск" Height="27" Width="30">
-                <Image Source="Images\Binocl.png" Style="{DynamicResource ImageStyle}"/>
-            </Button>
-            <Button x:Name="Save" Command="command:DataCommands.Save" ToolTip="Сохранить" Height="27" Width="30">
-                <Image Source="Images\Save.png" Style="{DynamicResource ImageStyle}"/>
-            </Button>
-            <Button x:Name="Delete" Command="Delete" ToolTip="Удалить" Height="27" Width="30">
-                <Image Source="Images\Delete.png" Style="{DynamicResource ImageStyle}"/>
-            </Button>
-
-        </ToolBar>
-        <DataGrid Margin="25,129,25,25" Name="DataGridEmployee" ItemsSource="{Binding}" AutoGenerateColumns="False" HorizontalAlignment="Left" 
-                  MaxWidth="1000" MaxHeight="295" RowBackground="#FFE6D3EF" AlternatingRowBackground="#FC96CFD4" BorderBrush="#FF1F33EB"
-                  BorderThickness="3" IsReadOnly="True" RowHeight="25" Cursor="Hand" CanUserAddRows="False" CanUserDeleteRows="False">
-            <DataGrid.Columns>
-                <DataGridTextColumn Header="Фамилия" Width="80" Binding="{Binding Surname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-                <DataGridTextColumn Header="Имя" Width="80" Binding="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-                <DataGridTextColumn Header="Отчество" Width="100" Binding="{Binding Patronymic, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-                <DataGridTextColumn Header="Должность" Width="90"/>
-                <DataGridTextColumn Header="Дата рождения" Width="110" Binding="{Binding BirstDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-                <DataGridTextColumn Header="Телефон" Width="120" Binding="{Binding Telephone, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-                <DataGridTextColumn Header="Электронная почта" Width="*" Binding="{Binding Email, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
-            </DataGrid.Columns>
-        </DataGrid>
-        <Label Style="{DynamicResource LabaelStyle}" Content="Список сотрудников" HorizontalAlignment="Left" Margin="25,90,0,0" VerticalAlignment="Top"/>
-    </Grid>
-    <Page.CommandBindings>
-        <CommandBinding Command="Undo" CanExecute="UndoCommandBinding_CanExecute" Executed="UndoCommandBinding_Executed"/>
-        <CommandBinding Command="Delete" CanExecute="DeleteCommandBinding_CanExecute" Executed="DeleteCommandBinding_Executed"/>
-        <CommandBinding Command="{x:Static command:DataCommands.Add}" CanExecute="AddCommandBinding_CanExecute" Executed="AddCommandBinding_Executed"/>
-        <CommandBinding Command="{x:Static command:DataCommands.Edit}" CanExecute="EditCommandBinding_CanExecute" Executed="EditCommandBinding_Executed"/>
-        <CommandBinding Command="{x:Static command:DataCommands.Find}" CanExecute="FindCommandBinding_CanExecute" Executed="FindCommandBinding_Executed"/>
-        <CommandBinding Command="{x:Static command:DataCommands.Save}" CanExecute="SaveCommandBinding_CanExecute" Executed="SaveCommandBinding_Executed"/>
-    </Page.CommandBindings>
-</Page>
+<Page x:Class="LR1.Workers"
+      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:LR1"
+      xmlns:command="clr-namespace:LR1.Commands"
+      xmlns:core ="clr-namespace:LR1.Model"
+      mc:Ignorable="d" 
+      d:DesignHeight="500" d:DesignWidth="800"
+      Title="Workers" Loaded="Page_Loaded">
+    <Page.Resources>
+        <core:ListTitle x:Key="ListTitle" />
+    </Page.Resources>

+
+    <Grid Background="{DynamicResource BackgroundStyle}">
+        <Menu Margin="0,10,0,0" Height="35" VerticalAlignment="Top" HorizontalAlignment="Center" Width="760">
+            <Menu.Background>
+                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                    <GradientStop Color="#FFD9D6D6" Offset="1"/>
+                    <GradientStop Color="White" Offset="0"/>
+                </LinearGradientBrush>
+            </Menu.Background>
+            <MenuItem Header="Действие" Height="35" Width="74" FontSize="14">
+                <MenuItem Header="Отменить" Command="Undo"/>
+                <Separator/>
+                <MenuItem Header="Создать" Command="command:DataCommands.Add"/>
+                <MenuItem Header="Редактировать" Command="command:DataCommands.Edit"/>
+                <MenuItem Header="Сохранить" Command="command:DataCommands.Save"/>
+                <MenuItem Header="Найти" Command="command:DataCommands.Find"/>
+                <Separator/>
+                <MenuItem Header="Удалить" Command="Delete"/>
+            </MenuItem>
+            <MenuItem Header="Отчет" FontSize="14"/>
+        </Menu>
+
+        <ToolBar HorizontalAlignment="Center" Height="35" Margin="0,50,0,0" VerticalAlignment="Top" Width="760">
+            <Button x:Name="Undo" Command="Undo" ToolTip="Отменить редактирование/создание" Height="27" Width="30">
+                <Image Source="Images\Undo.png" Style="{DynamicResource ImageStyle}"/>
+            </Button>
+            <Button x:Name="Add" Command="command:DataCommands.Add" ToolTip="Добавить/Создание" Height="27" Width="30">
+                <Image Source="Images\Add.png" Style="{DynamicResource ImageStyle}"/>
+            </Button>
+            <Button x:Name="Edit" Command="command:DataCommands.Edit" ToolTip="Изменить/Редактировать" Height="27" Width="30">
+                <Image Source="Images\Edit.png" Style="{DynamicResource ImageStyle}"/>
+            </Button>
+            <Button x:Name="Binocl" Command="command:DataCommands.Find" ToolTip="Поиск" Height="27" Width="30">
+                <Image Source="Images\Binocl.png" Style="{DynamicResource ImageStyle}"/>
+            </Button>
+            <Button x:Name="Save" Command="command:DataCommands.Save" ToolTip="Сохранить" Height="27" Width="30">
+                <Image Source="Images\Save.png" Style="{DynamicResource ImageStyle}"/>
+            </Button>
+            <Button x:Name="Delete" Command="Delete" ToolTip="Удалить" Height="27" Width="30">
+                <Image Source="Images\Delete.png" Style="{DynamicResource ImageStyle}"/>
+            </Button>
+
+        </ToolBar>
+        <DataGrid Margin="25,129,25,25" Name="DataGridEmployee" ItemsSource="{Binding}" AutoGenerateColumns="False" HorizontalAlignment="Left" 
+                  MaxWidth="1000" MaxHeight="295" RowBackground="#FFE6D3EF" AlternatingRowBackground="#FC96CFD4" BorderBrush="#FF1F33EB"
+                  BorderThickness="3" IsReadOnly="False" RowHeight="25" Cursor="Hand" CanUserAddRows="False" CanUserDeleteRows="False">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Фамилия" Width="80" Binding="{Binding Surname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                <DataGridTextColumn Header="Имя" Width="80" Binding="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                <DataGridTextColumn Header="Отчество" Width="100" Binding="{Binding Patronymic, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                <DataGridComboBoxColumn Header="Должность" Width="90" ItemsSource="{Binding Source={StaticResource ListTitle}}" 
+                                    DisplayMemberPath="Title1" SelectedValueBinding="{Binding Path=TitleID, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
+                                    SelectedValuePath="ID"/>
+                <DataGridTextColumn Header="Дата рождения" Width="110" Binding="{Binding BirstDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                <DataGridTextColumn Header="Телефон" Width="120" Binding="{Binding Telephone, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                <DataGridTextColumn Header="Электронная почта" Width="*" Binding="{Binding Email, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+            </DataGrid.Columns>
+        </DataGrid>
+        <Label Style="{DynamicResource LabaelStyle}" Content="Список сотрудников" HorizontalAlignment="Left" Margin="25,90,0,0" VerticalAlignment="Top"/>
+    </Grid>
+    <Page.CommandBindings>
+        <CommandBinding Command="Undo" CanExecute="UndoCommandBinding_CanExecute" Executed="UndoCommandBinding_Executed"/>
+        <CommandBinding Command="Delete" CanExecute="DeleteCommandBinding_CanExecute" Executed="DeleteCommandBinding_Executed"/>
+        <CommandBinding Command="{x:Static command:DataCommands.Add}" CanExecute="AddCommandBinding_CanExecute" Executed="AddCommandBinding_Executed"/>
+        <CommandBinding Command="{x:Static command:DataCommands.Edit}" CanExecute="EditCommandBinding_CanExecute" Executed="EditCommandBinding_Executed"/>
+        <CommandBinding Command="{x:Static command:DataCommands.Find}" CanExecute="FindCommandBinding_CanExecute" Executed="FindCommandBinding_Executed"/>
+        <CommandBinding Command="{x:Static command:DataCommands.Save}" CanExecute="SaveCommandBinding_CanExecute" Executed="SaveCommandBinding_Executed"/>
+    </Page.CommandBindings>
+</Page>

+ 1 - 1
LR1/Workers.xaml.cs

@@ -2,7 +2,7 @@
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.ObjectModel;
-using System.Data.Entity.Core.Objects;
+//using System.Data.Entity.Core.Objects;
 using System.Linq;
 using System.Linq;
 using System.Text;
 using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;