Добавлена страница для просмотра одной выплаты

This commit is contained in:
abazov73 2023-05-17 13:42:29 +04:00
parent 050a46e3d1
commit 90a9b1a438
4 changed files with 41 additions and 3 deletions

View File

@ -30,7 +30,7 @@ namespace BankDatabaseImplement.Implements
if (model.OperatorId.HasValue) if (model.OperatorId.HasValue)
{ {
using var context = new BankDatabase(); using var context = new BankDatabase();
return context.Payments.Include(x => x.Operator) return context.Payments.Include(x => x.Operator).Include(x => x.Deals).ThenInclude(x => x.Deal)
.Where(x => x.OperatorId == model.OperatorId) .Where(x => x.OperatorId == model.OperatorId)
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
@ -38,7 +38,7 @@ namespace BankDatabaseImplement.Implements
else else
{ {
using var context = new BankDatabase(); using var context = new BankDatabase();
return context.Payments.Include(x => x.Operator) return context.Payments.Include(x => x.Operator).Include(x => x.Deals).ThenInclude(x => x.Deal)
.Where(x => x.Id == model.Id) .Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
@ -52,7 +52,7 @@ namespace BankDatabaseImplement.Implements
return null; return null;
} }
using var context = new BankDatabase(); using var context = new BankDatabase();
return context.Payments.Include(x => x.Operator) return context.Payments.Include(x => x.Operator).Include(x => x.Deals).ThenInclude(x => x.Deal)
.FirstOrDefault(x => x.Id == model.Id) .FirstOrDefault(x => x.Id == model.Id)
?.GetViewModel; ?.GetViewModel;
} }

View File

@ -177,5 +177,10 @@ namespace OperatorApp.Controllers
_paymentLogic.Create(new PaymentBindingModel { OperatorId = APIClient.Operator.Id, DealPayments = DealPayments, }); _paymentLogic.Create(new PaymentBindingModel { OperatorId = APIClient.Operator.Id, DealPayments = DealPayments, });
Response.Redirect("Payments"); Response.Redirect("Payments");
} }
[HttpGet]
public IActionResult Payment(int id)
{
return View(_paymentLogic.ReadElement(new PaymentSearchModel { Id = id}));
}
} }
} }

View File

@ -0,0 +1,28 @@
@using BankContracts.ViewModels
@model PaymentViewModel
@{
ViewData["Title"] = "Payment";
}
<div class="text-center">
<h1>Выплата №@Model.Id</h1>
</div>
<div class="text-center">
@{
if (Model == null)
{
<h3 class="display-4">Авторизируйтесь</h3>
return;
}
}
<h3 class="display-4">От @Model.PaymentDate.Date</h3>
<h3 class="display-4">Оператор: @Model.OperatorName</h3>
<h3 class="display-4">Сделки:</h3>
@foreach (var deal in Model.DealPayments){
<h5 class="display-4"><b>Сделка №@deal.Value.Id</b>, от @deal.Value.DealDate, номер клиента: @deal.Value.ClientId</h5>
}
</div>

View File

@ -34,6 +34,8 @@
<th> <th>
Дата Дата
</th> </th>
<th>
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -49,6 +51,9 @@
<td> <td>
@Html.DisplayFor(modelItem => item.PaymentDate) @Html.DisplayFor(modelItem => item.PaymentDate)
</td> </td>
<td>
<a asp-action="Payment" asp-route-id="@item.Id">Посмотреть</a>
</td>
</tr> </tr>
} }
</tbody> </tbody>