From 3ca477dd512972f42ad69e35b8c879a7d8f865c6 Mon Sep 17 00:00:00 2001
From: 1eG0ist <diadypetya@yandex.ru>
Date: Fri, 13 Dec 2024 10:34:58 +0300
Subject: [PATCH] last-commit

---
 Presence.Desktop/App.axaml                       | 1 +
 Presence.Desktop/Presence.Desktop.csproj         | 1 +
 Presence.Desktop/ViewModels/PresenceViewModel.cs | 1 +
 Presence.Desktop/Views/PresenceView.axaml        | 4 ++--
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Presence.Desktop/App.axaml b/Presence.Desktop/App.axaml
index 54c9d29..a93528d 100644
--- a/Presence.Desktop/App.axaml
+++ b/Presence.Desktop/App.axaml
@@ -6,5 +6,6 @@
 
     <Application.Styles>
         <FluentTheme />
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     </Application.Styles>
 </Application>
\ No newline at end of file
diff --git a/Presence.Desktop/Presence.Desktop.csproj b/Presence.Desktop/Presence.Desktop.csproj
index 33feb38..1db4bb9 100644
--- a/Presence.Desktop/Presence.Desktop.csproj
+++ b/Presence.Desktop/Presence.Desktop.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.2.1" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.1" />
     <PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1" />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.1" />
diff --git a/Presence.Desktop/ViewModels/PresenceViewModel.cs b/Presence.Desktop/ViewModels/PresenceViewModel.cs
index 9641aa7..52f3222 100644
--- a/Presence.Desktop/ViewModels/PresenceViewModel.cs
+++ b/Presence.Desktop/ViewModels/PresenceViewModel.cs
@@ -116,6 +116,7 @@ public class PresenceViewModel : ViewModelBase
     {
         if (string.IsNullOrEmpty(SelectedAttendanceType)) return;
 
+        UpdatePresences();
         var filteredPresences = _presences.Where(a => a.PresenceType == SelectedAttendanceType).ToList();
         _presences.Clear();
         foreach (var attendance in filteredPresences)
diff --git a/Presence.Desktop/Views/PresenceView.axaml b/Presence.Desktop/Views/PresenceView.axaml
index 6b48a16..868d278 100644
--- a/Presence.Desktop/Views/PresenceView.axaml
+++ b/Presence.Desktop/Views/PresenceView.axaml
@@ -30,8 +30,8 @@
         <TextBlock Text="PRivatik"/>
         <Border BorderThickness="2" Background="Aqua">
             <DataGrid Margin="20" ItemsSource="{Binding Presences}"
-                      AutoGenerateColumns="True" IsReadOnly="True"
-                      GridLinesVisibility="All" Height="300"
+                      AutoGenerateColumns="False" IsReadOnly="True"
+                      GridLinesVisibility="All" Height="300" CanUserSortColumns="True"
                       BorderThickness="1" BorderBrush="Gray">
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="Ф.И.О." Binding="{Binding StudentFullName}" />