Forráskód Böngészése

Сортировка сломалась

Danila Alekseev 1 éve
szülő
commit
6bf93423b9
2 módosított fájl, 10 hozzáadás és 3 törlés
  1. 1 1
      ROGOZ/Pages/TaskList.xaml
  2. 9 2
      ROGOZ/Pages/TaskList.xaml.cs

+ 1 - 1
ROGOZ/Pages/TaskList.xaml

@@ -26,7 +26,7 @@
             <TextBox Name="TBoxSearch" Width="200" Height="40" Margin="5" FontSize="20" HorizontalAlignment="Right" Style="{DynamicResource AddTaskTB}" TextChanged="TBoxSearch_TextChanged" />
 
             <Separator Background="Transparent" BorderThickness="0" Width="7"/>
-            <Button Name="ClearFilters" Width="45" Height="45" Style="{DynamicResource ClearSort}">
+            <Button Name="ClearFilters" Width="45" Height="45" Style="{DynamicResource ClearSort}" Click="ClearFilters_Click">
                 <Image Source="/Resources/ClearFilter.png" />
 
             </Button>

+ 9 - 2
ROGOZ/Pages/TaskList.xaml.cs

@@ -75,9 +75,9 @@ namespace ROGOZ.Pages
 
             //сортировка по исполнителю
             if (CmbExecutorSort.SelectedIndex == 0)
-                tasks = tasks.OrderBy(p => p.Executor).ToList();
+                tasks = tasks.OrderBy(p => p.ExecutorID).ToList();
             else
-                tasks = tasks.OrderByDescending(p => p.Executor).ToList();
+                tasks = tasks.OrderByDescending(p => p.ExecutorID).ToList();
 
             //сортировка по поиску
             tasks = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList();
@@ -94,5 +94,12 @@ namespace ROGOZ.Pages
         {
             UpdateTasks();
         }
+
+        private void ClearFilters_Click(object sender, RoutedEventArgs e)
+        {
+            CmbExecutorSort.SelectedIndex = 0;
+            CmbStatusSort.SelectedIndex = 0;
+            TBoxSearch.Clear();
+        }
     }
 }