From 35268379e41fac27649ece9ced7183521a73de75 Mon Sep 17 00:00:00 2001
From: ksenianeva <95441235+ksenianeva@users.noreply.github.com>
Date: Sat, 20 May 2023 12:08:10 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20=D0=BF=D0=BE=D0=BB=D1=8F.=20?=
 =?UTF-8?q?=D0=9A=D1=80=D0=B0=D1=81=D0=B8=D0=B2=D1=8B=D0=B5=20=D0=BA=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bank/BankOperatorApp/Controllers/HomeController.cs        | 8 +++++++-
 .../Views/Home/AddDealsToCreditProgram.cshtml             | 4 ++--
 .../BankOperatorApp/Views/Home/CreateCreditProgram.cshtml | 6 +++---
 Bank/BankOperatorApp/Views/Home/CreateCurrency.cshtml     | 2 +-
 .../Views/Home/CreateCurrencyPurchase.cshtml              | 4 ++--
 Bank/BankOperatorApp/Views/Home/CreditProgram.cshtml      | 2 +-
 Bank/BankOperatorApp/Views/Home/CreditPrograms.cshtml     | 4 ++--
 .../Views/Home/CurrencyPurchasePaymentsReport.cshtml      | 2 +-
 Bank/BankOperatorApp/Views/Home/CurrencyPurchases.cshtml  | 2 +-
 Bank/BankOperatorApp/Views/Home/CurrencyReport.cshtml     | 4 ++--
 Bank/BankOperatorApp/Views/Home/Index.cshtml              | 2 +-
 Bank/BankOperatorApp/Views/Shared/_Layout.cshtml          | 2 +-
 12 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Bank/BankOperatorApp/Controllers/HomeController.cs b/Bank/BankOperatorApp/Controllers/HomeController.cs
index 49ee135..2831b01 100644
--- a/Bank/BankOperatorApp/Controllers/HomeController.cs
+++ b/Bank/BankOperatorApp/Controllers/HomeController.cs
@@ -54,7 +54,9 @@ namespace BankOperatorApp.Controllers
         {
             if (HomeController.BankOperator == null)
             {
-                return Redirect("~/Home/Enter");
+                Response.WriteAsync($"<script language=\"javascript\">" +
+                   $"alert('You need to login!');window.location.replace('/Home/Enter');</script>");
+                return Redirect("/Home/Enter");
             }
             return View(HomeController.BankOperator);
         }
@@ -172,6 +174,8 @@ namespace BankOperatorApp.Controllers
         {
             if (HomeController.BankOperator == null)
             {
+                Response.WriteAsync($"<script language=\"javascript\">" +
+                   $"alert('You need to login!');window.location.replace('/Home/Enter');</script>");
                 return Redirect("~/Home/Enter");
             }
             return View(_creditProgramLogic.ReadList(new CreditProgramSearchModel 
@@ -255,6 +259,8 @@ namespace BankOperatorApp.Controllers
         {
             if (HomeController.BankOperator == null)
             {
+                Response.WriteAsync($"<script language=\"javascript\">" +
+                   $"alert('You need to login!');window.location.replace('/Home/Enter');</script>");
                 return Redirect("~/Home/Enter");
             }
             return View(_currencyPurchaseLogic.ReadList(new CurrencyPurchaseSearchModel
diff --git a/Bank/BankOperatorApp/Views/Home/AddDealsToCreditProgram.cshtml b/Bank/BankOperatorApp/Views/Home/AddDealsToCreditProgram.cshtml
index e2d6f8e..80d125c 100644
--- a/Bank/BankOperatorApp/Views/Home/AddDealsToCreditProgram.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/AddDealsToCreditProgram.cshtml
@@ -8,13 +8,13 @@
 	<div class="row">
 		<div class="col-4">Выплата:</div>
 		<div class="col-8">
-			<select id="creditProgram" name="creditProgram" class="form-control" required asp-items="@(new SelectList(@ViewBag.CreditPrograms,"Id", "Name"))"></select>
+			<select required id="creditProgram" name="creditProgram" class="form-control" required asp-items="@(new SelectList(@ViewBag.CreditPrograms,"Id", "Name"))"></select>
 		</div>
 	</div>
 	<div class="row">
 		<div class="col-4">Сделки:</div>
 		<div class="col-8">
-			<select id="deals" name="deals" class="form-control" required multiple asp-items="@(new SelectList(@ViewBag.Deals,"Id", "DealDate"))"></select>
+			<select required id="deals" name="deals" class="form-control" required multiple asp-items="@(new SelectList(@ViewBag.Deals,"Id", "DealDate"))"></select>
 		</div>
 	</div>
 	<div class="row">
diff --git a/Bank/BankOperatorApp/Views/Home/CreateCreditProgram.cshtml b/Bank/BankOperatorApp/Views/Home/CreateCreditProgram.cshtml
index 7b70c20..ff6f227 100644
--- a/Bank/BankOperatorApp/Views/Home/CreateCreditProgram.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/CreateCreditProgram.cshtml
@@ -7,16 +7,16 @@
 <form method="post">
 	<div class="row">
 		<div class="col-4">Название:</div>
-		<div class="col-8"><input type="text" name="name" id="name" /></div>
+		<div class="col-8"><input type="text" name="name" id="name" required/></div>
 	</div>
 	<div class="row">
 		<div class="col-4">Процент:</div>
-		<div class="col-8"><input type="text" name="percent" id="percent" /></div>
+		<div class="col-8"><input type="text" name="percent" id="percent" required/></div>
 	</div>
 	<div class="row">
 		<div class="col-4">Валюты:</div>
 		<div class="col-8">
-			<select id="currencies" name="currencies" class="form-control"
+			<select id="currencies" name="currencies" class="form-control" required
 			multiple asp-items="@(new SelectList(@ViewBag.Currencies,"Id", "Name"))"></select>
 		</div>
 	</div>
diff --git a/Bank/BankOperatorApp/Views/Home/CreateCurrency.cshtml b/Bank/BankOperatorApp/Views/Home/CreateCurrency.cshtml
index c6b38c3..de85008 100644
--- a/Bank/BankOperatorApp/Views/Home/CreateCurrency.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/CreateCurrency.cshtml
@@ -7,7 +7,7 @@
 <form method="post">
 	<div class="row">
 		<div class="col-4">Название:</div>
-		<div class="col-8"><input type="text" name="name" id="name" /></div>
+		<div class="col-8"><input type="text" name="name" id="name" required/></div>
 	</div>
 	<div class="row">
 		<div class="col-8"></div>
diff --git a/Bank/BankOperatorApp/Views/Home/CreateCurrencyPurchase.cshtml b/Bank/BankOperatorApp/Views/Home/CreateCurrencyPurchase.cshtml
index c0c31e5..f7e7d93 100644
--- a/Bank/BankOperatorApp/Views/Home/CreateCurrencyPurchase.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/CreateCurrencyPurchase.cshtml
@@ -8,13 +8,13 @@
 	<div class="row">
 		<div class="col-4">Валюты::</div>
 		<div class="col-8">
-			<select id="currencyId" name="currencyId" class="form-control" 
+			<select id="currencyId" name="currencyId" class="form-control" required
 			asp-items="@(new SelectList(@ViewBag.Currencies,"Id", "Name"))"></select>
 		</div>
 	</div>
 	<div class="row">
 		<div class="col-4">Сумма:</div>
-		<div class="col-8"><input type="text" name="amount" id="amount" /></div>
+		<div class="col-8"><input type="text" name="amount" id="amount" required/></div>
 	</div>
 	<div class="row">
 		<div class="col-8"></div>
diff --git a/Bank/BankOperatorApp/Views/Home/CreditProgram.cshtml b/Bank/BankOperatorApp/Views/Home/CreditProgram.cshtml
index c613177..2769926 100644
--- a/Bank/BankOperatorApp/Views/Home/CreditProgram.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/CreditProgram.cshtml
@@ -22,7 +22,7 @@
 
 	<h3 class="display-4">ФИО оператора: @Model.BankOperatorFIO</h3>
 	<h3 class="display-4">Название кредитной программы: @Model.Name</h3>
-	<h3 class="display-4">Процент кредитования: @Model.Percent</h3>
+	<h3 class="display-4" >Процент кредитования: @Model.Percent</h3>
 	<h3 class="display-4">Валюты:</h3>
 	@foreach (var currency in Model.CreditProgramCurrencies)
 	{
diff --git a/Bank/BankOperatorApp/Views/Home/CreditPrograms.cshtml b/Bank/BankOperatorApp/Views/Home/CreditPrograms.cshtml
index bc4dfa3..05c7e5e 100644
--- a/Bank/BankOperatorApp/Views/Home/CreditPrograms.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/CreditPrograms.cshtml
@@ -20,7 +20,7 @@
 		}
 
 					<p>
-						<a asp-action="CreateCreditProgram">Создать кредитную программу</a>
+								<a asp-action="CreateCreditProgram"><button class="btn btn-primary">Создать кредитную программу</button></a>
 					</p>
 					<table class="table">
 						<thead>
@@ -56,7 +56,7 @@
 							@Html.DisplayFor(modelItem => item.BankOperatorFIO)
 												</td>
 												<td>
-												<a asp-action="CreditProgram" asp-route-id="@item.Id">Подробнее</a>
+																<a asp-action="CreditProgram" asp-route-id="@item.Id"><button class="btn btn-primary">Подробнее</button></a>
 												</td>
 											</tr>
 				}
diff --git a/Bank/BankOperatorApp/Views/Home/CurrencyPurchasePaymentsReport.cshtml b/Bank/BankOperatorApp/Views/Home/CurrencyPurchasePaymentsReport.cshtml
index e48bbed..584e1a7 100644
--- a/Bank/BankOperatorApp/Views/Home/CurrencyPurchasePaymentsReport.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/CurrencyPurchasePaymentsReport.cshtml
@@ -35,7 +35,7 @@
 	</div>
 	<div class="row">
 		<div class="col-4">email:</div>
-		<div class="col-8"><input type="text" name="email" id="email" /></div>
+		<div class="col-8"><input type="email" name="email" id="email" /></div>
 	</div>
 	<div class="row">
 		<div class="col-4">Имя файла (необязательно):</div>
diff --git a/Bank/BankOperatorApp/Views/Home/CurrencyPurchases.cshtml b/Bank/BankOperatorApp/Views/Home/CurrencyPurchases.cshtml
index ddf22e5..74754c0 100644
--- a/Bank/BankOperatorApp/Views/Home/CurrencyPurchases.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/CurrencyPurchases.cshtml
@@ -19,7 +19,7 @@
 			return;
 		}
 					<p>
-						<a asp-action="CreateCurrencyPurchase"><button>Купить валюту</button></a>
+							<a asp-action="CreateCurrencyPurchase"><button class="btn btn-primary">Купить валюту</button></a>
 					</p>
 					<table class="table">
 						<thead>
diff --git a/Bank/BankOperatorApp/Views/Home/CurrencyReport.cshtml b/Bank/BankOperatorApp/Views/Home/CurrencyReport.cshtml
index 1afa1c5..e71a622 100644
--- a/Bank/BankOperatorApp/Views/Home/CurrencyReport.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/CurrencyReport.cshtml
@@ -2,13 +2,13 @@
 	ViewData["Title"] = "CurrencyReport";
 }
 <div class="text-center">
-	<h2 class="display-4">Создание валюты</h2>
+	<h2 class="display-4">Отчет по валюте</h2>
 </div>
 <form method="post">
 	<div class="row">
 		<div class="col-4">Валюты:</div>
 		<div class="col-8">
-			<select id="currencies" name="currencies" class="form-control" 
+			<select id="currencies" name="currencies" class="form-control" required
 			multiple asp-items="@(new SelectList(@ViewBag.Currencies,"Id", "Name"))"></select>
 		</div>
 	</div>
diff --git a/Bank/BankOperatorApp/Views/Home/Index.cshtml b/Bank/BankOperatorApp/Views/Home/Index.cshtml
index 77a4ac4..a2f828d 100644
--- a/Bank/BankOperatorApp/Views/Home/Index.cshtml
+++ b/Bank/BankOperatorApp/Views/Home/Index.cshtml
@@ -20,7 +20,7 @@
 		}
 
 			<p>
-					<a asp-action="CreateCurrency"><button>Создать валюту</button> </a>
+						<a asp-action="CreateCurrency"><button class="btn btn-primary">Создать валюту</button> </a>
 			</p>
 			<table class="table">
 				<thead>
diff --git a/Bank/BankOperatorApp/Views/Shared/_Layout.cshtml b/Bank/BankOperatorApp/Views/Shared/_Layout.cshtml
index 561b489..37946df 100644
--- a/Bank/BankOperatorApp/Views/Shared/_Layout.cshtml
+++ b/Bank/BankOperatorApp/Views/Shared/_Layout.cshtml
@@ -12,7 +12,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container-fluid">
-               <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Оператор</a>
+               <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Оператор банка</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>