diff --git a/.vs/ProjectEvaluation/presence.metadata.v7.bin b/.vs/ProjectEvaluation/presence.metadata.v7.bin new file mode 100644 index 0000000..ae9e91d Binary files /dev/null and b/.vs/ProjectEvaluation/presence.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/presence.projects.v7.bin b/.vs/ProjectEvaluation/presence.projects.v7.bin new file mode 100644 index 0000000..ce7992b Binary files /dev/null and b/.vs/ProjectEvaluation/presence.projects.v7.bin differ diff --git a/.vs/presence/DesignTimeBuild/.dtbcache.v2 b/.vs/presence/DesignTimeBuild/.dtbcache.v2 new file mode 100644 index 0000000..7b02d9a Binary files /dev/null and b/.vs/presence/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/presence/FileContentIndex/0929bca7-a2e7-4aaf-a44b-2b3fb9784897.vsidx b/.vs/presence/FileContentIndex/0929bca7-a2e7-4aaf-a44b-2b3fb9784897.vsidx new file mode 100644 index 0000000..e3f396c Binary files /dev/null and b/.vs/presence/FileContentIndex/0929bca7-a2e7-4aaf-a44b-2b3fb9784897.vsidx differ diff --git a/.vs/presence/FileContentIndex/c4e4679c-8cad-432e-a095-3324921079ed.vsidx b/.vs/presence/FileContentIndex/c4e4679c-8cad-432e-a095-3324921079ed.vsidx new file mode 100644 index 0000000..23b4e0e Binary files /dev/null and b/.vs/presence/FileContentIndex/c4e4679c-8cad-432e-a095-3324921079ed.vsidx differ diff --git a/.vs/presence/FileContentIndex/c9029199-4064-4e93-b4e3-df788223c144.vsidx b/.vs/presence/FileContentIndex/c9029199-4064-4e93-b4e3-df788223c144.vsidx new file mode 100644 index 0000000..ca85ed2 Binary files /dev/null and b/.vs/presence/FileContentIndex/c9029199-4064-4e93-b4e3-df788223c144.vsidx differ diff --git a/.vs/presence/v17/.futdcache.v2 b/.vs/presence/v17/.futdcache.v2 new file mode 100644 index 0000000..77955a5 Binary files /dev/null and b/.vs/presence/v17/.futdcache.v2 differ diff --git a/.vs/presence/v17/.suo b/.vs/presence/v17/.suo new file mode 100644 index 0000000..25f666c Binary files /dev/null and b/.vs/presence/v17/.suo differ diff --git a/.vs/presence/v17/DocumentLayout.json b/.vs/presence/v17/DocumentLayout.json new file mode 100644 index 0000000..6f98220 --- /dev/null +++ b/.vs/presence/v17/DocumentLayout.json @@ -0,0 +1,225 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\class_student\\source\\repos\\presence\\", + "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\viewmodels\\groupviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\viewmodels\\groupviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\viewmodels\\grouppresenter.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\viewmodels\\grouppresenter.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\views\\presenceview.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\views\\presenceview.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\viewmodels\\presencepresentor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\viewmodels\\presencepresentor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\viewmodels\\mainwindowviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\views\\groupview.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\views\\groupview.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\viewmodels\\studentcsvmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\viewmodels\\studentcsvmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\viewmodels\\userpresenter.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\viewmodels\\userpresenter.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\views\\mainwindow.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}" + }, + { + "AbsoluteMoniker": "D:0:0:{E466FB14-716E-437F-9E6C-B2A0D786694C}|presence_api\\presence_api.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{E466FB14-716E-437F-9E6C-B2A0D786694C}|presence_api\\presence_api.csproj|solutionrelative:presence_api\\presence_api.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|c:\\users\\class_student\\source\\repos\\presence\\presence.desktop\\viewmodels\\presenceviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{4A745F7C-B312-4411-AA95-5862597C7B0B}|Presence.Desktop\\Presence.Desktop.csproj|solutionrelative:presence.desktop\\viewmodels\\presenceviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{1904560F-B17D-4598-AE5C-5FA0D0C2517B}|ui\\ui.csproj|c:\\users\\class_student\\source\\repos\\presence\\ui\\groupconsole.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{1904560F-B17D-4598-AE5C-5FA0D0C2517B}|ui\\ui.csproj|solutionrelative:ui\\groupconsole.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + } + ], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": 2, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "StudentCsvModel.cs", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\StudentCsvModel.cs", + "RelativeDocumentMoniker": "Presence.Desktop\\ViewModels\\StudentCsvModel.cs", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\StudentCsvModel.cs", + "RelativeToolTip": "Presence.Desktop\\ViewModels\\StudentCsvModel.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAwAAAABAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T07:45:42.251Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "GroupViewModel.cs", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\GroupViewModel.cs", + "RelativeDocumentMoniker": "Presence.Desktop\\ViewModels\\GroupViewModel.cs", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\GroupViewModel.cs", + "RelativeToolTip": "Presence.Desktop\\ViewModels\\GroupViewModel.cs", + "ViewState": "AQIAAJkAAAAAAAAAAAAAAJ4AAABNAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T07:37:02.276Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "MainWindow.axaml", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Views\\MainWindow.axaml", + "RelativeDocumentMoniker": "Presence.Desktop\\Views\\MainWindow.axaml", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Views\\MainWindow.axaml", + "RelativeToolTip": "Presence.Desktop\\Views\\MainWindow.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-12-19T07:42:07.973Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "presence_api", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj", + "RelativeDocumentMoniker": "presence_api\\presence_api.csproj", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\presence_api\\presence_api.csproj", + "RelativeToolTip": "presence_api\\presence_api.csproj", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABYAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2024-12-19T07:38:02.808Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "GroupPresenter.cs", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\GroupPresenter.cs", + "RelativeDocumentMoniker": "Presence.Desktop\\ViewModels\\GroupPresenter.cs", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\GroupPresenter.cs", + "RelativeToolTip": "Presence.Desktop\\ViewModels\\GroupPresenter.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAA8AAABGAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T07:36:56.15Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 3, + "Title": "PresencePresentor.cs", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\PresencePresentor.cs", + "RelativeDocumentMoniker": "Presence.Desktop\\ViewModels\\PresencePresentor.cs", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\PresencePresentor.cs", + "RelativeToolTip": "Presence.Desktop\\ViewModels\\PresencePresentor.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAoAAAAcAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T07:36:52.077Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "PresenceViewModel.cs", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\PresenceViewModel.cs", + "RelativeDocumentMoniker": "Presence.Desktop\\ViewModels\\PresenceViewModel.cs", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\PresenceViewModel.cs", + "RelativeToolTip": "Presence.Desktop\\ViewModels\\PresenceViewModel.cs", + "ViewState": "AQIAAAgAAAAAAAAAAAAQwBQAAAAnAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T07:35:00.109Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "GroupView.axaml", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Views\\GroupView.axaml", + "RelativeDocumentMoniker": "Presence.Desktop\\Views\\GroupView.axaml", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Views\\GroupView.axaml", + "RelativeToolTip": "Presence.Desktop\\Views\\GroupView.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-12-19T07:33:07.728Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "PresenceView.axaml", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Views\\PresenceView.axaml", + "RelativeDocumentMoniker": "Presence.Desktop\\Views\\PresenceView.axaml", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Views\\PresenceView.axaml", + "RelativeToolTip": "Presence.Desktop\\Views\\PresenceView.axaml", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|", + "WhenOpened": "2024-12-19T07:34:46.592Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "MainWindowViewModel.cs", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\MainWindowViewModel.cs", + "RelativeDocumentMoniker": "Presence.Desktop\\ViewModels\\MainWindowViewModel.cs", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\MainWindowViewModel.cs", + "RelativeToolTip": "Presence.Desktop\\ViewModels\\MainWindowViewModel.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T07:46:22.387Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "UserPresenter.cs", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\UserPresenter.cs", + "RelativeDocumentMoniker": "Presence.Desktop\\ViewModels\\UserPresenter.cs", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\ViewModels\\UserPresenter.cs", + "RelativeToolTip": "Presence.Desktop\\ViewModels\\UserPresenter.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T07:48:17.874Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "GroupConsole.cs", + "DocumentMoniker": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\GroupConsole.cs", + "RelativeDocumentMoniker": "ui\\GroupConsole.cs", + "ToolTip": "C:\\Users\\class_student\\source\\repos\\presence\\ui\\GroupConsole.cs", + "RelativeToolTip": "ui\\GroupConsole.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-19T07:33:01.161Z", + "EditorCaption": "" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Presence.Desktop/Presence.Desktop.csproj b/Presence.Desktop/Presence.Desktop.csproj index 337988a..a3440db 100644 --- a/Presence.Desktop/Presence.Desktop.csproj +++ b/Presence.Desktop/Presence.Desktop.csproj @@ -24,6 +24,7 @@ All + diff --git a/Presence.Desktop/ViewModels/GroupViewModel.cs b/Presence.Desktop/ViewModels/GroupViewModel.cs index 7d6ca0e..623b5b3 100644 --- a/Presence.Desktop/ViewModels/GroupViewModel.cs +++ b/Presence.Desktop/ViewModels/GroupViewModel.cs @@ -10,9 +10,14 @@ using System.Linq; using System.Reactive; using System.Reactive.Linq; using System.Windows.Input; -using Avalonia; +using Avalonia; +using System.Formats.Asn1; +using System.IO; +using CsvHelper; +using CsvHelper.Configuration; namespace Presence.Desktop.ViewModels + { public class GroupViewModel : ViewModelBase, IRoutableViewModel { @@ -145,33 +150,82 @@ namespace Presence.Desktop.ViewModels { HostScreen.Router.Navigate.Execute(new PresenceViewModel()); } - - + + private void AddStudent() { + string csvFilePath = @"C:\Users\class_student\Documents\Group.csv"; // Укажите путь к CSV файлу + + List students; + try + { + students = ReadStudentsFromCsv(csvFilePath); + } + catch (Exception ex) + { + Console.WriteLine($"Ошибка при чтении CSV: {ex.Message}"); + return; + } + if (SelectedGroupItem == null) return; - var newStudent = new UserPresenter + foreach (var student in students) { - Name = "Новый студент", - Guid = Guid.NewGuid(), - Group = SelectedGroupItem - }; + _groupUseCase.AddStudentToGroup(SelectedGroupItem.Id, new User + { + + FIO = student.Name + }); - _groupUseCase.AddStudentToGroup(SelectedGroupItem.Id, new User - { - Guid = newStudent.Guid, - FIO = newStudent.Name - }); + var newStudent = new UserPresenter + { + Name = student.Name, + Group = SelectedGroupItem // Устанавливаем ссылку на группу + }; + + var updatedUsers = SelectedGroupItem.users?.ToList() ?? new List(); + updatedUsers.Add(newStudent); + SelectedGroupItem.users = updatedUsers; + } - var updatedUsers = SelectedGroupItem.users?.ToList() ?? new List(); - updatedUsers.Add(newStudent); - SelectedGroupItem.users = updatedUsers; SetUsers(); } + private List ReadStudentsFromCsv(string filePath) + { + var students = new List(); + + try + { + using (var reader = new StreamReader(filePath)) + using (var csv = new CsvReader(reader, new CsvConfiguration(System.Globalization.CultureInfo.InvariantCulture) + { + HasHeaderRecord = true, + Delimiter = "," + })) + { + var records = csv.GetRecords().ToList(); + foreach (var record in records) + { + var student = new UserPresenter + { + Guid = Guid.NewGuid(), // Предполагаем, что GUID генерируется здесь + Name = record.Name + }; + students.Add(student); + } + } + } + catch (Exception ex) + { + Console.WriteLine($"Ошибка при чтении CSV файла: {ex.Message}"); + } + + return students; + } + public void OnDeleteUserClick() { if (SelectedUsers.Count == 0 || SelectedGroupItem?.users == null) diff --git a/Presence.Desktop/ViewModels/PresencePresentor.cs b/Presence.Desktop/ViewModels/PresencePresentor.cs new file mode 100644 index 0000000..b8ba8ad --- /dev/null +++ b/Presence.Desktop/ViewModels/PresencePresentor.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Presence.Desktop.ViewModels +{ + public class PresencePresentor + { + public string NAame; + } +} diff --git a/Presence.Desktop/ViewModels/StudentCsvModel.cs b/Presence.Desktop/ViewModels/StudentCsvModel.cs new file mode 100644 index 0000000..da030a3 --- /dev/null +++ b/Presence.Desktop/ViewModels/StudentCsvModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Presence.Desktop.ViewModels +{ + public class StudentCsvModel + { + public string Name { get; set; } + } +} \ No newline at end of file diff --git a/Presence.Desktop/Views/GroupView.axaml b/Presence.Desktop/Views/GroupView.axaml index 1672e30..2c48aee 100644 --- a/Presence.Desktop/Views/GroupView.axaml +++ b/Presence.Desktop/Views/GroupView.axaml @@ -1,86 +1,130 @@ + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:vm="using:Presence.Desktop.ViewModels" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" + x:Class="Presence.Desktop.Views.GroupView" + x:DataType="vm:GroupViewModel"> - - - + - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - + + + + - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/Presence.Desktop/bin/Debug/net8.0/CsvHelper.dll b/Presence.Desktop/bin/Debug/net8.0/CsvHelper.dll new file mode 100644 index 0000000..7a4a0fa Binary files /dev/null and b/Presence.Desktop/bin/Debug/net8.0/CsvHelper.dll differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.deps.json b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.deps.json index fdda241..82740c5 100644 --- a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.deps.json +++ b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.deps.json @@ -14,6 +14,7 @@ "Avalonia.Fonts.Inter": "11.2.1", "Avalonia.ReactiveUI": "11.2.1", "Avalonia.Themes.Fluent": "11.2.1", + "CsvHelper": "33.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", "data": "1.0.0", "domain": "1.0.0" @@ -298,6 +299,14 @@ } } }, + "CsvHelper/33.0.1": { + "runtime": { + "lib/net8.0/CsvHelper.dll": { + "assemblyVersion": "33.0.0.0", + "fileVersion": "33.0.1.24" + } + } + }, "DocumentFormat.OpenXml/3.0.1": { "dependencies": { "DocumentFormat.OpenXml.Framework": "3.0.1" @@ -875,6 +884,13 @@ "path": "closedxml.parser/1.2.0", "hashPath": "closedxml.parser.1.2.0.nupkg.sha512" }, + "CsvHelper/33.0.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-fev4lynklAU2A9GVMLtwarkwaanjSYB4wUqO2nOJX5hnzObORzUqVLe+bDYCUyIIRQM4o5Bsq3CcyJR89iMmEQ==", + "path": "csvhelper/33.0.1", + "hashPath": "csvhelper.33.0.1.nupkg.sha512" + }, "DocumentFormat.OpenXml/3.0.1": { "type": "package", "serviceable": true, diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.dll index 7b1549b..7789db1 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.exe b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.exe index ac71556..8c15f42 100644 Binary files a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.exe and b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.exe differ diff --git a/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb b/Presence.Desktop/bin/Debug/net8.0/Presence.Desktop.pdb index 847d202..4f8ce4b 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 9d8b2b2..07b5a37 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 f64c4f2..a53611e 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 cd95be1..7265c41 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 248b3af..f925573 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 7b1549b..7789db1 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 847d202..4f8ce4b 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/references b/Presence.Desktop/obj/Debug/net8.0/Avalonia/references index 6136c04..dc14b34 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Avalonia/references +++ b/Presence.Desktop/obj/Debug/net8.0/Avalonia/references @@ -25,6 +25,7 @@ C:\Users\class_student\.nuget\packages\avalonia.win32\11.2.1\lib\net8.0\Avalonia C:\Users\class_student\.nuget\packages\avalonia.x11\11.2.1\lib\net8.0\Avalonia.X11.dll C:\Users\class_student\.nuget\packages\closedxml\0.104.1\lib\netstandard2.1\ClosedXML.dll C:\Users\class_student\.nuget\packages\closedxml.parser\1.2.0\lib\netstandard2.1\ClosedXML.Parser.dll +C:\Users\class_student\.nuget\packages\csvhelper\33.0.1\lib\net8.0\CsvHelper.dll C:\Users\class_student\source\repos\presence\data\obj\Debug\net8.0\ref\data.dll C:\Users\class_student\.nuget\packages\documentformat.openxml\3.0.1\lib\net8.0\DocumentFormat.OpenXml.dll C:\Users\class_student\.nuget\packages\documentformat.openxml.framework\3.0.1\lib\net8.0\DocumentFormat.OpenXml.Framework.dll diff --git a/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources b/Presence.Desktop/obj/Debug/net8.0/Avalonia/resources index 26e1a4c..c0ae455 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 9f7d102..1ba9ba8 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.AssemblyInfo.cs @@ -14,7 +14,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+a85b2c9da9ea4b346d13e58ae8eada305dc6f561")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3e8920712739903c1b67511a152f4a0e9ba6b2e")] [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 de1512c..30777c2 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 @@ -ca1b7e486f82334174e52b8caa2ad33557c6602a2571452f2e1f2d48678d23e0 +445af2288a0f282aea641ef6a964c4c3461039de3f45a9d7cf9b4c334978653a diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.assets.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.assets.cache index 70b7f73..e609506 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.assets.cache and b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.assets.cache differ 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 ac7d8de..eabe59b 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.csproj.CoreCompileInputs.cache b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.CoreCompileInputs.cache index 3d2cc46..c9f20d3 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.CoreCompileInputs.cache +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b8e457a113689dd6d1f34fdc4825583934edea336ebb5371c3f539b140208dad +330d2cc4bcbea1ec14461df3976d935a35010466ebe909fa497e9099a805ca37 diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.FileListAbsolute.txt b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.FileListAbsolute.txt index a738a0e..8349023 100644 --- a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.FileListAbsolute.txt +++ b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.csproj.FileListAbsolute.txt @@ -292,3 +292,4 @@ C:\Users\IVAN\Source\Repos\presence_new\Presence.Desktop\bin\Debug\net8.0\domain C:\Users\IVAN\Source\Repos\presence_new\Presence.Desktop\obj\Debug\net8.0\Presence.C94E1B86.Up2Date C:\Users\IVAN\Source\Repos\presence_new\Presence.Desktop\obj\Debug\net8.0\Presence.Desktop.genruntimeconfig.cache C:\Users\IVAN\Source\Repos\presence_new\Presence.Desktop\obj\Debug\net8.0\ref\Presence.Desktop.dll +C:\Users\class_student\source\repos\presence\Presence.Desktop\bin\Debug\net8.0\CsvHelper.dll diff --git a/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll b/Presence.Desktop/obj/Debug/net8.0/Presence.Desktop.dll index 7834bea..928607a 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 2016fb2..b3c1c55 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/apphost.exe b/Presence.Desktop/obj/Debug/net8.0/apphost.exe index ac71556..8c15f42 100644 Binary files a/Presence.Desktop/obj/Debug/net8.0/apphost.exe and b/Presence.Desktop/obj/Debug/net8.0/apphost.exe 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 9b55f2a..ce9adc5 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 9b55f2a..ce9adc5 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 2aedd4c..500952e 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/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.dgspec.json b/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.dgspec.json index 0134935..5fb6e3e 100644 --- a/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.dgspec.json +++ b/Presence.Desktop/obj/Presence.Desktop.csproj.nuget.dgspec.json @@ -234,6 +234,10 @@ "target": "Package", "version": "[11.2.1, )" }, + "CsvHelper": { + "target": "Package", + "version": "[33.0.1, )" + }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "target": "Package", "version": "[9.0.0, )" diff --git a/Presence.Desktop/obj/project.assets.json b/Presence.Desktop/obj/project.assets.json index 4d5def1..da4d0ee 100644 --- a/Presence.Desktop/obj/project.assets.json +++ b/Presence.Desktop/obj/project.assets.json @@ -389,6 +389,19 @@ } } }, + "CsvHelper/33.0.1": { + "type": "package", + "compile": { + "lib/net8.0/CsvHelper.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/CsvHelper.dll": { + "related": ".xml" + } + } + }, "DocumentFormat.OpenXml/3.0.1": { "type": "package", "dependencies": { @@ -1573,6 +1586,34 @@ "lib/netstandard2.1/ClosedXML.Parser.xml" ] }, + "CsvHelper/33.0.1": { + "sha512": "fev4lynklAU2A9GVMLtwarkwaanjSYB4wUqO2nOJX5hnzObORzUqVLe+bDYCUyIIRQM4o5Bsq3CcyJR89iMmEQ==", + "type": "package", + "path": "csvhelper/33.0.1", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "csvhelper.33.0.1.nupkg.sha512", + "csvhelper.nuspec", + "lib/net462/CsvHelper.dll", + "lib/net462/CsvHelper.xml", + "lib/net47/CsvHelper.dll", + "lib/net47/CsvHelper.xml", + "lib/net48/CsvHelper.dll", + "lib/net48/CsvHelper.xml", + "lib/net6.0/CsvHelper.dll", + "lib/net6.0/CsvHelper.xml", + "lib/net7.0/CsvHelper.dll", + "lib/net7.0/CsvHelper.xml", + "lib/net8.0/CsvHelper.dll", + "lib/net8.0/CsvHelper.xml", + "lib/netstandard2.0/CsvHelper.dll", + "lib/netstandard2.0/CsvHelper.xml", + "lib/netstandard2.1/CsvHelper.dll", + "lib/netstandard2.1/CsvHelper.xml" + ] + }, "DocumentFormat.OpenXml/3.0.1": { "sha512": "DCK1cwFUJ1FGGyYyo++HWl9H1RkqMWIu+FGOLRy6E4L4y0/HIhlJ7N/n1HKboFfOwKn1cMBRxt1RCuDbIEy5YQ==", "type": "package", @@ -2761,6 +2802,7 @@ "Avalonia.Fonts.Inter >= 11.2.1", "Avalonia.ReactiveUI >= 11.2.1", "Avalonia.Themes.Fluent >= 11.2.1", + "CsvHelper >= 33.0.1", "Microsoft.Extensions.DependencyInjection.Abstractions >= 9.0.0", "data >= 1.0.0", "domain >= 1.0.0" @@ -2846,6 +2888,10 @@ "target": "Package", "version": "[11.2.1, )" }, + "CsvHelper": { + "target": "Package", + "version": "[33.0.1, )" + }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "target": "Package", "version": "[9.0.0, )" diff --git a/Presence.Desktop/obj/project.nuget.cache b/Presence.Desktop/obj/project.nuget.cache index 7d9d078..50c4846 100644 --- a/Presence.Desktop/obj/project.nuget.cache +++ b/Presence.Desktop/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "AZCz7vOZdu5VQeeiEBBIP4P3zWTQI/Ro92mlIfiGUTmCIpyR2yf25RC4KjYnfsX0AxgMUYo5fXixUN0jbxFoKw==", + "dgSpecHash": "S9m3q8B/DtB2gOSOHvNFQBsFeDxgKkGvx6DjgxvLG3zrKWOZd2ToZyA875yLI7RIavDPanPOf/MFiRMMmz9yGQ==", "success": true, "projectFilePath": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Presence.Desktop.csproj", "expectedPackageFiles": [ @@ -23,6 +23,7 @@ "C:\\Users\\class_student\\.nuget\\packages\\avalonia.x11\\11.2.1\\avalonia.x11.11.2.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\closedxml\\0.104.1\\closedxml.0.104.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\closedxml.parser\\1.2.0\\closedxml.parser.1.2.0.nupkg.sha512", + "C:\\Users\\class_student\\.nuget\\packages\\csvhelper\\33.0.1\\csvhelper.33.0.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\documentformat.openxml\\3.0.1\\documentformat.openxml.3.0.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\documentformat.openxml.framework\\3.0.1\\documentformat.openxml.framework.3.0.1.nupkg.sha512", "C:\\Users\\class_student\\.nuget\\packages\\dynamicdata\\8.4.1\\dynamicdata.8.4.1.nupkg.sha512", diff --git a/console_ui/bin/Debug/net8.0/console_ui.dll b/console_ui/bin/Debug/net8.0/console_ui.dll index 0ecdd40..432a271 100644 Binary files a/console_ui/bin/Debug/net8.0/console_ui.dll and b/console_ui/bin/Debug/net8.0/console_ui.dll differ diff --git a/console_ui/bin/Debug/net8.0/console_ui.exe b/console_ui/bin/Debug/net8.0/console_ui.exe index 6afe21a..92ec3ca 100644 Binary files a/console_ui/bin/Debug/net8.0/console_ui.exe and b/console_ui/bin/Debug/net8.0/console_ui.exe differ diff --git a/console_ui/bin/Debug/net8.0/console_ui.pdb b/console_ui/bin/Debug/net8.0/console_ui.pdb index a089d83..b10a157 100644 Binary files a/console_ui/bin/Debug/net8.0/console_ui.pdb and b/console_ui/bin/Debug/net8.0/console_ui.pdb differ diff --git a/console_ui/bin/Debug/net8.0/data.dll b/console_ui/bin/Debug/net8.0/data.dll index 77d4e10..07b5a37 100644 Binary files a/console_ui/bin/Debug/net8.0/data.dll and b/console_ui/bin/Debug/net8.0/data.dll differ diff --git a/console_ui/bin/Debug/net8.0/data.pdb b/console_ui/bin/Debug/net8.0/data.pdb index 98d04cf..a53611e 100644 Binary files a/console_ui/bin/Debug/net8.0/data.pdb and b/console_ui/bin/Debug/net8.0/data.pdb differ diff --git a/console_ui/bin/Debug/net8.0/domain.dll b/console_ui/bin/Debug/net8.0/domain.dll index 4265cf9..7265c41 100644 Binary files a/console_ui/bin/Debug/net8.0/domain.dll and b/console_ui/bin/Debug/net8.0/domain.dll differ diff --git a/console_ui/bin/Debug/net8.0/domain.pdb b/console_ui/bin/Debug/net8.0/domain.pdb index f78d8a1..f925573 100644 Binary files a/console_ui/bin/Debug/net8.0/domain.pdb and b/console_ui/bin/Debug/net8.0/domain.pdb differ diff --git a/console_ui/bin/Debug/net8.0/ui.dll b/console_ui/bin/Debug/net8.0/ui.dll index 6ad03b0..0f10b2a 100644 Binary files a/console_ui/bin/Debug/net8.0/ui.dll and b/console_ui/bin/Debug/net8.0/ui.dll differ diff --git a/console_ui/bin/Debug/net8.0/ui.pdb b/console_ui/bin/Debug/net8.0/ui.pdb index ed9bee6..0c2038e 100644 Binary files a/console_ui/bin/Debug/net8.0/ui.pdb and b/console_ui/bin/Debug/net8.0/ui.pdb differ diff --git a/console_ui/obj/Debug/net8.0/apphost.exe b/console_ui/obj/Debug/net8.0/apphost.exe index 6afe21a..92ec3ca 100644 Binary files a/console_ui/obj/Debug/net8.0/apphost.exe and b/console_ui/obj/Debug/net8.0/apphost.exe 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 632cc06..8e6de36 100644 --- a/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs +++ b/console_ui/obj/Debug/net8.0/console_ui.AssemblyInfo.cs @@ -14,7 +14,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+a85b2c9da9ea4b346d13e58ae8eada305dc6f561")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3e8920712739903c1b67511a152f4a0e9ba6b2e")] [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 564a6e7..7cd88ae 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 @@ -4ce6660b6a7021a0e28de37ccf4e56881e9c6d16aafc4b39886b2040c49ae905 +4b8e74fc32091abc29c5af647acb5dee706c95435510ee47553b54c489eaadd1 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 c797a95..1171e0a 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/console_ui/obj/Debug/net8.0/console_ui.dll b/console_ui/obj/Debug/net8.0/console_ui.dll index 0ecdd40..432a271 100644 Binary files a/console_ui/obj/Debug/net8.0/console_ui.dll and b/console_ui/obj/Debug/net8.0/console_ui.dll differ diff --git a/console_ui/obj/Debug/net8.0/console_ui.pdb b/console_ui/obj/Debug/net8.0/console_ui.pdb index a089d83..b10a157 100644 Binary files a/console_ui/obj/Debug/net8.0/console_ui.pdb and b/console_ui/obj/Debug/net8.0/console_ui.pdb differ diff --git a/console_ui/obj/Debug/net8.0/ref/console_ui.dll b/console_ui/obj/Debug/net8.0/ref/console_ui.dll index 25ebf27..9e8e682 100644 Binary files a/console_ui/obj/Debug/net8.0/ref/console_ui.dll and b/console_ui/obj/Debug/net8.0/ref/console_ui.dll differ diff --git a/console_ui/obj/Debug/net8.0/refint/console_ui.dll b/console_ui/obj/Debug/net8.0/refint/console_ui.dll index 25ebf27..9e8e682 100644 Binary files a/console_ui/obj/Debug/net8.0/refint/console_ui.dll and b/console_ui/obj/Debug/net8.0/refint/console_ui.dll differ diff --git a/data/bin/Debug/net8.0/data.dll b/data/bin/Debug/net8.0/data.dll index 9d8b2b2..07b5a37 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 f64c4f2..a53611e 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 c672115..0e882a2 100644 --- a/data/obj/Debug/net8.0/data.AssemblyInfo.cs +++ b/data/obj/Debug/net8.0/data.AssemblyInfo.cs @@ -14,7 +14,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+a85b2c9da9ea4b346d13e58ae8eada305dc6f561")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3e8920712739903c1b67511a152f4a0e9ba6b2e")] [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 a8aa351..1974a14 100644 --- a/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache +++ b/data/obj/Debug/net8.0/data.AssemblyInfoInputs.cache @@ -1 +1 @@ -adc11d429c3bef1c9b3af949aa504568583ebc1924b1ffaec95a95c7bd34e503 +f23e71fea1d443c315d6f97457243328d8b36eecffab88e692255a6d746dfd08 diff --git a/data/obj/Debug/net8.0/data.dll b/data/obj/Debug/net8.0/data.dll index 9d8b2b2..07b5a37 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 f64c4f2..a53611e 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 d6524ee..e91d554 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 d6524ee..e91d554 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/bin/Debug/net8.0/data.dll b/domain/bin/Debug/net8.0/data.dll index 9d8b2b2..07b5a37 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 f64c4f2..a53611e 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 cd95be1..7265c41 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 248b3af..f925573 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 b6cb1fc..ad727bc 100644 --- a/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs +++ b/domain/obj/Debug/net8.0/domain.AssemblyInfo.cs @@ -14,7 +14,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+a85b2c9da9ea4b346d13e58ae8eada305dc6f561")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3e8920712739903c1b67511a152f4a0e9ba6b2e")] [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 0bd7e95..7856785 100644 --- a/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache +++ b/domain/obj/Debug/net8.0/domain.AssemblyInfoInputs.cache @@ -1 +1 @@ -e2afd34a01255f96cbabfd4d69b4e764b119ba42cb5dd157aaa2f50827130423 +17504c0919a17856cddae5775c6a234bc8ca3a3ce14a57edaa7ad3b51d74606d diff --git a/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache b/domain/obj/Debug/net8.0/domain.csproj.AssemblyReference.cache index 37c47cd..e8a691d 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 cd95be1..7265c41 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 248b3af..f925573 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 6f670e2..655689b 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 6f670e2..655689b 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 77d4e10..07b5a37 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 98d04cf..a53611e 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 4265cf9..7265c41 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 f78d8a1..f925573 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 be45a0a..0e77207 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.exe b/presence_api/bin/Debug/net8.0/presence_api.exe index f65f0c0..9b2c801 100644 Binary files a/presence_api/bin/Debug/net8.0/presence_api.exe and b/presence_api/bin/Debug/net8.0/presence_api.exe differ diff --git a/presence_api/bin/Debug/net8.0/presence_api.pdb b/presence_api/bin/Debug/net8.0/presence_api.pdb index 8c84213..3e31638 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/apphost.exe b/presence_api/obj/Debug/net8.0/apphost.exe index f65f0c0..9b2c801 100644 Binary files a/presence_api/obj/Debug/net8.0/apphost.exe and b/presence_api/obj/Debug/net8.0/apphost.exe 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 e290fab..9722fd0 100644 --- a/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs +++ b/presence_api/obj/Debug/net8.0/presence_api.AssemblyInfo.cs @@ -14,7 +14,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+a85b2c9da9ea4b346d13e58ae8eada305dc6f561")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3e8920712739903c1b67511a152f4a0e9ba6b2e")] [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 55a8e79..ff18953 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 @@ -77afe85cec6bc108d040d94456934b1a51ad19847430c31dd163733abb58c2e9 +e35841825b72c81d4392703ae2e84f50e5ed5e6813f950a7abb8854895facae5 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 069d4d5..4168cf1 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 be45a0a..0e77207 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 8c84213..3e31638 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 029ec0c..ff617f7 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 029ec0c..ff617f7 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/bin/Debug/net8.0/data.dll b/ui/bin/Debug/net8.0/data.dll index 77d4e10..07b5a37 100644 Binary files a/ui/bin/Debug/net8.0/data.dll and b/ui/bin/Debug/net8.0/data.dll differ diff --git a/ui/bin/Debug/net8.0/data.pdb b/ui/bin/Debug/net8.0/data.pdb index 98d04cf..a53611e 100644 Binary files a/ui/bin/Debug/net8.0/data.pdb and b/ui/bin/Debug/net8.0/data.pdb differ diff --git a/ui/bin/Debug/net8.0/domain.dll b/ui/bin/Debug/net8.0/domain.dll index 4265cf9..7265c41 100644 Binary files a/ui/bin/Debug/net8.0/domain.dll and b/ui/bin/Debug/net8.0/domain.dll differ diff --git a/ui/bin/Debug/net8.0/domain.pdb b/ui/bin/Debug/net8.0/domain.pdb index f78d8a1..f925573 100644 Binary files a/ui/bin/Debug/net8.0/domain.pdb and b/ui/bin/Debug/net8.0/domain.pdb differ diff --git a/ui/bin/Debug/net8.0/ui.dll b/ui/bin/Debug/net8.0/ui.dll index 6ad03b0..0f10b2a 100644 Binary files a/ui/bin/Debug/net8.0/ui.dll and b/ui/bin/Debug/net8.0/ui.dll differ diff --git a/ui/bin/Debug/net8.0/ui.pdb b/ui/bin/Debug/net8.0/ui.pdb index ed9bee6..0c2038e 100644 Binary files a/ui/bin/Debug/net8.0/ui.pdb and b/ui/bin/Debug/net8.0/ui.pdb differ diff --git a/ui/obj/Debug/net8.0/ref/ui.dll b/ui/obj/Debug/net8.0/ref/ui.dll index 784d8d3..194b2c7 100644 Binary files a/ui/obj/Debug/net8.0/ref/ui.dll and b/ui/obj/Debug/net8.0/ref/ui.dll differ diff --git a/ui/obj/Debug/net8.0/refint/ui.dll b/ui/obj/Debug/net8.0/refint/ui.dll index 784d8d3..194b2c7 100644 Binary files a/ui/obj/Debug/net8.0/refint/ui.dll and b/ui/obj/Debug/net8.0/refint/ui.dll differ diff --git a/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs b/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs index 7f4e2cf..4c65d35 100644 --- a/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs +++ b/ui/obj/Debug/net8.0/ui.AssemblyInfo.cs @@ -14,7 +14,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+a85b2c9da9ea4b346d13e58ae8eada305dc6f561")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a3e8920712739903c1b67511a152f4a0e9ba6b2e")] [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 865d2b0..82d8daa 100644 --- a/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache +++ b/ui/obj/Debug/net8.0/ui.AssemblyInfoInputs.cache @@ -1 +1 @@ -93f4d6df5681dda0ea4e6f1072f8d2e77cc9c641d501c17bf3ef54452e626a27 +b3cf8d7a591560dc2b1dca311fb39d799392b4a9af4ce876829d7bb46232ecfb diff --git a/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache b/ui/obj/Debug/net8.0/ui.csproj.AssemblyReference.cache index ca7aaf4..b7a3df3 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 diff --git a/ui/obj/Debug/net8.0/ui.dll b/ui/obj/Debug/net8.0/ui.dll index 6ad03b0..0f10b2a 100644 Binary files a/ui/obj/Debug/net8.0/ui.dll and b/ui/obj/Debug/net8.0/ui.dll differ diff --git a/ui/obj/Debug/net8.0/ui.pdb b/ui/obj/Debug/net8.0/ui.pdb index ed9bee6..0c2038e 100644 Binary files a/ui/obj/Debug/net8.0/ui.pdb and b/ui/obj/Debug/net8.0/ui.pdb differ