Zagrebin/presence
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ASP.NET API #1

Open
Zagrebin wants to merge 7 commits from develop into main
pull from: develop
merge into: Zagrebin:main
Conversation 0 Commits 7 Files Changed 83 +358 -27
13 changed files with 358 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2b38373d9f - Show all commits

41
Presence.Desktop/Helpers/CsvHelper.cs Normal file
View File

@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using domain.Request;
using Presence.Desktop.Models;
namespace Presence.Desktop.Helpers
{
public static class CsvHelper
{
public static IEnumerable<AddStudentRequest> ReadCsvStudents(string path)
{
List<AddStudentRequest> students = new List<AddStudentRequest>();
var csvLines = File.ReadAllLines(path, Encoding.GetEncoding("utf-8"));
using (var reader = new StreamReader(path))
{
string line;
while ((line = reader.ReadLine()) != null)
{
var values = line.Split(';');
if (values.Length != 3)
continue;
students.Add(new AddStudentRequest
{
LastName = values[0],
FirstName = values[1],
Patronymic = values[2]
});
}
}
return students;
}
}
}

2
Presence.Desktop/Models/GroupPresenter.cs
View File

@ -10,6 +10,6 @@ namespace Presence.Desktop.Models
{
public int Id { get; set; }
public string Name { get; set; }
public IEnumerable<StudentPresenter>? students = null;
public List<StudentPresenter>? students = null;
}
}

4
Presence.Desktop/Presence.Desktop.csproj
View File

@ -10,10 +10,6 @@
<ItemGroup>
<AvaloniaResource Include="Assets\**" />
<AvaloniaXaml Remove="Новая папка\**" />
<Compile Remove="Новая папка\**" />
<EmbeddedResource Remove="Новая папка\**" />
<None Remove="Новая папка\**" />
</ItemGroup>
<ItemGroup>

6
Presence.Desktop/ViewModels/EditWindowViewModel.cs Normal file
View File

@ -0,0 +1,6 @@
namespace Presence.Desktop.ViewModels;
public class EditWindowViewModel : ViewModelBase
{
}

153
Presence.Desktop/ViewModels/MainWindowViewModel.cs
View File

@ -1,5 +1,6 @@
using domain.UseCase;
using Presence.Desktop.Models;
using Presence.Desktop.Helpers;
using System;
using System.Reactive.Linq;
using System.Reactive;
@ -7,8 +8,13 @@ using System.Linq;
using ReactiveUI;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using System.Windows.Input;
using System.Threading.Tasks;
using Avalonia.Controls.Selection;
using domain.Request;
using System.Text;
namespace Presence.Desktop.ViewModels
{
@ -45,8 +51,32 @@ namespace Presence.Desktop.ViewModels
set => this.RaiseAndSetIfChanged(ref _selectedFile, value);
}
private bool _MultipleSelected = false;
public bool MultipleSelected { get => _MultipleSelected; set => this.RaiseAndSetIfChanged(ref _MultipleSelected, value); }
public SelectionModel<StudentPresenter> Selection { get; }
private string _selectedSort = "Релевантность";
public string SelectedSort
{
get => _selectedSort;
set => this.RaiseAndSetIfChanged(ref _selectedSort, value);
}
public List<string> Sorting { get; set; } =
[
"Релевантность",
"А-Я",
"Я-А"
];
public ICommand OpenFileDialog { get; }
public ICommand EditCommand { get; }
public ICommand DeleteCommand { get; }
public ICommand DeleteSelectedCommand { get; }
public ICommand DeleteAllCommand { get; }
public MainWindowViewModel()
{
_groupService = null;
@ -63,12 +93,25 @@ namespace Presence.Desktop.ViewModels
_students = new();
this.WhenAnyValue(vm => vm.SelectedGroupItem)
this.WhenAnyValue(vm => vm.SelectedGroupItem,
x => x.SelectedSort)
.Subscribe(_ =>
{
RefreshGroups();
SetStudents();
SetStudents(SelectedSort);
});
Selection = new SelectionModel<StudentPresenter>();
Selection.SingleSelect = false;
Selection.SelectionChanged += (sender, args) =>
{
MultipleSelected = Selection.SelectedItems.Count > 1;
};
DeleteCommand = ReactiveCommand.Create(DeleteStudent);
DeleteSelectedCommand = ReactiveCommand.Create(DeleteStudent);
DeleteAllCommand = ReactiveCommand.Create(DeleteAllStudents);
}
private void RefreshGroups()
@ -91,7 +134,7 @@ namespace Presence.Desktop.ViewModels
Id = item.Id,
Name = item.Name
}
})
}).ToList()
};
groupPresenters.Add(groupPresenter);
}
@ -99,25 +142,117 @@ namespace Presence.Desktop.ViewModels
_groups = new(groupPresenters);
}
private void SetStudents()
private void SetStudents(string selectedSort)
{
if (SelectedGroupItem == null) return;
if (SelectedGroupItem.students == null) return;
Students.Clear();
foreach (var student in SelectedGroupItem.students)
List<StudentPresenter> students = new(_groupService.GetGroupsWithStudents()
.Single(g => g.Id == SelectedGroupItem.Id)
.Users
.Select(u => new StudentPresenter
{
Id = u.Id,
FirstName = u.FirstName,
LastName = u.LastName,
Patronymic = u.Patronymic,
Group = new GroupPresenter()
{
Id = SelectedGroupItem.Id,
Name = SelectedGroupItem.Name
}
})
);
students = selectedSort switch
{
"Релевантность" => students.OrderBy(s => s.Id).ToList(),
"А-Я" => students.OrderBy(s => s.LastName).ToList(),
"Я-А" => students.OrderByDescending(s => s.LastName).ToList(),
_ => students
};
foreach (var student in students)
Students.Add(student);
}
private async Task SelectFile()
{
SelectedFile = await ShowOpenFileDialog.Handle(Unit.Default);
if (SelectedFile is object)
try
{
SelectedFile = await ShowOpenFileDialog.Handle(Unit.Default);
}
catch (Exception)
{
return;
}
if (SelectedGroupItem == null) return;
try
{
var studentsToAdd = CsvHelper.ReadCsvStudents(SelectedFile);
if (studentsToAdd.Any())
{
_groupService.AddStudentsToGroup(SelectedGroupItem.Id, studentsToAdd);
foreach (var studentRequest in studentsToAdd)
{
var studentPresenter = new StudentPresenter
{
LastName = studentRequest.LastName,
FirstName = studentRequest.FirstName,
Patronymic = studentRequest.Patronymic,
Group = SelectedGroupItem
};
SelectedGroupItem.students.Add(studentPresenter);
Students.Add(studentPresenter);
}
RefreshGroups();
SetStudents(SelectedSort);
}
}
catch (Exception ex)
{
Debug.WriteLine(ex.Message);
}
}
private void DeleteStudent()
{
if (Selection.SelectedItems == null || Selection.SelectedItems.Count == 0) return;
var studentIds = Selection.SelectedItems.Select(s => s.Id).ToList();
_groupService.RemoveStudentsFromGroupByIds(SelectedGroupItem.Id, studentIds);
foreach (var student in Selection.SelectedItems.ToList())
{
SelectedGroupItem.students.Remove(student);
Students.Remove(student);
}
SetStudents(SelectedSort);
RefreshGroups();
}
private void DeleteAllStudents()
{
if (Students.Count == 0 && SelectedGroupItem == null) return;
_groupService.RemoveStudentsFromGroup(SelectedGroupItem.Id);
SelectedGroupItem.students.Clear();
Students.Clear();
RefreshGroups();
SetStudents(SelectedSort);
}
}

17
Presence.Desktop/Views/EditWindow.axaml Normal file
View File

@ -0,0 +1,17 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:Presence.Desktop.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="Presence.Desktop.EditWindow"
x:DataType="vm:EditWindowViewModel"
Title="Edit">
<Design.DataContext>
<vm:EditWindowViewModel/>
</Design.DataContext>
</Window>

13
Presence.Desktop/Views/EditWindow.axaml.cs Normal file
View File

@ -0,0 +1,13 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Presence.Desktop;
public partial class EditWindow : Window
{
public EditWindow()
{
InitializeComponent();
}
}

39
Presence.Desktop/Views/MainWindow.axaml
View File

@ -13,28 +13,44 @@
<vm:MainWindowViewModel/>
</Design.DataContext>
<DockPanel Background="Azure">
<DockPanel>
<StackPanel
Spacing="10"
HorizontalAlignment="Center"
DockPanel.Dock="Top"
Orientation="Horizontal">
<ComboBox ItemsSource="{Binding Groups}" SelectedValue="{Binding SelectedGroupItem}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Name}"/>
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
<ComboBox ItemsSource="{Binding Groups}"
SelectedValue="{Binding SelectedGroupItem}"
DisplayMemberBinding="{Binding Name}"
SelectedValueBinding="{Binding}"
/>
<Button Width="140" HorizontalContentAlignment="Center" Content="Внести студентов" Command="{Binding OpenFileDialog}"/>
<ComboBox/>
<ComboBox ItemsSource="{Binding Sorting}" SelectedItem="{Binding SelectedSort}"/>
<Button HorizontalAlignment="Right" Content="Удалить всех студентов" Command="{Binding DeleteAllCommand}"/>
</StackPanel>
<Border>
<ListBox ItemsSource="{Binding Students}">
<ListBox Name="StudentListBox" SelectionMode="Multiple" Selection="{Binding Selection}" ItemsSource="{Binding Students}">
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock>
<StackPanel.ContextMenu>
<ContextMenu>
<MenuItem IsVisible="{Binding !#StudentListBox.((vm:MainWindowViewModel)DataContext).MultipleSelected}"
Command="{Binding #StudentListBox.((vm:MainWindowViewModel)DataContext).EditCommand}"
Header="Изменить"/>
<MenuItem IsVisible="{Binding !#StudentListBox.((vm:MainWindowViewModel)DataContext).MultipleSelected}"
Command="{Binding #StudentListBox.((vm:MainWindowViewModel)DataContext).DeleteCommand}"
Header="Удалить"/>
<MenuItem IsVisible="{Binding #StudentListBox.((vm:MainWindowViewModel)DataContext).MultipleSelected}"
Command="{Binding #StudentListBox.((vm:MainWindowViewModel)DataContext).DeleteSelectedCommand}"
Header="Удалить выделенные"/>
</ContextMenu>
</StackPanel.ContextMenu>
<TextBlock>
<TextBlock.Text>
<MultiBinding StringFormat="{}{0} {1} {2}">
<Binding Path="LastName"/>
@ -48,6 +64,7 @@
</ListBox.ItemTemplate>
</ListBox>
</Border>
</DockPanel>
</Window>

5
Presence.Desktop/Views/MainWindow.axaml.cs
View File

@ -15,6 +15,9 @@ namespace Presence.Desktop.Views
{
public MainWindow()
{
if (Design.IsDesignMode)
ViewModel = new MainWindowViewModel();
InitializeComponent();
this.WhenActivated(action =>
@ -41,7 +44,7 @@ namespace Presence.Desktop.Views
};
var storageFile = await topLevel.StorageProvider.OpenFilePickerAsync(fpOptions);
interaction.SetOutput(storageFile.First().Path.ToString());
interaction.SetOutput(storageFile.First().Path.LocalPath);
}
}

24
data/Repository/IGroupRepository.cs
View File

@ -27,6 +27,14 @@ namespace data.Repository
/// <param name="students">список студентов</param>
public bool AddGroupWithStudents(Group group, IEnumerable<Student> students);
/// <summary>
/// TODO
/// </summary>
/// <param name="id"></param>
/// <param name="students"></param>
/// <returns></returns>
public bool AddStudentsToGroup(int id, IEnumerable<Student> students);
/// <summary>
/// Удаление группы по индетефикатору
/// </summary>
@ -39,5 +47,21 @@ namespace data.Repository
/// <param name="id">индетефикатор</param>
/// <param name="name">наименованвие</param>
public bool UpdateGroup(int id, string name);
/// <summary>
/// Удаление всех студентов из группы
/// </summary>
/// <param name="id">индетефикатор</param>
/// <returns></returns>
public bool RemoveStudentsFromGroup(int id);
/// <summary>
/// Удаление студентов из группы по их индетефикатору
/// </summary>
/// <param name="id">индетефикатор группы</param>
/// <param name="studentIds">список индетефикаторов студентов</param>
/// <returns></returns>
public bool RemoveStudentsFromGroupByIds(int id, IEnumerable<int> studentIds);
}
}

50
data/Repository/SQLGroupRepository.cs
View File

@ -38,7 +38,33 @@ namespace data.Repository
Debug.WriteLine("Во время добавления группы со студентами произошла ошибка: ", ex.Message);
transaction.Rollback();
}
return false;
return false;
}
public bool AddStudentsToGroup(int id, IEnumerable<Student> students)
{
using var transaction = _dbContext.Database.BeginTransaction();
try
{
Group group = _dbContext.Groups.Find(id);
foreach (var student in students)
{
student.Group = group;
student.GroupId = id;
_dbContext.Students.Add(student);
}
_dbContext.SaveChanges();
transaction.Commit();
return true;
}
catch (Exception ex)
{
Console.WriteLine("Во время добавления студентов в группу произошла ошибка: ", ex.Message);
transaction.Rollback();
}
return false;
}
public bool CreateGroup(Group group)
@ -67,5 +93,27 @@ namespace data.Repository
group.Name = name;
return _dbContext.SaveChanges() > 0;
}
public bool RemoveStudentsFromGroup(int id)
{
var students = _dbContext.Students.Where(s => s.GroupId == id).ToList();
_dbContext.Students.RemoveRange(students);
return _dbContext.SaveChanges() > 0;
}
public bool RemoveStudentsFromGroupByIds(int id, IEnumerable<int> studentIds)
{
var studentsToRemove = _dbContext.Students
.Where(s => s.GroupId == id && studentIds.Contains(s.Id))
.ToList();
if (studentsToRemove.Any())
{
_dbContext.Students.RemoveRange(studentsToRemove);
return _dbContext.SaveChanges() > 0;
}
return false;
}
}
}

25
domain/Service/GroupService.cs
View File

@ -34,6 +34,15 @@ namespace domain.Service
_groupRepository.AddGroupWithStudents(group, students);
}
public void AddStudentsToGroup(int id, IEnumerable<AddStudentRequest> students)
{
List<Student> studentList = students
.Select(it => new Student { FirstName = it.FirstName, LastName = it.LastName, Patronymic = it.Patronymic })
.ToList();
_groupRepository.AddStudentsToGroup(id, studentList);
}
public void EditGroup(EditGroupRequest editGroupRequest)
=> _groupRepository.UpdateGroup(editGroupRequest.GroupId, editGroupRequest.GroupName);
@ -78,5 +87,21 @@ namespace domain.Service
})
}).Single(g => g.Id == id);
}
public void RemoveStudentsFromGroup(int groupId)
{
_groupRepository.RemoveStudentsFromGroup(groupId);
}
public void RemoveStudentsFromGroupByIds(int groupId, IEnumerable<int> studentIds)
{
var group = _groupRepository.GetAllGroups().FirstOrDefault(g => g.Id == groupId);
if (group == null)
{
throw new KeyNotFoundException($"Группа с ID {groupId} не найдена.");
}
_groupRepository.RemoveStudentsFromGroupByIds(groupId, studentIds);
}
}
}

6
domain/UseCase/IGroupUseCase.cs
View File

@ -14,6 +14,8 @@ namespace domain.UseCase
public void AddGroupWithStudents(AddGroupWithStudentRequest addGroupWithStudentRequest);
public void AddStudentsToGroup(int id, IEnumerable<AddStudentRequest> students);
public bool RemoveGroup(RemoveGroupRequest removeGroupRequest);
public void EditGroup(EditGroupRequest editGroupRequest);
@ -21,5 +23,9 @@ namespace domain.UseCase
public IEnumerable<GroupEntity> GetGroupsWithStudents();
public GroupSubjectEntity GetGroupSubject(int id);
public void RemoveStudentsFromGroup(int groupId);
public void RemoveStudentsFromGroupByIds(int groupId, IEnumerable<int> studentIds);
}
}