Merge branch 'main' of http://student.git.athene.tech/shadowik/CourseWork_BankYouBankrupt

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());
         }
 

BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml

@@ -3,7 +3,7 @@
 @model List<ReportCashierAccountsViewModel>?
 
 @{
-	ViewData["Title"] = "Отчет по аккаунтам";
+	ViewData["Title"] = "Отчет по счетам";
 }
 
 <div class="text-center">
@@ -37,10 +37,10 @@
 								Кассир
 							</th>
 							<th>
-								1 Счет
+								Счет отправителя
 							</th>
 							<th>
-								2 Счет
+								Счет получателя
 							</th>
 							<th>
 								Сумма операции

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;