init commit

This commit is contained in:
Class_Student 2024-12-19 11:06:01 +03:00
parent a3e8920712
commit 2f8555b2c8
106 changed files with 524 additions and 105 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
.vs/presence/v17/.suo Normal file

Binary file not shown.

View File

@ -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": ""
}
]
}
]
}
]
}

View File

@ -24,6 +24,7 @@
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets> <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Avalonia.ReactiveUI" Version="11.2.1" /> <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.1" />
<PackageReference Include="CsvHelper" Version="33.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
</ItemGroup> </ItemGroup>

View File

@ -11,8 +11,13 @@ using System.Reactive;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Windows.Input; using System.Windows.Input;
using Avalonia; using Avalonia;
using System.Formats.Asn1;
using System.IO;
using CsvHelper;
using CsvHelper.Configuration;
namespace Presence.Desktop.ViewModels namespace Presence.Desktop.ViewModels
{ {
public class GroupViewModel : ViewModelBase, IRoutableViewModel public class GroupViewModel : ViewModelBase, IRoutableViewModel
{ {
@ -151,27 +156,76 @@ namespace Presence.Desktop.ViewModels
private void AddStudent() private void AddStudent()
{ {
string csvFilePath = @"C:\Users\class_student\Documents\Group.csv"; // Укажите путь к CSV файлу
List<UserPresenter> students;
try
{
students = ReadStudentsFromCsv(csvFilePath);
}
catch (Exception ex)
{
Console.WriteLine($"Ошибка при чтении CSV: {ex.Message}");
return;
}
if (SelectedGroupItem == null) return; if (SelectedGroupItem == null) return;
foreach (var student in students)
{
_groupUseCase.AddStudentToGroup(SelectedGroupItem.Id, new User
{
FIO = student.Name
});
var newStudent = new UserPresenter var newStudent = new UserPresenter
{ {
Name = "Новый студент", Name = student.Name,
Guid = Guid.NewGuid(), Group = SelectedGroupItem // Устанавливаем ссылку на группу
Group = SelectedGroupItem
}; };
_groupUseCase.AddStudentToGroup(SelectedGroupItem.Id, new User
{
Guid = newStudent.Guid,
FIO = newStudent.Name
});
var updatedUsers = SelectedGroupItem.users?.ToList() ?? new List<UserPresenter>(); var updatedUsers = SelectedGroupItem.users?.ToList() ?? new List<UserPresenter>();
updatedUsers.Add(newStudent); updatedUsers.Add(newStudent);
SelectedGroupItem.users = updatedUsers; SelectedGroupItem.users = updatedUsers;
}
SetUsers(); SetUsers();
} }
private List<UserPresenter> ReadStudentsFromCsv(string filePath)
{
var students = new List<UserPresenter>();
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<StudentCsvModel>().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() public void OnDeleteUserClick()
{ {
if (SelectedUsers.Count == 0 || SelectedGroupItem?.users == null) if (SelectedUsers.Count == 0 || SelectedGroupItem?.users == null)

View File

@ -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;
}
}

View File

@ -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; }
}
}

View File

@ -7,22 +7,25 @@
x:Class="Presence.Desktop.Views.GroupView" x:Class="Presence.Desktop.Views.GroupView"
x:DataType="vm:GroupViewModel"> x:DataType="vm:GroupViewModel">
<DockPanel Background="#F0F2F5">
<DockPanel Background="#F9F9F9">
<!-- Верхняя панель с комбобоксами --> <!-- Верхняя панель с комбобоксами -->
<StackPanel DockPanel.Dock="Top" <Border DockPanel.Dock="Top"
HorizontalAlignment="Center" Background="#FFFFFF"
CornerRadius="10"
Padding="20"
Margin="20" Margin="20"
Spacing="15"> >
<StackPanel HorizontalAlignment="Center" Spacing="20">
<!-- Первый ComboBox для выбора группы --> <!-- Первый ComboBox для выбора группы -->
<ComboBox ItemsSource="{Binding Groups}" <ComboBox ItemsSource="{Binding Groups}"
SelectedValue="{Binding SelectedGroupItem}" SelectedValue="{Binding SelectedGroupItem}"
HorizontalAlignment="Center" Width="300"
Width="300"> Background="#F0F2F5"
CornerRadius="5"
FontSize="14">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding Name}" /> <TextBlock Text="{Binding Name}" FontSize="14" />
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
@ -30,48 +33,88 @@
<!-- Второй ComboBox для выбора способа сортировки --> <!-- Второй ComboBox для выбора способа сортировки -->
<ComboBox ItemsSource="{Binding SortOptions}" <ComboBox ItemsSource="{Binding SortOptions}"
SelectedItem="{Binding SelectedSortOption}" SelectedItem="{Binding SelectedSortOption}"
HorizontalAlignment="Center" Width="300"
Width="300"> Background="#F0F2F5"
CornerRadius="5"
FontSize="14">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<TextBlock Text="{Binding}" /> <TextBlock Text="{Binding}" FontSize="14" />
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</Border>
<!-- Нижняя панель с кнопками --> <!-- Нижняя панель с кнопками -->
<StackPanel DockPanel.Dock="Bottom" <Border DockPanel.Dock="Bottom"
HorizontalAlignment="Center" Background="#FFFFFF"
VerticalAlignment="Center" CornerRadius="10"
Padding="20"
Margin="20" Margin="20"
Spacing="15"> >
<StackPanel HorizontalAlignment="Center" Spacing="20">
<Button Content="Удалить всех студентов" <Button Content="Удалить всех студентов"
Command="{Binding RemoveAllStudentsCommand}" Command="{Binding RemoveAllStudentsCommand}"
HorizontalAlignment="Center" Width="250"
Width="250"/> Background="#FF4D4D"
Foreground="#FFFFFF"
CornerRadius="5"
FontSize="14">
<Button.Styles>
<Style Selector="Button:pointerover">
<Setter Property="Background" Value="#E53935"/>
</Style>
</Button.Styles>
</Button>
<Button Content="Добавить студента" <Button Content="Добавить студента"
Command="{Binding AddStudentCommand}" Command="{Binding AddStudentCommand}"
HorizontalAlignment="Center" Width="250"
Width="250"/> Background="#4CAF50"
<Button Content="Перейти на другую странцу" Foreground="#FFFFFF"
CornerRadius="5"
FontSize="14">
<Button.Styles>
<Style Selector="Button:pointerover">
<Setter Property="Background" Value="#43A047"/>
</Style>
</Button.Styles>
</Button>
<Button Content="Перейти на другую страницу"
Command="{Binding NextPageCommand}" Command="{Binding NextPageCommand}"
HorizontalAlignment="Center" Width="250"
Width="250"/> Background="#2196F3"
Foreground="#FFFFFF"
CornerRadius="5"
FontSize="14">
<Button.Styles>
<Style Selector="Button:pointerover">
<Setter Property="Background" Value="#1E88E5"/>
</Style>
</Button.Styles>
</Button>
</StackPanel> </StackPanel>
</Border>
<!-- Центральная панель для списка студентов --> <!-- Центральная панель для списка студентов -->
<ListBox ItemsSource="{Binding Users}" <Border Background="#FFFFFF"
HorizontalAlignment="Center" CornerRadius="10"
Width="400" Padding="20"
Margin="20" Margin="20"
>
<ListBox ItemsSource="{Binding Users}"
Width="500"
SelectionMode="Multiple" SelectionMode="Multiple"
SelectedItems="{Binding SelectedUsers}"> SelectedItems="{Binding SelectedUsers}"
Background="Transparent">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal" Margin="5"> <Border Background="#F0F2F5"
<TextBlock Text="{Binding Name}" VerticalAlignment="Center" /> CornerRadius="5"
</StackPanel> Padding="10"
Margin="5">
<TextBlock Text="{Binding Name}" FontSize="16" VerticalAlignment="Center" />
</Border>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
@ -82,5 +125,6 @@
</ContextMenu> </ContextMenu>
</ListBox.ContextMenu> </ListBox.ContextMenu>
</ListBox> </ListBox>
</Border>
</DockPanel> </DockPanel>
</UserControl> </UserControl>

Binary file not shown.

View File

@ -14,6 +14,7 @@
"Avalonia.Fonts.Inter": "11.2.1", "Avalonia.Fonts.Inter": "11.2.1",
"Avalonia.ReactiveUI": "11.2.1", "Avalonia.ReactiveUI": "11.2.1",
"Avalonia.Themes.Fluent": "11.2.1", "Avalonia.Themes.Fluent": "11.2.1",
"CsvHelper": "33.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
"data": "1.0.0", "data": "1.0.0",
"domain": "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": { "DocumentFormat.OpenXml/3.0.1": {
"dependencies": { "dependencies": {
"DocumentFormat.OpenXml.Framework": "3.0.1" "DocumentFormat.OpenXml.Framework": "3.0.1"
@ -875,6 +884,13 @@
"path": "closedxml.parser/1.2.0", "path": "closedxml.parser/1.2.0",
"hashPath": "closedxml.parser.1.2.0.nupkg.sha512" "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": { "DocumentFormat.OpenXml/3.0.1": {
"type": "package", "type": "package",
"serviceable": true, "serviceable": true,

View File

@ -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\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\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\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\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\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 C:\Users\class_student\.nuget\packages\documentformat.openxml.framework\3.0.1\lib\net8.0\DocumentFormat.OpenXml.Framework.dll

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Presence.Desktop")] [assembly: System.Reflection.AssemblyCompanyAttribute("Presence.Desktop")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("Presence.Desktop")]
[assembly: System.Reflection.AssemblyTitleAttribute("Presence.Desktop")] [assembly: System.Reflection.AssemblyTitleAttribute("Presence.Desktop")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
ca1b7e486f82334174e52b8caa2ad33557c6602a2571452f2e1f2d48678d23e0 445af2288a0f282aea641ef6a964c4c3461039de3f45a9d7cf9b4c334978653a

View File

@ -1 +1 @@
b8e457a113689dd6d1f34fdc4825583934edea336ebb5371c3f539b140208dad 330d2cc4bcbea1ec14461df3976d935a35010466ebe909fa497e9099a805ca37

View File

@ -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.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\Presence.Desktop.genruntimeconfig.cache
C:\Users\IVAN\Source\Repos\presence_new\Presence.Desktop\obj\Debug\net8.0\ref\Presence.Desktop.dll 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

View File

@ -234,6 +234,10 @@
"target": "Package", "target": "Package",
"version": "[11.2.1, )" "version": "[11.2.1, )"
}, },
"CsvHelper": {
"target": "Package",
"version": "[33.0.1, )"
},
"Microsoft.Extensions.DependencyInjection.Abstractions": { "Microsoft.Extensions.DependencyInjection.Abstractions": {
"target": "Package", "target": "Package",
"version": "[9.0.0, )" "version": "[9.0.0, )"

View File

@ -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": { "DocumentFormat.OpenXml/3.0.1": {
"type": "package", "type": "package",
"dependencies": { "dependencies": {
@ -1573,6 +1586,34 @@
"lib/netstandard2.1/ClosedXML.Parser.xml" "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": { "DocumentFormat.OpenXml/3.0.1": {
"sha512": "DCK1cwFUJ1FGGyYyo++HWl9H1RkqMWIu+FGOLRy6E4L4y0/HIhlJ7N/n1HKboFfOwKn1cMBRxt1RCuDbIEy5YQ==", "sha512": "DCK1cwFUJ1FGGyYyo++HWl9H1RkqMWIu+FGOLRy6E4L4y0/HIhlJ7N/n1HKboFfOwKn1cMBRxt1RCuDbIEy5YQ==",
"type": "package", "type": "package",
@ -2761,6 +2802,7 @@
"Avalonia.Fonts.Inter >= 11.2.1", "Avalonia.Fonts.Inter >= 11.2.1",
"Avalonia.ReactiveUI >= 11.2.1", "Avalonia.ReactiveUI >= 11.2.1",
"Avalonia.Themes.Fluent >= 11.2.1", "Avalonia.Themes.Fluent >= 11.2.1",
"CsvHelper >= 33.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions >= 9.0.0", "Microsoft.Extensions.DependencyInjection.Abstractions >= 9.0.0",
"data >= 1.0.0", "data >= 1.0.0",
"domain >= 1.0.0" "domain >= 1.0.0"
@ -2846,6 +2888,10 @@
"target": "Package", "target": "Package",
"version": "[11.2.1, )" "version": "[11.2.1, )"
}, },
"CsvHelper": {
"target": "Package",
"version": "[33.0.1, )"
},
"Microsoft.Extensions.DependencyInjection.Abstractions": { "Microsoft.Extensions.DependencyInjection.Abstractions": {
"target": "Package", "target": "Package",
"version": "[9.0.0, )" "version": "[9.0.0, )"

View File

@ -1,6 +1,6 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "AZCz7vOZdu5VQeeiEBBIP4P3zWTQI/Ro92mlIfiGUTmCIpyR2yf25RC4KjYnfsX0AxgMUYo5fXixUN0jbxFoKw==", "dgSpecHash": "S9m3q8B/DtB2gOSOHvNFQBsFeDxgKkGvx6DjgxvLG3zrKWOZd2ToZyA875yLI7RIavDPanPOf/MFiRMMmz9yGQ==",
"success": true, "success": true,
"projectFilePath": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Presence.Desktop.csproj", "projectFilePath": "C:\\Users\\class_student\\source\\repos\\presence\\Presence.Desktop\\Presence.Desktop.csproj",
"expectedPackageFiles": [ "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\\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\\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\\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\\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\\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", "C:\\Users\\class_student\\.nuget\\packages\\dynamicdata\\8.4.1\\dynamicdata.8.4.1.nupkg.sha512",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("console_ui")] [assembly: System.Reflection.AssemblyCompanyAttribute("console_ui")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("console_ui")]
[assembly: System.Reflection.AssemblyTitleAttribute("console_ui")] [assembly: System.Reflection.AssemblyTitleAttribute("console_ui")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
4ce6660b6a7021a0e28de37ccf4e56881e9c6d16aafc4b39886b2040c49ae905 4b8e74fc32091abc29c5af647acb5dee706c95435510ee47553b54c489eaadd1

Binary file not shown.

Binary file not shown.

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("data")] [assembly: System.Reflection.AssemblyCompanyAttribute("data")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("data")]
[assembly: System.Reflection.AssemblyTitleAttribute("data")] [assembly: System.Reflection.AssemblyTitleAttribute("data")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
adc11d429c3bef1c9b3af949aa504568583ebc1924b1ffaec95a95c7bd34e503 f23e71fea1d443c315d6f97457243328d8b36eecffab88e692255a6d746dfd08

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("domain")] [assembly: System.Reflection.AssemblyCompanyAttribute("domain")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("domain")]
[assembly: System.Reflection.AssemblyTitleAttribute("domain")] [assembly: System.Reflection.AssemblyTitleAttribute("domain")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
e2afd34a01255f96cbabfd4d69b4e764b119ba42cb5dd157aaa2f50827130423 17504c0919a17856cddae5775c6a234bc8ca3a3ce14a57edaa7ad3b51d74606d

Binary file not shown.

Binary file not shown.

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("presence_api")] [assembly: System.Reflection.AssemblyCompanyAttribute("presence_api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [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.AssemblyProductAttribute("presence_api")]
[assembly: System.Reflection.AssemblyTitleAttribute("presence_api")] [assembly: System.Reflection.AssemblyTitleAttribute("presence_api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1 +1 @@
77afe85cec6bc108d040d94456934b1a51ad19847430c31dd163733abb58c2e9 e35841825b72c81d4392703ae2e84f50e5ed5e6813f950a7abb8854895facae5

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More