From 7022af564df3af3bd7b3d3e4904e100f6e6294bc Mon Sep 17 00:00:00 2001 From: Dasha06 Date: Tue, 17 Dec 2024 12:13:12 +0300 Subject: [PATCH] part of integrating opening csv files --- Presence.Desktop/ViewModels/GroupViewModel.cs | 22 ++++- Presence.Desktop/Views/GroupView.axaml | 4 +- .../bin/Debug/net8.0/Presence.Desktop.dll | Bin 213504 -> 213504 bytes .../bin/Debug/net8.0/Presence.Desktop.pdb | Bin 19988 -> 21856 bytes Presence.Desktop/bin/Debug/net8.0/data.dll | Bin 40448 -> 40960 bytes Presence.Desktop/bin/Debug/net8.0/data.pdb | Bin 20440 -> 20448 bytes Presence.Desktop/bin/Debug/net8.0/domain.dll | Bin 25088 -> 25088 bytes Presence.Desktop/bin/Debug/net8.0/domain.pdb | Bin 19168 -> 19156 bytes .../net8.0/Avalonia/Presence.Desktop.dll | Bin 213504 -> 213504 bytes .../net8.0/Avalonia/Presence.Desktop.pdb | Bin 19988 -> 21856 bytes .../net8.0/Avalonia/Resources.Inputs.cache | 2 +- .../obj/Debug/net8.0/Avalonia/resources | Bin 180506 -> 180524 bytes .../net8.0/Presence.Desktop.AssemblyInfo.cs | 2 +- .../Presence.Desktop.AssemblyInfoInputs.cache | 2 +- ...nce.Desktop.csproj.AssemblyReference.cache | Bin 22498 -> 22498 bytes .../obj/Debug/net8.0/Presence.Desktop.dll | Bin 0 -> 196608 bytes .../obj/Debug/net8.0/Presence.Desktop.pdb | Bin 0 -> 19160 bytes .../obj/Debug/net8.0/ref/Presence.Desktop.dll | Bin 9216 -> 9216 bytes .../refint/Avalonia/Presence.Desktop.dll | Bin 9216 -> 9216 bytes .../Debug/net8.0/refint/Presence.Desktop.dll | Bin 0 -> 10240 bytes .../Debug/net8.0/console_ui.AssemblyInfo.cs | 2 +- .../console_ui.AssemblyInfoInputs.cache | 2 +- .../console_ui.csproj.AssemblyReference.cache | Bin 11349 -> 12553 bytes data/Repository/GroupRepositoryImpl.cs | 9 +- data/bin/Debug/net8.0/data.dll | Bin 40448 -> 40960 bytes data/bin/Debug/net8.0/data.pdb | Bin 20440 -> 20448 bytes data/obj/Debug/net8.0/data.AssemblyInfo.cs | 2 +- .../net8.0/data.AssemblyInfoInputs.cache | 2 +- data/obj/Debug/net8.0/data.dll | Bin 40448 -> 40960 bytes data/obj/Debug/net8.0/data.pdb | Bin 20440 -> 20448 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 domain/UseCase/IUserUseCase.cs | 7 +- domain/bin/Debug/net8.0/data.dll | Bin 40448 -> 40960 bytes domain/bin/Debug/net8.0/data.pdb | Bin 20440 -> 20448 bytes domain/bin/Debug/net8.0/domain.dll | Bin 25088 -> 25088 bytes domain/bin/Debug/net8.0/domain.pdb | Bin 19168 -> 19156 bytes .../obj/Debug/net8.0/domain.AssemblyInfo.cs | 2 +- .../net8.0/domain.AssemblyInfoInputs.cache | 2 +- .../domain.csproj.AssemblyReference.cache | Bin 8151 -> 8151 bytes domain/obj/Debug/net8.0/domain.dll | Bin 25088 -> 25088 bytes domain/obj/Debug/net8.0/domain.pdb | Bin 19168 -> 19156 bytes domain/obj/Debug/net8.0/ref/domain.dll | Bin 13312 -> 13312 bytes domain/obj/Debug/net8.0/refint/domain.dll | Bin 13312 -> 13312 bytes not relevant/UserService.cs | 33 +++++++ not relevant/UserView.axaml | 34 +++++++ not relevant/UserView.axaml.cs | 17 ++++ not relevant/UserViewModel.cs | 84 ++++++++++++++++++ presence_api/bin/Debug/net8.0/data.dll | Bin 40448 -> 40448 bytes presence_api/bin/Debug/net8.0/data.pdb | Bin 20440 -> 20440 bytes presence_api/bin/Debug/net8.0/domain.dll | Bin 24576 -> 25088 bytes presence_api/bin/Debug/net8.0/domain.pdb | Bin 19032 -> 19156 bytes .../bin/Debug/net8.0/presence_api.dll | Bin 12288 -> 12288 bytes .../bin/Debug/net8.0/presence_api.pdb | Bin 23432 -> 23432 bytes .../Debug/net8.0/presence_api.AssemblyInfo.cs | 2 +- .../presence_api.AssemblyInfoInputs.cache | 2 +- ...resence_api.csproj.AssemblyReference.cache | Bin 6446 -> 5581 bytes .../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 ui/obj/Debug/net8.0/ui.AssemblyInfo.cs | 2 +- .../Debug/net8.0/ui.AssemblyInfoInputs.cache | 2 +- .../net8.0/ui.csproj.AssemblyReference.cache | Bin 11806 -> 10602 bytes 64 files changed, 215 insertions(+), 21 deletions(-) create mode 100644 Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll create mode 100644 Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.pdb create mode 100644 Presence.Desktop/obj/Debug/net8.0/refint/Presence.Desktop.dll create mode 100644 not relevant/UserService.cs create mode 100644 not relevant/UserView.axaml create mode 100644 not relevant/UserView.axaml.cs create mode 100644 not relevant/UserViewModel.cs diff --git a/Presence.Desktop/ViewModels/GroupViewModel.cs b/Presence.Desktop/ViewModels/GroupViewModel.cs index 7d6f5fb..9df72bb 100644 --- a/Presence.Desktop/ViewModels/GroupViewModel.cs +++ b/Presence.Desktop/ViewModels/GroupViewModel.cs @@ -8,12 +8,24 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Reactive.Linq; +using System.Threading.Tasks; +using System.Windows.Input; using Tmds.DBus.Protocol; namespace Presence.Desktop.ViewModels { public class GroupViewModel : ViewModelBase, IRoutableViewModel { + public ICommand OpenFileDialog { get; } + public Interaction SelectFileInteraction => _SelectFileInteraction; + public readonly Interaction _SelectFileInteraction; + private string? _selectedFile; + public string? SelectedFile + { + get => _selectedFile; + set => this.RaiseAndSetIfChanged(ref _selectedFile, value); + } + private readonly List _groupPresentersDataSource = new List(); private ObservableCollection _groups; public ObservableCollection Groups => _groups; @@ -50,6 +62,8 @@ namespace Presence.Desktop.ViewModels _groups = new ObservableCollection(_groupPresentersDataSource); _groupUseCase = groupUseCase; + _SelectFileInteraction = new Interaction(); + OpenFileDialog = ReactiveCommand.CreateFromTask(SelectFile); _users = new ObservableCollection(); RefreshGroups(); @@ -72,7 +86,7 @@ namespace Presence.Desktop.ViewModels { Users.Add(item); } - } + } private void RefreshGroups() @@ -98,5 +112,11 @@ namespace Presence.Desktop.ViewModels } public string? UrlPathSegment { get; } public IScreen HostScreen { get; } + + private async Task SelectFile() + { + Console.WriteLine("clock"); + SelectedFile = await _SelectFileInteraction.Handle("Chose csv file"); + } } } \ No newline at end of file diff --git a/Presence.Desktop/Views/GroupView.axaml b/Presence.Desktop/Views/GroupView.axaml index e63b8c6..0aa048c 100644 --- a/Presence.Desktop/Views/GroupView.axaml +++ b/Presence.Desktop/Views/GroupView.axaml @@ -27,7 +27,7 @@ - +