From 4525c223d929d63b11ed635f1769fad5f8f7401e Mon Sep 17 00:00:00 2001 From: Dasha06 Date: Wed, 7 May 2025 13:05:20 +0300 Subject: [PATCH] qwe --- Presence.Desktop/ViewModels/GroupViewModel.cs | 8 - .../ViewModels/PresenceViewModel.cs | 2 +- Presence.Desktop/Views/GroupView.axaml | 11 +- .../bin/Debug/net8.0/Presence.Desktop | Bin 72352 -> 72352 bytes .../bin/Debug/net8.0/Presence.Desktop.dll | Bin 238592 -> 237568 bytes .../bin/Debug/net8.0/Presence.Desktop.pdb | Bin 24028 -> 24028 bytes Presence.Desktop/bin/Debug/net8.0/data.dll | Bin 41984 -> 41984 bytes Presence.Desktop/bin/Debug/net8.0/data.pdb | Bin 20684 -> 20684 bytes Presence.Desktop/bin/Debug/net8.0/domain.dll | Bin 25088 -> 25088 bytes Presence.Desktop/bin/Debug/net8.0/domain.pdb | Bin 19376 -> 19376 bytes .../net8.0/Avalonia/Presence.Desktop.dll | Bin 238592 -> 237568 bytes .../net8.0/Avalonia/Presence.Desktop.pdb | Bin 24028 -> 24028 bytes .../net8.0/Avalonia/Resources.Inputs.cache | 2 +- .../obj/Debug/net8.0/Avalonia/references | 326 +++++++++--------- .../obj/Debug/net8.0/Avalonia/resources | Bin 183442 -> 183167 bytes .../net8.0/Presence.Desktop.AssemblyInfo.cs | 2 +- .../Presence.Desktop.AssemblyInfoInputs.cache | 2 +- ...nce.Desktop.csproj.AssemblyReference.cache | Bin 22498 -> 22498 bytes ...nce.Desktop.csproj.CoreCompileInputs.cache | 2 +- .../obj/Debug/net8.0/Presence.Desktop.dll | Bin 210432 -> 209408 bytes .../obj/Debug/net8.0/Presence.Desktop.pdb | Bin 22396 -> 22308 bytes Presence.Desktop/obj/Debug/net8.0/apphost | Bin 72352 -> 72352 bytes .../obj/Debug/net8.0/ref/Presence.Desktop.dll | Bin 12288 -> 12288 bytes .../refint/Avalonia/Presence.Desktop.dll | Bin 12288 -> 12288 bytes .../Debug/net8.0/refint/Presence.Desktop.dll | Bin 13312 -> 12800 bytes .../Presence.Desktop.csproj.nuget.dgspec.json | 6 +- .../obj/Presence.Desktop.csproj.nuget.g.props | 2 +- Presence.Desktop/obj/project.assets.json | 2 +- Presence.Desktop/obj/project.nuget.cache | 2 +- console_ui/bin/Debug/net8.0/console_ui | Bin 72352 -> 72352 bytes console_ui/bin/Debug/net8.0/console_ui.dll | Bin 6144 -> 6144 bytes console_ui/bin/Debug/net8.0/console_ui.pdb | Bin 12272 -> 12272 bytes console_ui/bin/Debug/net8.0/data.dll | Bin 39424 -> 41984 bytes console_ui/bin/Debug/net8.0/data.pdb | Bin 20172 -> 20684 bytes console_ui/bin/Debug/net8.0/domain.dll | Bin 20480 -> 25088 bytes console_ui/bin/Debug/net8.0/domain.pdb | Bin 17404 -> 19376 bytes console_ui/bin/Debug/net8.0/ui.dll | Bin 20480 -> 20480 bytes console_ui/bin/Debug/net8.0/ui.pdb | Bin 16216 -> 16216 bytes console_ui/obj/Debug/net8.0/apphost | Bin 72352 -> 72352 bytes .../Debug/net8.0/console_ui.AssemblyInfo.cs | 2 +- .../console_ui.AssemblyInfoInputs.cache | 2 +- .../obj/Debug/net8.0/console_ui.assets.cache | Bin 14000 -> 13802 bytes .../console_ui.csproj.AssemblyReference.cache | Bin 11349 -> 12553 bytes .../console_ui.csproj.CoreCompileInputs.cache | 2 +- console_ui/obj/Debug/net8.0/console_ui.dll | Bin 6144 -> 6144 bytes console_ui/obj/Debug/net8.0/console_ui.pdb | Bin 12272 -> 12272 bytes .../obj/Debug/net8.0/ref/console_ui.dll | Bin 5120 -> 5120 bytes .../obj/Debug/net8.0/refint/console_ui.dll | Bin 5120 -> 5120 bytes .../obj/console_ui.csproj.nuget.dgspec.json | 8 +- .../obj/console_ui.csproj.nuget.g.props | 2 +- console_ui/obj/project.assets.json | 12 +- console_ui/obj/project.nuget.cache | 11 +- data/bin/Debug/net8.0/data.dll | Bin 41984 -> 41984 bytes data/bin/Debug/net8.0/data.pdb | Bin 20684 -> 20684 bytes data/obj/Debug/net8.0/data.AssemblyInfo.cs | 2 +- .../net8.0/data.AssemblyInfoInputs.cache | 2 +- data/obj/Debug/net8.0/data.assets.cache | Bin 35688 -> 35490 bytes .../data.csproj.CoreCompileInputs.cache | 2 +- data/obj/Debug/net8.0/data.dll | Bin 41984 -> 41984 bytes data/obj/Debug/net8.0/data.pdb | Bin 20684 -> 20684 bytes data/obj/Debug/net8.0/ref/data.dll | Bin 14848 -> 14848 bytes data/obj/Debug/net8.0/refint/data.dll | Bin 14848 -> 14848 bytes data/obj/data.csproj.nuget.dgspec.json | 2 +- data/obj/data.csproj.nuget.g.props | 2 +- data/obj/project.assets.json | 12 +- data/obj/project.nuget.cache | 11 +- domain/UseCase/GroupUseCase.cs | 8 - domain/bin/Debug/net8.0/data.dll | Bin 41984 -> 41984 bytes domain/bin/Debug/net8.0/data.pdb | Bin 20684 -> 20684 bytes domain/bin/Debug/net8.0/domain.dll | Bin 25088 -> 25088 bytes domain/bin/Debug/net8.0/domain.pdb | Bin 19376 -> 19376 bytes .../obj/Debug/net8.0/domain.AssemblyInfo.cs | 2 +- .../net8.0/domain.AssemblyInfoInputs.cache | 2 +- domain/obj/Debug/net8.0/domain.assets.cache | Bin 9945 -> 9747 bytes .../domain.csproj.AssemblyReference.cache | Bin 8151 -> 8151 bytes .../domain.csproj.CoreCompileInputs.cache | 2 +- domain/obj/Debug/net8.0/domain.dll | Bin 25088 -> 25088 bytes domain/obj/Debug/net8.0/domain.pdb | Bin 19376 -> 19376 bytes domain/obj/Debug/net8.0/ref/domain.dll | Bin 13824 -> 13824 bytes domain/obj/Debug/net8.0/refint/domain.dll | Bin 13824 -> 13824 bytes domain/obj/domain.csproj.nuget.dgspec.json | 4 +- domain/obj/domain.csproj.nuget.g.props | 2 +- domain/obj/project.assets.json | 12 +- domain/obj/project.nuget.cache | 11 +- presence_api/bin/Debug/net8.0/data.dll | Bin 41984 -> 41984 bytes presence_api/bin/Debug/net8.0/data.pdb | Bin 20684 -> 20684 bytes presence_api/bin/Debug/net8.0/domain.dll | Bin 25088 -> 25088 bytes presence_api/bin/Debug/net8.0/domain.pdb | Bin 19376 -> 19376 bytes presence_api/bin/Debug/net8.0/presence_api | Bin 72352 -> 72352 bytes .../bin/Debug/net8.0/presence_api.dll | Bin 12288 -> 12288 bytes .../bin/Debug/net8.0/presence_api.pdb | Bin 23432 -> 23432 bytes presence_api/obj/Debug/net8.0/apphost | Bin 72352 -> 72352 bytes .../Debug/net8.0/presence_api.AssemblyInfo.cs | 4 +- .../presence_api.AssemblyInfoInputs.cache | 2 +- .../Debug/net8.0/presence_api.assets.cache | Bin 13801 -> 13603 bytes ...resence_api.csproj.AssemblyReference.cache | Bin 5242 -> 6446 bytes ...resence_api.csproj.CoreCompileInputs.cache | 2 +- .../obj/Debug/net8.0/presence_api.dll | Bin 12288 -> 12288 bytes .../obj/Debug/net8.0/presence_api.pdb | Bin 23432 -> 23432 bytes .../obj/Debug/net8.0/ref/presence_api.dll | Bin 8192 -> 8192 bytes .../obj/Debug/net8.0/refint/presence_api.dll | Bin 8192 -> 8192 bytes .../obj/presence_api.csproj.nuget.dgspec.json | 6 +- .../obj/presence_api.csproj.nuget.g.props | 2 +- presence_api/obj/project.assets.json | 12 +- presence_api/obj/project.nuget.cache | 11 +- ui/bin/Debug/net8.0/data.dll | Bin 39424 -> 41984 bytes ui/bin/Debug/net8.0/data.pdb | Bin 20172 -> 20684 bytes ui/bin/Debug/net8.0/domain.dll | Bin 20480 -> 25088 bytes ui/bin/Debug/net8.0/domain.pdb | Bin 17404 -> 19376 bytes ui/bin/Debug/net8.0/ui.dll | Bin 20480 -> 20480 bytes ui/bin/Debug/net8.0/ui.pdb | Bin 16216 -> 16216 bytes ui/obj/Debug/net8.0/ref/ui.dll | Bin 6656 -> 6656 bytes ui/obj/Debug/net8.0/refint/ui.dll | Bin 6656 -> 6656 bytes ui/obj/Debug/net8.0/ui.AssemblyInfo.cs | 2 +- .../Debug/net8.0/ui.AssemblyInfoInputs.cache | 2 +- ui/obj/Debug/net8.0/ui.assets.cache | Bin 13987 -> 13789 bytes .../net8.0/ui.csproj.AssemblyReference.cache | Bin 10602 -> 11806 bytes .../net8.0/ui.csproj.CoreCompileInputs.cache | 2 +- ui/obj/Debug/net8.0/ui.dll | Bin 20480 -> 20480 bytes ui/obj/Debug/net8.0/ui.pdb | Bin 16216 -> 16216 bytes ui/obj/project.assets.json | 12 +- ui/obj/project.nuget.cache | 11 +- ui/obj/ui.csproj.nuget.dgspec.json | 6 +- ui/obj/ui.csproj.nuget.g.props | 2 +- 124 files changed, 229 insertions(+), 329 deletions(-) diff --git a/Presence.Desktop/ViewModels/GroupViewModel.cs b/Presence.Desktop/ViewModels/GroupViewModel.cs index 333c96a..7ed1980 100644 --- a/Presence.Desktop/ViewModels/GroupViewModel.cs +++ b/Presence.Desktop/ViewModels/GroupViewModel.cs @@ -55,7 +55,6 @@ namespace Presence.Desktop.ViewModels public ObservableCollection Users { get => _users;} public ObservableCollection _users; public ICommand RemoveUserCommand { get; } - public ICommand EditUserCommand { get; } public ICommand RemoveAllSelectedCommand { get; } public ReactiveCommand NavigateToPresenceCommand { get; } @@ -84,7 +83,6 @@ namespace Presence.Desktop.ViewModels Selection.SelectionChanged += SelectionChanged; RemoveUserCommand = ReactiveCommand.Create(RemoveUser); - EditUserCommand = ReactiveCommand.Create(EditUser); RemoveAllSelectedCommand = ReactiveCommand.Create(RemoveAllSelected); NavigateToPresenceCommand = ReactiveCommand.Create(NavigateToPresence); } @@ -144,12 +142,6 @@ namespace Presence.Desktop.ViewModels SetUsers(); } - private void EditUser(UserPresenter user) - { - if (user == null) return; - // TODO: Добавить логику редактирования пользователя - // Можно реализовать через диалоговое окно или навигацию на форму редактирования - } private void RemoveAllSelected() { diff --git a/Presence.Desktop/ViewModels/PresenceViewModel.cs b/Presence.Desktop/ViewModels/PresenceViewModel.cs index dda7000..27c0c07 100644 --- a/Presence.Desktop/ViewModels/PresenceViewModel.cs +++ b/Presence.Desktop/ViewModels/PresenceViewModel.cs @@ -119,7 +119,7 @@ namespace Presence.Desktop.ViewModels } // Логирование для отладки - Console.WriteLine($"Загружено записей посещаемости: {AttendanceRecords.Count}"); + // Console.WriteLine($"Загружено записей посещаемости: {AttendanceRecords.Count}"); } private void DeleteSelectedItems() diff --git a/Presence.Desktop/Views/GroupView.axaml b/Presence.Desktop/Views/GroupView.axaml index d5f81dd..8a34741 100644 --- a/Presence.Desktop/Views/GroupView.axaml +++ b/Presence.Desktop/Views/GroupView.axaml @@ -12,7 +12,6 @@ - - @@ -37,8 +35,7 @@ -