Fiks 19.03

ProjectAnalogParus/AccrualsPage.xaml

@@ -1,14 +1,16 @@
-<Page x:Class="ProjectAnalogParus.AccrualsPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<Page x:Class="ProjectAnalogParus.AccrualsPage"     
+      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:d="http://schemas.microsoft.com/expression/blend/2008"     
       xmlns:local="clr-namespace:ProjectAnalogParus"
+   
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="AccrualsPage" Loaded="LoadedWindows">
 
-    <Grid>
+    <Grid Margin="0,0,10,10">
+
 
         <DataGrid Name="Acctualsgrid" HorizontalAlignment="Left" AutoGenerateColumns="False" Height="188" Margin="10,74,0,0" VerticalAlignment="Top" Width="780" >
 
@@ -21,8 +23,13 @@
                 <DataGridTextColumn Binding="{Binding Encouragement.NameTypeEncouragement}" Header="Поощрение" Width="3*" />
                 <DataGridTextColumn Binding="{Binding Amount}" Header="Сумма" Width="3*" />
             </DataGrid.Columns>
+
         </DataGrid>
+
+
         <Button Content="Экспорт Excel" HorizontalAlignment="Left" Margin="51,285,0,0" VerticalAlignment="Top" Width="97" Click="ExcelClick"/>
+        <TextBox x:Name="TxtSearch" TextChanged="TxtSearch_TextChanged" HorizontalAlignment="Left" Height="24" Margin="105,31,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="170"/>
+        <TextBlock HorizontalAlignment="Left" Margin="26,31,0,0" TextWrapping="Wrap" Text="Поиск" VerticalAlignment="Top" Height="24" Width="74"/>
     </Grid>
 
 </Page>

ProjectAnalogParus/AccrualsPage.xaml.cs

@@ -28,7 +28,7 @@ namespace ProjectAnalogParus
         {
             InitializeComponent();
         }
-
+     
         private void ExcelClick(object sender, RoutedEventArgs e)
         {          
             Excel.Application excel = new Excel.Application();
@@ -57,5 +57,20 @@ namespace ProjectAnalogParus
         {           
             Acctualsgrid.ItemsSource = db.AccrualsScholarship.ToList();
         }
+
+        public void ShowAcctuals()
+        {           
+            Acctualsgrid.ItemsSource = db.AccrualsScholarship.Where(item => 
+            (item.Student.LastName + " " + item.Student.FirstName + " " + 
+            item.Student.Middlename + " " + item.User.FullNameUser + " " + 
+            item.Scholarship.NameScholarship + " " + 
+            item.Encouragement.NameTypeEncouragement + " " + item.Amount + " " + 
+            item.DateAccruals + " ").Contains(TxtSearch.Text)).ToList();
+        }
+
+        private void TxtSearch_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            ShowAcctuals();
+        }
     }
 }

ProjectAnalogParus/AdminPage.xaml

@@ -18,7 +18,8 @@
                             <DataGridTextColumn Binding="{Binding IdUser}" Header="Id" Width="*"/>
                             <DataGridTextColumn Binding="{Binding NameUser}" Header="Имя пользователя" Width="3*"/>
                             <DataGridTextColumn Binding="{Binding FullNameUser}" Header="Полное имя пользователя" Width="3*" />
-                            <DataGridTextColumn Binding="{Binding Password}" Header="Пароль" Width="3*" />
+                            <DataGridTextColumn Binding="{Binding Password}" Header="Пароль" Width="2*" />
+                            <DataGridTextColumn Binding="{Binding Role.NameRole}" Header="Роль" Width="2*" />
                         </DataGrid.Columns>
                     </DataGrid>
                     <Button Content="Добавать пользователя" HorizontalAlignment="Left" Margin="10,169,0,0" VerticalAlignment="Top" Width="146" Height="26" Click="InsertUserClick"/>

ProjectAnalogParus/AthorizationPage.xaml.cs

@@ -41,8 +41,7 @@ namespace ProjectAnalogParus
                 .FirstOrDefault(u => u.NameUser == login.Text && u.Password == password.Password);
                 if (user == null)
                 {
-                    MessageBox.Show("Пользователь с таким именем не найден!");
-                    
+                    MessageBox.Show("Пользователь с таким именем не найден!");                    
                 }
 
                 int idUser = user.IdUser;

ProjectAnalogParus/InsertEncouragementWindow.xaml.cs

@@ -37,6 +37,7 @@ namespace ProjectAnalogParus
                
                 db.Encouragement.Add(encouragement);
                 db.SaveChanges();
+                MessageBox.Show("Успешно добавлено новое поощрение!");
             }
             else
             {

ProjectAnalogParus/ListStudentPage.xaml

@@ -22,6 +22,6 @@
             </DataGrid.Columns>
 
         </DataGrid>
-        <Button Content="Создать отчет" HorizontalAlignment="Left" Margin="10,197,0,0" VerticalAlignment="Top" Width="116" Click="CreateListStudent"/>
+        
     </Grid>
 </Page>

ProjectAnalogParus/ListStudentPage.xaml.cs

@@ -31,10 +31,6 @@ namespace ProjectAnalogParus
             Studentgrid.ItemsSource = db.Student.ToList();          
 
         }
-
-        private void CreateListStudent(object sender, RoutedEventArgs e)
-        {
-
-        }
+       
     }
 }

ProjectAnalogParus/ProjectAnalogParus.csproj

@@ -89,6 +89,7 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">