diff --git a/Bank/BankManagersClientApp/Controllers/HomeController.cs b/Bank/BankManagersClientApp/Controllers/HomeController.cs index 46a5af9..d02bd69 100644 --- a/Bank/BankManagersClientApp/Controllers/HomeController.cs +++ b/Bank/BankManagersClientApp/Controllers/HomeController.cs @@ -226,8 +226,9 @@ namespace BankManagersClientApp.Controllers { return Redirect("~/Home/Enter"); } - ViewBag.Accounts = APIClient.GetRequest>($"api/account/getaccountlist?managerid={APIClient.Client.Id}"); - return View(); + ViewBag.SenderAccounts = APIClient.GetRequest>($"api/account/getaccountlist?managerid={APIClient.Client.Id}"); + ViewBag.RecipientAccounts = APIClient.GetRequest>("api/account/getaccountlist"); + return View(); } [HttpPost] @@ -256,8 +257,9 @@ namespace BankManagersClientApp.Controllers return Redirect("~/Home/Enter"); } ViewBag.Transfers = APIClient.GetRequest>($"api/transfer/gettransferlist?managerid={APIClient.Client.Id}"); - ViewBag.Accounts = APIClient.GetRequest>($"api/account/getaccountlist?managerid={APIClient.Client.Id}"); - return View(); + ViewBag.SenderAccounts = APIClient.GetRequest>($"api/account/getaccountlist?managerid={APIClient.Client.Id}"); + ViewBag.RecipientAccounts = APIClient.GetRequest>("api/account/getaccountlist"); + return View(); } [HttpPost] diff --git a/Bank/BankManagersClientApp/Views/Home/TransferCreate.cshtml b/Bank/BankManagersClientApp/Views/Home/TransferCreate.cshtml index 9ccb9b2..78ea932 100644 --- a/Bank/BankManagersClientApp/Views/Home/TransferCreate.cshtml +++ b/Bank/BankManagersClientApp/Views/Home/TransferCreate.cshtml @@ -15,14 +15,14 @@
Номер счета отправителя:
+ asp-items="@(new SelectList(@ViewBag.SenderAccounts, "Id", "Number"))">
Номер счета получателя:
+ asp-items="@(new SelectList(@ViewBag.RecipientAccounts, "Id", "Number"))">
diff --git a/Bank/BankManagersClientApp/Views/Home/TransferUpdate.cshtml b/Bank/BankManagersClientApp/Views/Home/TransferUpdate.cshtml index da60061..d821e64 100644 --- a/Bank/BankManagersClientApp/Views/Home/TransferUpdate.cshtml +++ b/Bank/BankManagersClientApp/Views/Home/TransferUpdate.cshtml @@ -25,13 +25,13 @@
Отправитель:
- +
Получатель:
- +
diff --git a/Bank/BankRestApi/Controllers/AccountController.cs b/Bank/BankRestApi/Controllers/AccountController.cs index a5f8afc..f31362f 100644 --- a/Bank/BankRestApi/Controllers/AccountController.cs +++ b/Bank/BankRestApi/Controllers/AccountController.cs @@ -21,7 +21,7 @@ namespace BankRestApi.Controllers } [HttpGet] - public List? GetAccountList(int managerId) + public List? GetAccountList(int? managerId) { try {