Browse Source

Поиск работает по названию и по Исполнителю

Danila Alekseev 1 year ago
parent
commit
116fca9886
2 changed files with 5 additions and 8 deletions
  1. 1 1
      ROGOZ/Pages/TaskList.xaml
  2. 4 7
      ROGOZ/Pages/TaskList.xaml.cs

+ 1 - 1
ROGOZ/Pages/TaskList.xaml

@@ -20,7 +20,7 @@
             </ComboBox>
 
             <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}" />
+            <!--<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"/>
             <TextBox Name="TBoxSearch" Width="200" Height="40" Margin="5" FontSize="20" HorizontalAlignment="Right" Style="{DynamicResource AddTaskTB}" TextChanged="TBoxSearch_TextChanged" />

+ 4 - 7
ROGOZ/Pages/TaskList.xaml.cs

@@ -82,20 +82,17 @@ namespace ROGOZ.Pages
         }
         private void UpdateTasks()
         {
+            var searchText = TBoxSearch.Text.ToLower();
             var tasks = user1Entities.GetContext().Task.ToList();
 
             //сортировка по статусу
             //if (CmbStatusSort.SelectedIndex == -1 || CmbStatusSort.Text == null)
             //    DGTasks.ItemsSource = tasks.OrderBy(p => p.Status).ToList();
 
-            //сортировка по исполнителю
-            //if (CmbExecutorSort.SelectedIndex == -1)
-            //    tasks = tasks.OrderBy(p => p.Executor.User.MiddleName).ToList();
-            //else
-            //    tasks = tasks.Where(p => p.Executor.User.getFIO().ToString() == CmbStatusSort.Text).ToList();
-
             //сортировка по поиску
-            DGTasks.ItemsSource = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList(); // 
+            DGTasks.ItemsSource = tasks.Where(p => p.Title.ToLower().Contains(searchText) 
+            || p.Executor.User.MiddleName.ToLower().Contains(searchText)).ToList();
+
         }
 
         //Сортировка по статусу