gr672_bda vor 4 Jahren
Ursprung
Commit
dcc4ea97b4

+ 1 - 1
ProjectAnalogParus.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectAnalogParus", "ProjectAnalogParus\ProjectAnalogParus.csproj", "{5BB78EB7-2BEF-42BD-BD58-BD478AE7E9B4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterDataGrid", "C:\Users\gr672_bda\Downloads\DataGridFilter-master\FilterDataGrid\FilterDataGrid.csproj", "{1284F448-055D-49B6-9A1B-81E9BBF447C8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterDataGrid", "..\FilterDataGrid\FilterDataGrid.csproj", "{1284F448-055D-49B6-9A1B-81E9BBF447C8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 1 - 1
ProjectAnalogParus/AccrualsPage.xaml

@@ -17,7 +17,7 @@
 
 
 
-        <control:FilterDataGrid CanUserAddRows="False" Name="Acctualsgrid" HorizontalAlignment="Left" AutoGenerateColumns="False" Height="188" Margin="10,74,0,0" VerticalAlignment="Top" Width="780" >
+        <control:FilterDataGrid CanUserAddRows="False" IsReadOnly="True" ItemsSource="{Binding FilteredList, UpdateSourceTrigger=PropertyChanged}" x:Name="FilterDataGrid" FilterLanguage="Russian" HorizontalAlignment="Left" AutoGenerateColumns="False" Height="188" Margin="10,74,0,0" VerticalAlignment="Top" Width="780" >
 
             <control:FilterDataGrid.Columns>
                 <control:DataGridTextColumn Binding="{Binding Student.LastName}" Header="Фамилия" Width="3*" IsColumnFiltered="True" />

+ 13 - 10
ProjectAnalogParus/AccrualsPage.xaml.cs

@@ -3,6 +3,7 @@ using Microsoft.Office.Interop.Excel;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -30,27 +31,29 @@ namespace ProjectAnalogParus
         public AccrualsPage()
         {
             InitializeComponent();
+                          
 
         }
 
-            private void ExcelClick(object sender, RoutedEventArgs e)
+           
+        private void ExcelClick(object sender, RoutedEventArgs e)
         {          
             Excel.Application excel = new Excel.Application();
             excel.Visible = true;
             Workbook workbook = excel.Workbooks.Add(System.Reflection.Missing.Value);
             Worksheet sheet1 = (Worksheet)workbook.Sheets[1];
-            for (int j = 0; j < Acctualsgrid.Columns.Count; j++)
+            for (int j = 0; j < FilterDataGrid.Columns.Count; j++)
             {
                 Range myRange = (Range)sheet1.Cells[1, j + 1];
                 sheet1.Cells[1, j + 1].Font.Bold = true;
                 sheet1.Columns[j + 1].ColumnWidth = 15;
-                myRange.Value2 = Acctualsgrid.Columns[j].Header;
+                myRange.Value2 = FilterDataGrid.Columns[j].Header;
             }
-            for (int i = 0; i < Acctualsgrid.Columns.Count; i++)
+            for (int i = 0; i < FilterDataGrid.Columns.Count; i++)
             {
-                for (int j = 0; j < Acctualsgrid.Items.Count; j++)
+                for (int j = 0; j < FilterDataGrid.Items.Count; j++)
                 {
-                    TextBlock b = Acctualsgrid.Columns[i].GetCellContent(Acctualsgrid.Items[j]) as TextBlock;
+                    TextBlock b = FilterDataGrid.Columns[i].GetCellContent(FilterDataGrid.Items[j]) as TextBlock;
                     Microsoft.Office.Interop.Excel.Range myRange = (Microsoft.Office.Interop.Excel.Range)sheet1.Cells[j + 2, i + 1];
                     myRange.Value2 = b.Text;
                 }
@@ -58,13 +61,13 @@ namespace ProjectAnalogParus
         }
         
         private void LoadedWindows(object sender, RoutedEventArgs e)
-        {           
-            Acctualsgrid.ItemsSource = db.AccrualsScholarship.ToList();
+        {
+            FilterDataGrid.ItemsSource = db.AccrualsScholarship.ToList();
         }
 
         public void ShowAcctuals()
-        {           
-            Acctualsgrid.ItemsSource = db.AccrualsScholarship.Where(item => 
+        {
+            FilterDataGrid.ItemsSource = db.AccrualsScholarship.Where(item => 
             (item.Student.LastName + " " + item.Student.FirstName + " " + 
             item.Student.Middlename + " " + item.User.FullNameUser + " " + 
             item.Scholarship.NameScholarship + " " + 

+ 0 - 4
ProjectAnalogParus/InsertScholarshipWindow.xaml.cs

@@ -40,10 +40,6 @@ namespace ProjectAnalogParus
             {
                 MessageBox.Show("Не все поля заполнены!");
             }
-
-          
-
-
         }
 
         private void Cancel_Click(object sender, RoutedEventArgs e)

+ 1 - 1
ProjectAnalogParus/ProjectAnalogParus.csproj

@@ -438,7 +438,7 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="C:\Users\gr672_bda\Downloads\DataGridFilter-master\FilterDataGrid\FilterDataGrid.csproj">
+    <ProjectReference Include="..\..\FilterDataGrid\FilterDataGrid.csproj">
       <Project>{1284f448-055d-49b6-9a1b-81e9bbf447c8}</Project>
       <Name>FilterDataGrid</Name>
     </ProjectReference>