From 502cd404edfd1bb68a6d01e402b50fd2f5da58e3 Mon Sep 17 00:00:00 2001
From: russell <anisin.ruslan@yandex.ru>
Date: Thu, 30 May 2024 02:33:02 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D1=81=D0=B8=D0=BB=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TravelAgencyBusinessLogic/BusinessLogics/UserLogic.cs       | 2 +-
 .../TravelAgencyWebApp/Views/Excursion/Excursions.cshtml        | 2 +-
 .../Views/ExcursionGroup/ExcursionGroups.cshtml                 | 2 +-
 TravelAgency/TravelAgencyWebApp/Views/Home/Diagrams.cshtml      | 2 +-
 TravelAgency/TravelAgencyWebApp/Views/Tour/Tours.cshtml         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TravelAgency/TravelAgencyBusinessLogic/BusinessLogics/UserLogic.cs b/TravelAgency/TravelAgencyBusinessLogic/BusinessLogics/UserLogic.cs
index 7f7cd0c..affaa37 100644
--- a/TravelAgency/TravelAgencyBusinessLogic/BusinessLogics/UserLogic.cs
+++ b/TravelAgency/TravelAgencyBusinessLogic/BusinessLogics/UserLogic.cs
@@ -106,7 +106,7 @@ namespace TravelAgencyBusinessLogic.BusinessLogics
             {
                 throw new ArgumentNullException("Нет номера телефона пользователя", nameof(model.PhoneNumber));
             }
-            if (string.IsNullOrEmpty(model.Password))
+            if (string.IsNullOrEmpty(model.Password) || model.Password.Length < 8 || model.Password.Length > 50)
             {
                 throw new ArgumentNullException("Нет пароля пользователя", nameof(model.Password));
             }
diff --git a/TravelAgency/TravelAgencyWebApp/Views/Excursion/Excursions.cshtml b/TravelAgency/TravelAgencyWebApp/Views/Excursion/Excursions.cshtml
index cf9d59b..4df1c02 100644
--- a/TravelAgency/TravelAgencyWebApp/Views/Excursion/Excursions.cshtml
+++ b/TravelAgency/TravelAgencyWebApp/Views/Excursion/Excursions.cshtml
@@ -67,7 +67,7 @@
 							<button type="button" class="btn btn-primary" onclick="location.href='@Url.Action("UpdateExcursion", "/Excursion", new { id = excursion.Id })'">Изменить</button>
 						</td>
 						<td>
-							<button type="button" class="btn btn-primary" onclick="$.post('@Url.Action("DeleteExcursion", "/Excursion", new { id = excursion.Id })', function () {window.location.reload();})">Удалить</button>
+							<button type="button" class="btn btn-danger" onclick="$.post('@Url.Action("DeleteExcursion", "/Excursion", new { id = excursion.Id })', function () {window.location.reload();})">Удалить</button>
 						</td>
 					</tr>
 				}
diff --git a/TravelAgency/TravelAgencyWebApp/Views/ExcursionGroup/ExcursionGroups.cshtml b/TravelAgency/TravelAgencyWebApp/Views/ExcursionGroup/ExcursionGroups.cshtml
index 18457cc..ab2fac5 100644
--- a/TravelAgency/TravelAgencyWebApp/Views/ExcursionGroup/ExcursionGroups.cshtml
+++ b/TravelAgency/TravelAgencyWebApp/Views/ExcursionGroup/ExcursionGroups.cshtml
@@ -61,7 +61,7 @@
 							<button type="button" class="btn btn-primary" onclick="location.href='@Url.Action("UpdateExcursionGroup", "/ExcursionGroup", new { id = excursionGroup.Id })'">Изменить</button>
 						</td>
 						<td>
-							<button type="button" class="btn btn-primary" onclick="$.post('@Url.Action("DeleteExcursionGroup", "/ExcursionGroup", new { id = excursionGroup.Id })', function () {window.location.reload();})">Удалить</button>
+							<button type="button" class="btn btn-danger" onclick="$.post('@Url.Action("DeleteExcursionGroup", "/ExcursionGroup", new { id = excursionGroup.Id })', function () {window.location.reload();})">Удалить</button>
 						</td>
 					</tr>
 				}
diff --git a/TravelAgency/TravelAgencyWebApp/Views/Home/Diagrams.cshtml b/TravelAgency/TravelAgencyWebApp/Views/Home/Diagrams.cshtml
index 73c40ff..699ea93 100644
--- a/TravelAgency/TravelAgencyWebApp/Views/Home/Diagrams.cshtml
+++ b/TravelAgency/TravelAgencyWebApp/Views/Home/Diagrams.cshtml
@@ -6,7 +6,7 @@
 
 <div class="text-center">
 	<h2 class="display-4">Диаграммы</h2>
-	<h2 class="display-5 text-start">Прибыль</h2>
+	<h2 class="display-5 text-start">Прибыль за текущий год</h2>
     <canvas id="revenueChart"></canvas>
 	<h2 class="display-5 text-start">Популярность туров</h2>
     <canvas id="popularityChart"></canvas>
diff --git a/TravelAgency/TravelAgencyWebApp/Views/Tour/Tours.cshtml b/TravelAgency/TravelAgencyWebApp/Views/Tour/Tours.cshtml
index 8c58975..da2c7d3 100644
--- a/TravelAgency/TravelAgencyWebApp/Views/Tour/Tours.cshtml
+++ b/TravelAgency/TravelAgencyWebApp/Views/Tour/Tours.cshtml
@@ -67,7 +67,7 @@
 								<button type="button" class="btn btn-primary" onclick="location.href='@Url.Action("UpdateTour", "/Tour", new { id = tour.Id })'">Изменить</button>
 							</td>
 							<td>
-								<button type="button" class="btn btn-primary" onclick="$.post('@Url.Action("DeleteTour", "/Tour", new { id = tour.Id })', function () {window.location.reload();})">
+								<button type="button" class="btn btn-danger" onclick="$.post('@Url.Action("DeleteTour", "/Tour", new { id = tour.Id })', function () {window.location.reload();})">
 									Удалить
 								</button>
 							</td>