diff --git a/EventVisitor/EventVisitorClientApp/Controllers/HomeController.cs b/EventVisitor/EventVisitorClientApp/Controllers/HomeController.cs index 6d42f34..6ecae94 100644 --- a/EventVisitor/EventVisitorClientApp/Controllers/HomeController.cs +++ b/EventVisitor/EventVisitorClientApp/Controllers/HomeController.cs @@ -219,6 +219,10 @@ namespace EventVisitorClientApp.Controllers [HttpPost] public IActionResult CreateEvent(string name, string description, string type, string phone, string email, string address, string city, string status, int count, DateTime timestart, DateTime timeend) { + if (APIClient.Client == null) + { + return Redirect("~Home/Enter"); + } string returnUrl = HttpContext.Request.Headers["Referer"].ToString(); if (timestart < DateTime.UtcNow) @@ -259,11 +263,20 @@ namespace EventVisitorClientApp.Controllers public IActionResult DeleteEvent(int id) { + string returnUrl = HttpContext.Request.Headers["Referer"].ToString(); if (APIClient.Client == null) { return Redirect("~/Home/Enter"); } - APIClient.PostRequest($"api/main/DeleteEvent", new EventBindingModel { Id = id }); + var visitorList = APIClient.GetRequest>($"api/main/GetVisitorList?EventId={id}"); + if (visitorList.Count == 0) + { + APIClient.PostRequest($"api/main/DeleteEvent", new EventBindingModel { Id = id }); + } + else + { + return RedirectToAction("Error", new { errorMessage = " , ", returnUrl }); + } return RedirectToAction("MyEvents"); } @@ -283,7 +296,7 @@ namespace EventVisitorClientApp.Controllers { if (APIClient.Client == null) { - throw new Exception(" "); + return Redirect("~Home/Enter"); } var existingEvent = APIClient.GetRequest($"api/main/GetEvent?EventId={id}"); DateTime start = (timestart.HasValue) ? DateTime.SpecifyKind(timestart.Value, DateTimeKind.Utc) : existingEvent.TimeStart.ToUniversalTime(); @@ -372,6 +385,10 @@ namespace EventVisitorClientApp.Controllers [HttpPost] public IActionResult Visitors(int id, string action, string searchTerm, [FromForm] List presentIds) { + if (APIClient.Client == null) + { + return Redirect("~Home/Enter"); + } // var visitors = APIClient.GetRequest>($"api/main/GetVisitorList?EventId={id}"); var visitorsFiltered = new List(); @@ -458,15 +475,9 @@ namespace EventVisitorClientApp.Controllers } [HttpPost] - public async Task RegistrationOnEventAsync(int id, string name, string phone, string email, DateTime dayBirth) + public async Task RegistrationOnEventAsync(int id, string name, string phone, string email) { var eventDetails = APIClient.GetRequest($"api/main/GetEvent?EventId={id}"); - string returnUrl = HttpContext.Request.Headers["Referer"].ToString(); - - if (dayBirth >= DateTime.Now) - { - return RedirectToAction("Error", new { errorMessage = " .", returnUrl }); - } if (eventDetails != null && eventDetails.FreePlaces > 0) { int updatedFreePlaces = eventDetails.FreePlaces - 1; @@ -475,7 +486,7 @@ namespace EventVisitorClientApp.Controllers Name = name, Phone = phone, Email = email, - DayBirth = dayBirth.ToUniversalTime(), + DayBirth = DateTime.UtcNow, EventId = id, Status = "" }); @@ -563,7 +574,6 @@ namespace EventVisitorClientApp.Controllers }); return RedirectToAction("CancellationSuccess"); // } - return NotFound(); } @@ -577,7 +587,7 @@ namespace EventVisitorClientApp.Controllers { if (APIClient.Client == null) { - throw new Exception(" "); + return Redirect("~Home/Enter"); } var visitorList = APIClient.GetRequest>($"api/main/GetVisitorList?EventId={id}"); string returnUrl = HttpContext.Request.Headers["Referer"].ToString(); @@ -629,7 +639,7 @@ namespace EventVisitorClientApp.Controllers { if (APIClient.Client == null) { - throw new Exception(" ? "); + return Redirect("~Home/Enter"); } var reportFilePath = $"F:\\EventVisitor\\Report_{id}_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.xlsx"; APIClient.PostRequest("api/main/createreporttoexcelfile", new ReportVisitorsBindingModel @@ -647,9 +657,8 @@ namespace EventVisitorClientApp.Controllers { if (APIClient.Client == null) { - throw new Exception(" ? "); + return Redirect("~Home/Enter"); } - // var reportFilePath = $"F:\\EventVisitor\\Report_{id}_{DateTime.Now.ToString("yyyyMMdd_HHmmss")}.docx"; APIClient.PostRequest("api/main/createreporttowordfile", new ReportVisitorsBindingModel diff --git a/EventVisitor/EventVisitorClientApp/Views/Home/CreateEvent.cshtml b/EventVisitor/EventVisitorClientApp/Views/Home/CreateEvent.cshtml index 2c6cf27..7c8cb27 100644 --- a/EventVisitor/EventVisitorClientApp/Views/Home/CreateEvent.cshtml +++ b/EventVisitor/EventVisitorClientApp/Views/Home/CreateEvent.cshtml @@ -47,14 +47,14 @@
- +
Пожалуйста, введите контактный телефон.
- +
Пожалуйста, введите корректный email.
diff --git a/EventVisitor/EventVisitorClientApp/Views/Home/MyEvents.cshtml b/EventVisitor/EventVisitorClientApp/Views/Home/MyEvents.cshtml index 694ddcd..ba4a2f2 100644 --- a/EventVisitor/EventVisitorClientApp/Views/Home/MyEvents.cshtml +++ b/EventVisitor/EventVisitorClientApp/Views/Home/MyEvents.cshtml @@ -68,7 +68,7 @@ { Редактировать } - Удалить + Удалить Посмотреть diff --git a/EventVisitor/EventVisitorClientApp/Views/Home/RegistrationOnEvent.cshtml b/EventVisitor/EventVisitorClientApp/Views/Home/RegistrationOnEvent.cshtml index 16c6be9..502ef1e 100644 --- a/EventVisitor/EventVisitorClientApp/Views/Home/RegistrationOnEvent.cshtml +++ b/EventVisitor/EventVisitorClientApp/Views/Home/RegistrationOnEvent.cshtml @@ -16,78 +16,82 @@ -
-
-
-
-
-

@Html.DisplayFor(model => model.Name)

+ +
+
+
+
+
+

@Html.DisplayFor(model => model.Name)

+
+
+

Описание:

+

@Html.DisplayFor(model => model.Description)

+

Дата начала:

+

@Html.DisplayFor(model => model.TimeStart)

+

Дата окончания:

+

@Html.DisplayFor(model => model.TimeEnd)

+

Статус:

+

@Html.DisplayFor(model => model.Status)

+

Город:

+

@Html.DisplayFor(model => model.City)

+

Адрес:

+

@Html.DisplayFor(model => model.Address)

+

Всего мест:

+

@Html.DisplayFor(model => model.CountVisitors)

+

Свободных мест:

+

@Html.DisplayFor(model => model.FreePlaces)

+
-
-

Описание:

-

@Html.DisplayFor(model => model.Description)

-

Дата начала:

-

@Html.DisplayFor(model => model.TimeStart)

-

Дата окончания:

-

@Html.DisplayFor(model => model.TimeEnd)

-

Статус:

-

@Html.DisplayFor(model => model.Status)

-

Город:

-

@Html.DisplayFor(model => model.City)

-

Адрес:

-

@Html.DisplayFor(model => model.Address)

-

Всего мест:

-

@Html.DisplayFor(model => model.CountVisitors)

-

Свободных мест:

-

@Html.DisplayFor(model => model.FreePlaces)

+
+
+
+
+

Регистрация на мероприятие

+
+
+
+
+ + +
Пожалуйста, введите имя.
+
+ +
+ + +
Пожалуйста, введите номер телефона.
+
+ +
+ + +
Пожалуйста, введите e-mail.
+
+
+ +
+
+
-
-
-

Регистрация на мероприятие

+
-
-
- - -
Пожалуйста, введите имя.
-
- -
- - -
Пожалуйста, введите номер телефона.
-
- -
- - -
Пожалуйста, введите e-mail.
-
- -
- - -
- -
- -
-
-
-
- - - - + + + diff --git a/EventVisitor/EventVisitorClientApp/Views/Home/Visitors.cshtml b/EventVisitor/EventVisitorClientApp/Views/Home/Visitors.cshtml index 817691b..7749ecb 100644 --- a/EventVisitor/EventVisitorClientApp/Views/Home/Visitors.cshtml +++ b/EventVisitor/EventVisitorClientApp/Views/Home/Visitors.cshtml @@ -9,9 +9,6 @@

Зарегистрированные пользователи

-
- -
@@ -31,7 +28,6 @@ Имя Почта Телефон - Дата рождения @@ -43,7 +39,6 @@ @Html.DisplayFor(modelItem => item.Name) @Html.DisplayFor(modelItem => item.Email) @Html.DisplayFor(modelItem => item.Phone) - @Html.DisplayFor(modelItem => item.DayBirth)
@@ -13,9 +16,6 @@
Ошибка
-

@ViewBag.ErrorMessage

diff --git a/EventVisitor/EventVisitorClientApp/Views/Shared/_Layout.cshtml b/EventVisitor/EventVisitorClientApp/Views/Shared/_Layout.cshtml index 2d6c20f..b33dc53 100644 --- a/EventVisitor/EventVisitorClientApp/Views/Shared/_Layout.cshtml +++ b/EventVisitor/EventVisitorClientApp/Views/Shared/_Layout.cshtml @@ -27,10 +27,13 @@
  • Мои мероприятия
    • -
      +
      • + Организатор: @APIClient.Client.Surname @APIClient.Client.Name @APIClient.Client.LastName +
        • +
      • - +