ker73rus/PIbd-21_Pyatakov_KM_Markov_DP_University
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Danil Markov 2023-04-08 23:59:00 +04:00
parent 99b3c179e7
commit c56480c354
6 changed files with 111 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UniversityBusinessLogic/BusinessLogics/ReportProviderLogic.cs
View File

@ -45,16 +45,15 @@ namespace UniversityBusinessLogic.BusinessLogics
_saveToPdf = saveToPdf; _saveToPdf = saveToPdf;
} }
public List<ReportStudentsDisciplineViewModel> GetStudentsDiscipline(ReportBindingModel model) public List<ReportStudentsDisciplineViewModel> GetStudentsDiscipline(List<StudentViewModel> students)
{ {
var result = _studentStorage var result = students
.GetFilteredList(new StudentSearchModel { UserId = model.UserId })
.Select(student => new ReportStudentsDisciplineViewModel .Select(student => new ReportStudentsDisciplineViewModel
{ {
StudentFIO = $"{student.Name} {student.Surname}", StudentFIO = $"{student.Name} {student.Surname}",
Disciplines = _streamStorage.GetFilteredList(new StreamSearchModel { UserId = model.UserId }) Disciplines = _streamStorage.GetFullList()
.Where(stream => stream.StudentStream.ContainsKey(student.Id)) .Where(stream => stream.StudentStream.ContainsKey(student.Id))
.Join(_disciplineStorage.GetFilteredList(new DisciplineSearchModel { UserId = model.UserId }), .Join(_disciplineStorage.GetFullList(),
stream => stream.Id, stream => stream.Id,
discipline => discipline.StreamId, discipline => discipline.StreamId,
(stream, discipline) => discipline.Name) (stream, discipline) => discipline.Name)
@ -81,8 +80,7 @@ namespace UniversityBusinessLogic.BusinessLogics
.Any(document => document.StudentDocument.ContainsKey(student.Value.Id)))//Выбираем студентов, которые есть в приказах за выбранный промежуток времени .Any(document => document.StudentDocument.ContainsKey(student.Value.Id)))//Выбираем студентов, которые есть в приказах за выбранный промежуток времени
.Select(student => ( .Select(student => (
StudentFIO: $"{student.Value.Name} {student.Value.Surname}", StudentFIO: $"{student.Value.Name} {student.Value.Surname}",
EdStatus: _educationStatusStorage.GetFilteredList(new EducationStatusSearchModel { UserId = model.UserId }) EdStatus: _educationStatusStorage.GetElement(new EducationStatusSearchModel { Id = student.Value.EducationStatusId })?.Name ?? "не удалось получить"))
.First(x => x.Id == student.Value.EducationStatusId).Name))
.ToList() .ToList()
}) })
.ToList(); .ToList();

2
UniversityContracts/BusinessLogicContracts/IReportProviderLogic.cs
View File

@ -10,7 +10,7 @@ namespace UniversityContracts.BusinessLogicContracts
{ {
public interface IReportProviderLogic public interface IReportProviderLogic
{ {
List<ReportStudentsDisciplineViewModel> GetStudentsDiscipline(ReportBindingModel model); List<ReportStudentsDisciplineViewModel> GetStudentsDiscipline(List<StudentViewModel> students, ReportBindingModel model);
List<ReportStreamStudentEdStatPeriodViewModel> StreamStudentEdStatPeriod(ReportBindingModel model); List<ReportStreamStudentEdStatPeriodViewModel> StreamStudentEdStatPeriod(ReportBindingModel model);

3
UniversityDataBaseImplemet/Implements/DocumentStorage.cs
View File

@ -79,7 +79,8 @@ namespace UniversityDataBaseImplemet.Implements
using var context = new Database(); using var context = new Database();
return context.Documents return context.Documents
.Include(record => record.User) .Include(record => record.User)
.Include(record => record.Students)
.ThenInclude(record => record.Student)
.Select(record => record.GetViewModel) .Select(record => record.GetViewModel)
.ToList(); .ToList();
} }

24
UniversityProvider/Views/Home/Login.cshtml
View File

@ -1,5 +1,21 @@
@* @{
For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 ViewData["Title"] = "Login";
*@
@{
} }
<div class="text-center">
<h2 class="display-4">Вход в приложение</h2>
</div>
<form method="post">
<div class="row">
<div class="col-4">Логин:</div>
<div class="col-8"><input type="text" name="login" /></div>
</div>
<div class="row">
<div class="col-4">Пароль:</div>
<div class="col-8"><input type="password" name="password" /></div>
</div>
<div class="row">
<div class="col-8"></div>
<div class="col-4"><input type="submit" value="Войти" class="btn btn-primary" /></div>
</div>
</form>

24
UniversityProvider/Views/Home/Registration.cshtml
View File

@ -1,5 +1,21 @@
@* @{
For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 ViewData["Title"] = "Register";
*@
@{
} }
<div class="text-center">
<h2 class="display-4">Регистрация</h2>
</div>
<form method="post">
<div class="row">
<div class="col-4">Логин:</div>
<div class="col-8"><input type="text" name="login" /></div>
</div>
<div class="row">
<div class="col-4">Пароль:</div>
<div class="col-8"><input type="password" name="password" /></div>
</div>
<div class="row">
<div class="col-8"></div>
<div class="col-4"><input type="submit" value="Регистрация" class="btn btn-primary" /></div>
</div>
</form>

66
UniversityProvider/Views/Home/Students.cshtml
View File

@ -1,5 +1,65 @@
@* @using UniversityContracts.ViewModels
For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 @model List<StudentViewModel>
*@ @model List<EducationStatusViewModel>
@{ @{
ViewData["Title"] = "Студенты";
} }
<div class="text-center">
<h1 class="display-4">Студенты</h1>
</div>
<div class="text-center">
@{
if (Model == null)
{
<h3 class="display-4">Войдите в аккаунт</h3>
return;
}
<div>
<a class="btn btn-secondary" asp-action="Student">Добавить</a>
<a class="btn btn-secondary" asp-action="Student">Изменить</a>
<a class="btn btn-secondary" asp-action="Student">Удалить</a>
<a class="btn btn-secondary" asp-action="Student">Обновить</a>
</div>
<table class="table">
<thead>
<tr>
<th>
Имя Фамилия
</th>
<th>
Дата Рождения
</th>
<th>
Номер Студ.билета
</th>
<th>
Статус обучения
</th>
</tr>
</thead>
<tbody>
@foreach (var item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.Name + ' ' + item.Surname)
</td>
<td>
@Html.DisplayFor(modelItem => item.DateOfBirth)
</td>
<td>
@Html.DisplayFor(modelItem => item.StudentCard)
</td>
<td>
@Html.DisplayFor(modelItem => item.EducationStatusId)
</td>
</tr>
}
</tbody>
</table>
}
</div>