From cdf8bb4b28f30143836c885eca554a49785ce9ba Mon Sep 17 00:00:00 2001 From: Artyom_Yashin Date: Wed, 1 May 2024 22:17:29 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D1=8B=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D1=8E=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bank/BankClientApp/BankClientApp.csproj | 30 ------------------- .../Controllers/HomeController.cs | 20 ++++++++++--- .../Views/Home/CardDelete.cshtml | 4 +-- .../Views/Home/CardUpdate.cshtml | 1 - .../BankClientApp/Views/Home/Operation.cshtml | 14 +++++---- .../Views/Home/OperationCreate.cshtml | 4 +++ .../Views/Home/OperationDelete.cshtml | 4 +-- .../Views/Home/OperationUpdate.cshtml | 27 +++++++++++++---- Bank/BankClientApp/Views/Home/Report.cshtml | 10 +++---- .../Home/{Requests.cshtml => Request.cshtml} | 6 ++-- .../Views/Home/RequestDelete.cshtml | 4 +-- .../Views/Home/RequestUpdate.cshtml | 8 ++--- .../Views/Home/TransferListReport.cshtml | 6 ++-- .../BankClientApp/Views/Shared/_Layout.cshtml | 18 +++++++++-- 14 files changed, 84 insertions(+), 72 deletions(-) rename Bank/BankClientApp/Views/Home/{Requests.cshtml => Request.cshtml} (86%) diff --git a/Bank/BankClientApp/BankClientApp.csproj b/Bank/BankClientApp/BankClientApp.csproj index 86e6b9a..091403d 100644 --- a/Bank/BankClientApp/BankClientApp.csproj +++ b/Bank/BankClientApp/BankClientApp.csproj @@ -6,12 +6,6 @@ enable - - - - - - @@ -22,28 +16,4 @@ - - - - - - <_ContentIncludedByDefault Remove="Views\Home\CardCreate.cshtml" /> - <_ContentIncludedByDefault Remove="Views\Home\Register.cshtml" /> - <_ContentIncludedByDefault Remove="Views\Home\Requests.cshtml" /> - - - - - - - - - - - - - - - - diff --git a/Bank/BankClientApp/Controllers/HomeController.cs b/Bank/BankClientApp/Controllers/HomeController.cs index f6ea58d..ac10f80 100644 --- a/Bank/BankClientApp/Controllers/HomeController.cs +++ b/Bank/BankClientApp/Controllers/HomeController.cs @@ -1,6 +1,7 @@ using BankClientApp.Models; using BankContracts.ViewModels; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore.Metadata.Internal; using System.Diagnostics; namespace BankClientApp.Controllers @@ -20,7 +21,7 @@ namespace BankClientApp.Controllers } public IActionResult Privacy() { - return View(); + return View(new ClientViewModel()); } [HttpGet] @@ -44,36 +45,42 @@ namespace BankClientApp.Controllers [HttpGet] public IActionResult CardUpdate() { + ViewBag.Cards = new List(); return View(); } [HttpGet] public IActionResult CardDelete() { + ViewBag.Cards = new List(); return View(); } [HttpGet] public IActionResult Operation() { - return View(); + return View(new List()); } [HttpGet] public IActionResult OperationCreate() { + ViewBag.Cards = new List(); return View(); } [HttpGet] public IActionResult OperationUpdate() { + ViewBag.Operations = new List(); + ViewBag.Cards = new List(); return View(); } [HttpGet] public IActionResult OperationDelete() { + ViewBag.Operations = new List(); return View(); } @@ -84,26 +91,30 @@ namespace BankClientApp.Controllers } [HttpGet] - public IActionResult Requests() + public IActionResult Request() { - return View(); + return View(new List()); } [HttpGet] public IActionResult RequestCreate() { + ViewBag.Cards = new List(); return View(); } [HttpGet] public IActionResult RequestUpdate() { + ViewBag.Requests = new List(); + ViewBag.Cards = new List(); return View(); } [HttpGet] public IActionResult RequestDelete() { + ViewBag.Requests = new List(); return View(); } @@ -116,6 +127,7 @@ namespace BankClientApp.Controllers [HttpGet] public IActionResult TransferListReport() { + ViewBag.Cards = new List(); return View(); } diff --git a/Bank/BankClientApp/Views/Home/CardDelete.cshtml b/Bank/BankClientApp/Views/Home/CardDelete.cshtml index 3078c96..ea492af 100644 --- a/Bank/BankClientApp/Views/Home/CardDelete.cshtml +++ b/Bank/BankClientApp/Views/Home/CardDelete.cshtml @@ -1,6 +1,4 @@ -//todo выводить список только для выбранного клиента - -@{ +@{ ViewData["Title"] = "CardDelete"; }
diff --git a/Bank/BankClientApp/Views/Home/CardUpdate.cshtml b/Bank/BankClientApp/Views/Home/CardUpdate.cshtml index 8cc0b52..f72416d 100644 --- a/Bank/BankClientApp/Views/Home/CardUpdate.cshtml +++ b/Bank/BankClientApp/Views/Home/CardUpdate.cshtml @@ -1,5 +1,4 @@ @using BankContracts.ViewModels; -//todo выводить список только для выбранного клиента @{ ViewData["Title"] = "CardUpdate"; } diff --git a/Bank/BankClientApp/Views/Home/Operation.cshtml b/Bank/BankClientApp/Views/Home/Operation.cshtml index cdc11ff..4191ff1 100644 --- a/Bank/BankClientApp/Views/Home/Operation.cshtml +++ b/Bank/BankClientApp/Views/Home/Operation.cshtml @@ -1,4 +1,4 @@ -@using BankContracts.ViewModels, +@using BankContracts.ViewModels @model List @{ ViewData["Title"] = "Operation"; @@ -8,13 +8,15 @@
@{ - if (Model == null) - { -

Авторизируйтесь

- return; - } + // if (Model == null) + // { + //

Авторизируйтесь

+ // return; + // }

Создать операцию + Обновить операцию + Удалить операцию

diff --git a/Bank/BankClientApp/Views/Home/OperationCreate.cshtml b/Bank/BankClientApp/Views/Home/OperationCreate.cshtml index 465cdbf..f76e07c 100644 --- a/Bank/BankClientApp/Views/Home/OperationCreate.cshtml +++ b/Bank/BankClientApp/Views/Home/OperationCreate.cshtml @@ -23,4 +23,8 @@ +
+
+
+
diff --git a/Bank/BankClientApp/Views/Home/OperationDelete.cshtml b/Bank/BankClientApp/Views/Home/OperationDelete.cshtml index 46e360e..c99197a 100644 --- a/Bank/BankClientApp/Views/Home/OperationDelete.cshtml +++ b/Bank/BankClientApp/Views/Home/OperationDelete.cshtml @@ -1,6 +1,4 @@ -//todo выводить список только для выбранного клиента - -@{ +@{ ViewData["Title"] = "OperationDelete"; }
diff --git a/Bank/BankClientApp/Views/Home/OperationUpdate.cshtml b/Bank/BankClientApp/Views/Home/OperationUpdate.cshtml index bdcd950..efdee9d 100644 --- a/Bank/BankClientApp/Views/Home/OperationUpdate.cshtml +++ b/Bank/BankClientApp/Views/Home/OperationUpdate.cshtml @@ -1,5 +1,4 @@ -//todo выводить список только для выбранного клиента - + @{ ViewData["Title"] = "OperationDelete"; } @@ -10,11 +9,29 @@
Карта:
- +
-
-
+
Сумма:
+
+ +
+
+
+
Отправитель:
+
+ +
+
+
+
Получатель:
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/Bank/BankClientApp/Views/Home/Report.cshtml b/Bank/BankClientApp/Views/Home/Report.cshtml index 8cc7a5e..5e82fe7 100644 --- a/Bank/BankClientApp/Views/Home/Report.cshtml +++ b/Bank/BankClientApp/Views/Home/Report.cshtml @@ -6,11 +6,11 @@
@{ - if (Model == null) - { -

Авторизуйтесь!

- return; - } + // if (Model == null) + // { + //

Авторизуйтесь!

+ // return; + // }
Начальная дата:
diff --git a/Bank/BankClientApp/Views/Home/Requests.cshtml b/Bank/BankClientApp/Views/Home/Request.cshtml similarity index 86% rename from Bank/BankClientApp/Views/Home/Requests.cshtml rename to Bank/BankClientApp/Views/Home/Request.cshtml index 6737a74..3911140 100644 --- a/Bank/BankClientApp/Views/Home/Requests.cshtml +++ b/Bank/BankClientApp/Views/Home/Request.cshtml @@ -1,7 +1,7 @@ @using BankContracts.ViewModels @model List @{ - ViewData["Title"] = "Requests"; + ViewData["Title"] = "Request"; }

Запросы

@@ -14,7 +14,9 @@ return; }

- Создать запрос + Создать запрос + Обновить запрос + Удалить запрос

diff --git a/Bank/BankClientApp/Views/Home/RequestDelete.cshtml b/Bank/BankClientApp/Views/Home/RequestDelete.cshtml index 3d913a2..611cb70 100644 --- a/Bank/BankClientApp/Views/Home/RequestDelete.cshtml +++ b/Bank/BankClientApp/Views/Home/RequestDelete.cshtml @@ -1,6 +1,4 @@ -//todo выводить список только для выбранного клиента - -@{ +@{ ViewData["Title"] = "RequestDelete"; }
diff --git a/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml b/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml index f9abe26..30c29bd 100644 --- a/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml +++ b/Bank/BankClientApp/Views/Home/RequestUpdate.cshtml @@ -1,14 +1,14 @@ @{ - ViewData["Title"] = "CardCreate"; + ViewData["Title"] = "RequestUpdate"; }
-

Создание карты

+

Обновление заявки

-
Услуга:
+
Заявка:
- +
diff --git a/Bank/BankClientApp/Views/Home/TransferListReport.cshtml b/Bank/BankClientApp/Views/Home/TransferListReport.cshtml index 76b797b..687ce38 100644 --- a/Bank/BankClientApp/Views/Home/TransferListReport.cshtml +++ b/Bank/BankClientApp/Views/Home/TransferListReport.cshtml @@ -20,8 +20,8 @@
-
-
-
+
+
+
\ No newline at end of file diff --git a/Bank/BankClientApp/Views/Shared/_Layout.cshtml b/Bank/BankClientApp/Views/Shared/_Layout.cshtml index 2350571..de279a6 100644 --- a/Bank/BankClientApp/Views/Shared/_Layout.cshtml +++ b/Bank/BankClientApp/Views/Shared/_Layout.cshtml @@ -21,16 +21,28 @@