diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs index 3897d7b..7106767 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs @@ -450,10 +450,11 @@ namespace BankYouBankruptCashierApp.Controllers CashierSurname = x.CashierSurname, Sum = x.Sum, AccountPayeeNumber = x.AccountPayeeNumber, - AccountSenderNumber = x.AccountSenderNumber, + AccountSenderNumber = x.AccountSenderNumber != null ? x.AccountSenderNumber : "---", DateOperation = x.DateOperation, typeOperation = x.AccountSenderId.HasValue ? TypeOperationEnum.Перевод : TypeOperationEnum.Пополнение }); + return View(cashWithdrawals.Concat(moneyTransfers).OrderBy(x => x.DateOperation).ToList()); } diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml index 5a521ba..d226875 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml @@ -3,7 +3,7 @@ @model List? @{ - ViewData["Title"] = "Отчет по аккаунтам"; + ViewData["Title"] = "Отчет по счетам"; }
@@ -37,10 +37,10 @@ Кассир - 1 Счет + Счет отправителя - 2 Счет + Счет получателя Сумма операции diff --git a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ReportCashierAccountsViewModel.cs b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ReportCashierAccountsViewModel.cs index f056d1b..1c9348d 100644 --- a/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ReportCashierAccountsViewModel.cs +++ b/BankYouBankrupt/BankYouBankruptContracts/ViewModels/ReportCashierAccountsViewModel.cs @@ -13,9 +13,9 @@ namespace BankYouBankruptContracts.ViewModels public int Sum { get; set; } - public string AccountSenderNumber { get; set; } = string.Empty; + public string AccountSenderNumber { get; set; } = "---"; - public string AccountPayeeNumber { get; set; } = string.Empty; + public string AccountPayeeNumber { get; set; } = "---"; public DateTime DateOperation { get; set; } = DateTime.Now;