diff --git a/Presence.Desktop/DI/ServiceCollictionExtensions.cs b/Presence.Desktop/DI/ServiceCollictionExtensions.cs index 795d886..08b42a2 100644 --- a/Presence.Desktop/DI/ServiceCollictionExtensions.cs +++ b/Presence.Desktop/DI/ServiceCollictionExtensions.cs @@ -22,6 +22,7 @@ namespace Presence.Desktop.DI collection .AddDbContext() .AddSingleton() + .AddSingleton() .AddTransient() .AddTransient(); } diff --git a/Presence.Desktop/ViewModels/GroupViewModel.cs b/Presence.Desktop/ViewModels/GroupViewModel.cs index 9df72bb..07220ad 100644 --- a/Presence.Desktop/ViewModels/GroupViewModel.cs +++ b/Presence.Desktop/ViewModels/GroupViewModel.cs @@ -10,7 +10,7 @@ using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; using System.Windows.Input; -using Tmds.DBus.Protocol; +using Avalonia.Controls.Selection; namespace Presence.Desktop.ViewModels { @@ -34,6 +34,10 @@ namespace Presence.Desktop.ViewModels get => _selectedGroupItem; set => this.RaiseAndSetIfChanged(ref _selectedGroupItem, value); } + private bool _MultipleSelected = false; + public bool MultipleSelected { get => _MultipleSelected; set => this.RaiseAndSetIfChanged(ref _MultipleSelected, value); } + public SelectionModel Selection { get; } + private GroupPresenter? _selectedGroupItem; @@ -41,29 +45,18 @@ namespace Presence.Desktop.ViewModels private IGroupUseCase _groupUseCase; public ObservableCollection Users { get => _users;} public ObservableCollection _users; + public ICommand RemoveUserCommand { get; } + public ICommand EditUserCommand { get; } + public ICommand RemoveAllSelectedCommand { get; } + public GroupViewModel(IGroupUseCase groupUseCase) { - foreach (var item in groupUseCase.GetGroupsWithStudents()) - { - GroupPresenter groupPresenter = new GroupPresenter - { - Id = item.Id, - Name = item.Name, - Users = item.User?.Select(user => new UserPresenter - { - Name = user.FIO, - Id = user.Id, - Group = new GroupPresenter { Id = item.Id, Name = item.Name } - } - ).ToList() - }; - _groupPresentersDataSource.Add(groupPresenter); - } - _groups = new ObservableCollection(_groupPresentersDataSource); - _groupUseCase = groupUseCase; + _SelectFileInteraction = new Interaction(); OpenFileDialog = ReactiveCommand.CreateFromTask(SelectFile); + + _groups = new ObservableCollection(_groupPresentersDataSource); _users = new ObservableCollection(); RefreshGroups(); @@ -73,6 +66,13 @@ namespace Presence.Desktop.ViewModels RefreshGroups(); SetUsers(); }); + Selection = new SelectionModel(); + Selection.SingleSelect = false; + Selection.SelectionChanged += SelectionChanged; + + RemoveUserCommand = ReactiveCommand.Create(RemoveUser); + EditUserCommand = ReactiveCommand.Create(EditUser); + RemoveAllSelectedCommand = ReactiveCommand.Create(RemoveAllSelected); } private void SetUsers() @@ -110,6 +110,12 @@ namespace Presence.Desktop.ViewModels } _groups = new ObservableCollection(_groupPresentersDataSource); } + + void SelectionChanged(object sender, SelectionModelSelectionChangedEventArgs e) + { + MultipleSelected = Selection.SelectedItems.Count > 1; + } + public string? UrlPathSegment { get; } public IScreen HostScreen { get; } @@ -118,5 +124,35 @@ namespace Presence.Desktop.ViewModels Console.WriteLine("clock"); SelectedFile = await _SelectFileInteraction.Handle("Chose csv file"); } + + private void RemoveUser(UserPresenter user) + { + if (user == null || SelectedGroupItem == null) return; + + _groupUseCase.RemoveUserFromGroup(user.Id); + RefreshGroups(); + SetUsers(); + } + + private void EditUser(UserPresenter user) + { + if (user == null) return; + // TODO: Добавить логику редактирования пользователя + // Можно реализовать через диалоговое окно или навигацию на форму редактирования + } + + private void RemoveAllSelected() + { + if (SelectedGroupItem == null) return; + + var selectedUsers = Selection.SelectedItems.ToList(); + foreach (var user in selectedUsers) + { + _groupUseCase.RemoveUserFromGroup(user.Id); + } + + RefreshGroups(); + SetUsers(); + } } } \ No newline at end of file diff --git a/Presence.Desktop/Views/GroupView.axaml b/Presence.Desktop/Views/GroupView.axaml index 0aa048c..4d6b5a5 100644 --- a/Presence.Desktop/Views/GroupView.axaml +++ b/Presence.Desktop/Views/GroupView.axaml @@ -13,6 +13,11 @@ + - + + + + + + + + diff --git a/Presence.Desktop/Views/GroupView.axaml.cs b/Presence.Desktop/Views/GroupView.axaml.cs index 7702263..f2f9863 100644 --- a/Presence.Desktop/Views/GroupView.axaml.cs +++ b/Presence.Desktop/Views/GroupView.axaml.cs @@ -1,5 +1,9 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Avalonia.Controls; using Avalonia.Markup.Xaml; +using Avalonia.Platform.Storage; using Avalonia.ReactiveUI; using Presence.Desktop.ViewModels; using ReactiveUI; @@ -10,8 +14,33 @@ namespace Presence.Desktop.Views { public GroupView() { - this.WhenActivated(disposables => { }); + this.WhenActivated(action => + { + action(ViewModel!.SelectFileInteraction.RegisterHandler(ShowFileDialog)); + }); AvaloniaXamlLoader.Load(this); } + + private async Task ShowFileDialog(IInteractionContext context) + { + var topLevel = TopLevel.GetTopLevel(this); + var storageFile = await topLevel.StorageProvider.OpenFilePickerAsync( + new FilePickerOpenOptions() + { + AllowMultiple = false, + Title = context.Input + } + ); + + if (storageFile.Count > 0) + { + context.SetOutput(storageFile.First().Path.ToString()); + } + else + { + // Обработка случая, когда выбор файла отменен + // Например, можно вывести сообщение или просто ничего не делать + } + } } } \ No newline at end of file diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll index 1cdc0e9..8c70f5d 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll and b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb index 3d8fff3..776db5d 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb and b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb differ diff --git a/Presence.Desktop/bin/Debug/net8.0/data.dll b/Presence.Desktop/bin/Debug/net8.0/data.dll index b541304..3167164 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/data.dll and b/Presence.Desktop/bin/Debug/net8.0/data.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/data.pdb b/Presence.Desktop/bin/Debug/net8.0/data.pdb index ff2e9bd..855e471 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/data.pdb and b/Presence.Desktop/bin/Debug/net8.0/data.pdb differ diff --git a/Presence.Desktop/bin/Debug/net8.0/domain.dll b/Presence.Desktop/bin/Debug/net8.0/domain.dll index d6dcda0..217a543 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/domain.dll and b/Presence.Desktop/bin/Debug/net8.0/domain.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/domain.pdb b/Presence.Desktop/bin/Debug/net8.0/domain.pdb index 3c658af..8c8a5f2 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/domain.pdb and b/Presence.Desktop/bin/Debug/net8.0/domain.pdb differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.dll index 1cdc0e9..8c70f5d 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.dll and b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.dll differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.pdb b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.pdb index 3d8fff3..776db5d 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.pdb and b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Presence.Desktop.pdb differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 9467a80..8ab200c 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/Presence.Desktop/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -8ff83d2bcb3cec6472dc66a2a69c5cfafb8cbd5996d3bbe796f44278fe829520 +9bed0cd3c89dc88826b4309b09b8760dd6e18f10b2c8c30cedb93144a4b3ebad diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources b/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources index 904b756..a8df689 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources and b/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs index 2ccfaf5..91673e3 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Presence.Desktop")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8bf4628cce91d7266a54ce8ba848e91ee1b2569")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7022af564df3af3bd7b3d3e4904e100f6e6294bc")] [assembly: System.Reflection.AssemblyProductAttribute("Presence.Desktop")] [assembly: System.Reflection.AssemblyTitleAttribute("Presence.Desktop")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfoInputs.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfoInputs.cache index 4f2a33e..01625fa 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfoInputs.cache +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfoInputs.cache @@ -1 +1 @@ -4d609c065396d07151140e18cdb037e59080c5cb8458e11bf60ac5453325e867 +cfdc02e4f88afe979f5985745301d96a88e08b3174daf2797998e1b5cb3ca0b0 diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.AssemblyReference.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.AssemblyReference.cache index a46dd83..7971a6e 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.AssemblyReference.cache and b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.AssemblyReference.cache differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll index c6bc4c3..5649c88 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll and b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll differ diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.pdb b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.pdb index ecf45e3..c5bd1d6 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.pdb and b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.pdb differ diff --git a/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll index 0fb1ef9..61179a3 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll and b/Presence.Desktop/obj/Debug/net8.0/ref/Presence.Desktop.dll differ diff --git a/Presence.Desktop/obj/Debug/net8.0/refint/Avalonia/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/refint/Avalonia/Presence.Desktop.dll index 0fb1ef9..61179a3 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/refint/Avalonia/Presence.Desktop.dll and b/Presence.Desktop/obj/Debug/net8.0/refint/Avalonia/Presence.Desktop.dll differ diff --git a/Presence.Desktop/obj/Debug/net8.0/refint/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/refint/Presence.Desktop.dll index 257a362..5426031 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/refint/Presence.Desktop.dll and b/Presence.Desktop/obj/Debug/net8.0/refint/Presence.Desktop.dll differ diff --git a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs index e77ae26..e129b0c 100644 --- a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs +++ b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("console_ui")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8bf4628cce91d7266a54ce8ba848e91ee1b2569")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7022af564df3af3bd7b3d3e4904e100f6e6294bc")] [assembly: System.Reflection.AssemblyProductAttribute("console_ui")] [assembly: System.Reflection.AssemblyTitleAttribute("console_ui")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache index dc0e177..2a47f04 100644 --- a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache +++ b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfoInputs.cache @@ -1 +1 @@ -4bf58799393b54975cb249992c3335b53b5b1f8b9b387253b9f72465f1e756e4 +def5d5af8ca7ee1949b786807a9b9f85a2aa893d54e610b79480bc0b442186f2 diff --git a/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache b/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache index 72c085f..d984158 100644 Binary files a/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache and b/console_ui/obj/Debug/net8.0/console_ui.csproj.AssemblyReference.cache differ diff --git a/data/bin/Debug/net8.0/data.dll b/data/bin/Debug/net8.0/data.dll index b541304..3167164 100644 Binary files a/data/bin/Debug/net8.0/data.dll and b/data/bin/Debug/net8.0/data.dll differ diff --git a/data/bin/Debug/net8.0/data.pdb b/data/bin/Debug/net8.0/data.pdb index ff2e9bd..855e471 100644 Binary files a/data/bin/Debug/net8.0/data.pdb and b/data/bin/Debug/net8.0/data.pdb differ diff --git a/data/obj/Debug/net8.0/data.AssemblyInfo.cs b/data/obj/Debug/net8.0/data.AssemblyInfo.cs index 91c8135..0743133 100644 --- a/data/obj/Debug/net8.0/data.AssemblyInfo.cs +++ b/data/obj/Debug/net8.0/data.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("data")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8bf4628cce91d7266a54ce8ba848e91ee1b2569")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7022af564df3af3bd7b3d3e4904e100f6e6294bc")] [assembly: System.Reflection.AssemblyProductAttribute("data")] [assembly: System.Reflection.AssemblyTitleAttribute("data")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache b/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache index 9942160..ca4720b 100644 --- a/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache +++ b/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache @@ -1 +1 @@ -a83c002440d4fc833844f0ad9fb2316eca5384ff634b577accf58e96b177ac86 +752980e9ba0fc45a48f86e9fb9c05988e1c4ae8363fb35dfaf09a6f519c41602 diff --git a/data/obj/Debug/net8.0/data.dll b/data/obj/Debug/net8.0/data.dll index b541304..3167164 100644 Binary files a/data/obj/Debug/net8.0/data.dll and b/data/obj/Debug/net8.0/data.dll differ diff --git a/data/obj/Debug/net8.0/data.pdb b/data/obj/Debug/net8.0/data.pdb index ff2e9bd..855e471 100644 Binary files a/data/obj/Debug/net8.0/data.pdb and b/data/obj/Debug/net8.0/data.pdb differ diff --git a/data/obj/Debug/net8.0/ref/data.dll b/data/obj/Debug/net8.0/ref/data.dll index 34a0dd2..4c4a210 100644 Binary files a/data/obj/Debug/net8.0/ref/data.dll and b/data/obj/Debug/net8.0/ref/data.dll differ diff --git a/data/obj/Debug/net8.0/refint/data.dll b/data/obj/Debug/net8.0/refint/data.dll index 34a0dd2..4c4a210 100644 Binary files a/data/obj/Debug/net8.0/refint/data.dll and b/data/obj/Debug/net8.0/refint/data.dll differ diff --git a/domain/Services/GroupService.cs b/domain/Services/GroupService.cs index adafec0..171c35d 100644 --- a/domain/Services/GroupService.cs +++ b/domain/Services/GroupService.cs @@ -16,17 +16,17 @@ namespace domain.Service public class GroupService : IGroupUseCase { private readonly IGroupRepository _groupRepository; - public GroupService(IGroupRepository groupRepository) + private readonly IUserRepository _userRepository; + public GroupService(IGroupRepository groupRepository, IUserRepository userRepository) { _groupRepository = groupRepository; + _userRepository = userRepository; } public void AddGroup(AddGroupRequest addGroupRequest) { _groupRepository.AddGroup(new GroupDao { Name = addGroupRequest.Name }); } - - public void AddGroupWithStudents(AddGroupWithStudentRequest addGroupWithStudents) { GroupDao groupDAO = new GroupDao { Name = addGroupWithStudents.addGroupRequest.Name }; @@ -80,5 +80,10 @@ namespace domain.Service }).ToList() : new List() }).ToList(); } + + public void RemoveUserFromGroup(int UserId) + { + _userRepository.RemoveUserById(UserId); + } } } \ No newline at end of file diff --git a/domain/UseCase/IGroupUseCase.cs b/domain/UseCase/IGroupUseCase.cs index d311313..dcf3c29 100644 --- a/domain/UseCase/IGroupUseCase.cs +++ b/domain/UseCase/IGroupUseCase.cs @@ -14,6 +14,7 @@ namespace domain.UseCase public IEnumerable GetGroupsWithStudents(); public void AddGroup(AddGroupRequest addGroupRequest); public void AddGroupWithStudents(AddGroupWithStudentRequest addGroupWithStudents); + void RemoveUserFromGroup(int UserId); } } \ No newline at end of file diff --git a/domain/bin/Debug/net8.0/data.dll b/domain/bin/Debug/net8.0/data.dll index b541304..3167164 100644 Binary files a/domain/bin/Debug/net8.0/data.dll and b/domain/bin/Debug/net8.0/data.dll differ diff --git a/domain/bin/Debug/net8.0/data.pdb b/domain/bin/Debug/net8.0/data.pdb index ff2e9bd..855e471 100644 Binary files a/domain/bin/Debug/net8.0/data.pdb and b/domain/bin/Debug/net8.0/data.pdb differ diff --git a/domain/bin/Debug/net8.0/domain.dll b/domain/bin/Debug/net8.0/domain.dll index d6dcda0..217a543 100644 Binary files a/domain/bin/Debug/net8.0/domain.dll and b/domain/bin/Debug/net8.0/domain.dll differ diff --git a/domain/bin/Debug/net8.0/domain.pdb b/domain/bin/Debug/net8.0/domain.pdb index 3c658af..8c8a5f2 100644 Binary files a/domain/bin/Debug/net8.0/domain.pdb and b/domain/bin/Debug/net8.0/domain.pdb differ diff --git a/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs b/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs index 43932ff..4a446ff 100644 --- a/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs +++ b/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("domain")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8bf4628cce91d7266a54ce8ba848e91ee1b2569")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7022af564df3af3bd7b3d3e4904e100f6e6294bc")] [assembly: System.Reflection.AssemblyProductAttribute("domain")] [assembly: System.Reflection.AssemblyTitleAttribute("domain")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache b/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache index 791306c..1b0bd40 100644 --- a/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache +++ b/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache @@ -1 +1 @@ -58b98f718e678f6a1418b7c4064bba479c5b66250df08cd49d82df8b5ba26dca +dc648c33d8b05f8cbaa3410cee6e9ca878027ccb31fe07df25b4871f24fbbf66 diff --git a/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache b/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache index b926860..c7dc21c 100644 Binary files a/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache and b/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache differ diff --git a/domain/obj/Debug/net8.0/domain.dll b/domain/obj/Debug/net8.0/domain.dll index d6dcda0..217a543 100644 Binary files a/domain/obj/Debug/net8.0/domain.dll and b/domain/obj/Debug/net8.0/domain.dll differ diff --git a/domain/obj/Debug/net8.0/domain.pdb b/domain/obj/Debug/net8.0/domain.pdb index 3c658af..8c8a5f2 100644 Binary files a/domain/obj/Debug/net8.0/domain.pdb and b/domain/obj/Debug/net8.0/domain.pdb differ diff --git a/domain/obj/Debug/net8.0/ref/domain.dll b/domain/obj/Debug/net8.0/ref/domain.dll index 00f56ce..fe9a540 100644 Binary files a/domain/obj/Debug/net8.0/ref/domain.dll and b/domain/obj/Debug/net8.0/ref/domain.dll differ diff --git a/domain/obj/Debug/net8.0/refint/domain.dll b/domain/obj/Debug/net8.0/refint/domain.dll index 00f56ce..fe9a540 100644 Binary files a/domain/obj/Debug/net8.0/refint/domain.dll and b/domain/obj/Debug/net8.0/refint/domain.dll differ diff --git a/presence_api/bin/Debug/net8.0/data.dll b/presence_api/bin/Debug/net8.0/data.dll index 84819c8..3167164 100644 Binary files a/presence_api/bin/Debug/net8.0/data.dll and b/presence_api/bin/Debug/net8.0/data.dll differ diff --git a/presence_api/bin/Debug/net8.0/data.pdb b/presence_api/bin/Debug/net8.0/data.pdb index 8a8bbd9..855e471 100644 Binary files a/presence_api/bin/Debug/net8.0/data.pdb and b/presence_api/bin/Debug/net8.0/data.pdb differ diff --git a/presence_api/bin/Debug/net8.0/domain.dll b/presence_api/bin/Debug/net8.0/domain.dll index d6dcda0..755aed7 100644 Binary files a/presence_api/bin/Debug/net8.0/domain.dll and b/presence_api/bin/Debug/net8.0/domain.dll differ diff --git a/presence_api/bin/Debug/net8.0/domain.pdb b/presence_api/bin/Debug/net8.0/domain.pdb index 3c658af..9fba452 100644 Binary files a/presence_api/bin/Debug/net8.0/domain.pdb and b/presence_api/bin/Debug/net8.0/domain.pdb differ diff --git a/presence_api/bin/Debug/net8.0/presence_api.dll b/presence_api/bin/Debug/net8.0/presence_api.dll index 51280b8..629c2b1 100644 Binary files a/presence_api/bin/Debug/net8.0/presence_api.dll and b/presence_api/bin/Debug/net8.0/presence_api.dll differ diff --git a/presence_api/bin/Debug/net8.0/presence_api.pdb b/presence_api/bin/Debug/net8.0/presence_api.pdb index 6953df0..293193b 100644 Binary files a/presence_api/bin/Debug/net8.0/presence_api.pdb and b/presence_api/bin/Debug/net8.0/presence_api.pdb differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs index 261b3d9..9f48caf 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs +++ b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("presence_api")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8bf4628cce91d7266a54ce8ba848e91ee1b2569")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7022af564df3af3bd7b3d3e4904e100f6e6294bc")] [assembly: System.Reflection.AssemblyProductAttribute("presence_api")] [assembly: System.Reflection.AssemblyTitleAttribute("presence_api")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache index b7c57b3..f7f4a49 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache +++ b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfoInputs.cache @@ -1 +1 @@ -52221bf6c627d0a1f38ec9399dcd7b73938674fb1e29c05bd07d9c179faa01c4 +7dcf2234c5025f4297ae3529e7e05ecddaafe8eda1311843fc42af2cbe4afbb9 diff --git a/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache b/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache index 53bd473..b1ff034 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache and b/presence_api/obj/Debug/net8.0/presence_api.csproj.AssemblyReference.cache differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.dll b/presence_api/obj/Debug/net8.0/presence_api.dll index 51280b8..629c2b1 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.dll and b/presence_api/obj/Debug/net8.0/presence_api.dll differ diff --git a/presence_api/obj/Debug/net8.0/presence_api.pdb b/presence_api/obj/Debug/net8.0/presence_api.pdb index 6953df0..293193b 100644 Binary files a/presence_api/obj/Debug/net8.0/presence_api.pdb and b/presence_api/obj/Debug/net8.0/presence_api.pdb differ diff --git a/presence_api/obj/Debug/net8.0/ref/presence_api.dll b/presence_api/obj/Debug/net8.0/ref/presence_api.dll index fbac71d..4cd3a3c 100644 Binary files a/presence_api/obj/Debug/net8.0/ref/presence_api.dll and b/presence_api/obj/Debug/net8.0/ref/presence_api.dll differ diff --git a/presence_api/obj/Debug/net8.0/refint/presence_api.dll b/presence_api/obj/Debug/net8.0/refint/presence_api.dll index fbac71d..4cd3a3c 100644 Binary files a/presence_api/obj/Debug/net8.0/refint/presence_api.dll and b/presence_api/obj/Debug/net8.0/refint/presence_api.dll differ diff --git a/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs b/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs index 4a907bf..dbacc79 100644 --- a/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs +++ b/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("ui")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b8bf4628cce91d7266a54ce8ba848e91ee1b2569")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7022af564df3af3bd7b3d3e4904e100f6e6294bc")] [assembly: System.Reflection.AssemblyProductAttribute("ui")] [assembly: System.Reflection.AssemblyTitleAttribute("ui")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache b/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache index 9b08e00..99948d3 100644 --- a/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache +++ b/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache @@ -1 +1 @@ -a566caacf63689b16cb3406c30a83366cd1327afd2187d25ebbffca47b491f0b +6af47f6a2108a9fdf37e6d5359dbde1827d2db002e4e6ee422264c0f631befa8 diff --git a/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache b/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache index 9d4d6e6..a9e222e 100644 Binary files a/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache and b/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache differ