From 609f98994552aef808f896ab57f17fd8c09b0514 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Tue, 14 Jun 2022 16:07:45 +0300 Subject: [PATCH] feat: add admin pannel (CRUD for routes) & ticket pdf download --- Readme.md | 28 +- ...20220609073909_Initial_Create.Designer.cs} | 5 +- ...te.cs => 20220609073909_Initial_Create.cs} | 3 +- .../TicketOfficeContextModelSnapshot.cs | 3 + TicketOffice/Models/DateString.cs | 7 + TicketOffice/Models/Route.cs | 8 +- TicketOffice/Models/SeedData.cs | 11 +- TicketOffice/Models/User.cs | 4 + TicketOffice/Pages/Auth/Account.cshtml | 3 +- TicketOffice/Pages/Auth/Account.cshtml.cs | 35 +- TicketOffice/Pages/Auth/Index.cshtml.cs | 10 +- TicketOffice/Pages/Auth/Login.cshtml.cs | 14 +- .../Pages/Auth/Registration.cshtml.cs | 13 +- TicketOffice/Pages/Management/Index.cshtml | 19 + TicketOffice/Pages/Management/Index.cshtml.cs | 27 ++ .../Pages/Management/Routes/Create.cshtml | 116 ++++++ .../Pages/Management/Routes/Create.cshtml.cs | 294 ++++++++++++++ .../Pages/Management/Routes/Edit.cshtml | 60 +++ .../Pages/Management/Routes/Edit.cshtml.cs | 360 ++++++++++++++++++ .../Pages/Management/Routes/Index.cshtml | 208 ++++++++++ .../Pages/Management/Routes/Index.cshtml.cs | 131 +++++++ TicketOffice/Pages/Routes/Index.cshtml | 2 +- TicketOffice/Pages/Routes/Index.cshtml.cs | 2 +- TicketOffice/Pages/Shared/_Layout.cshtml | 5 + TicketOffice/Program.cs | 4 + TicketOffice/Services/PdfService.cs | 114 ++++++ .../Services/UserValidationService.cs | 18 + TicketOffice/TicketOffice.csproj | 3 + TicketOffice/wwwroot/css/CityListPopup.css | 1 + .../wwwroot/css/Management/Create.css | 132 +++++++ .../wwwroot/css/Management/Delete.css | 0 TicketOffice/wwwroot/css/Management/Edit.css | 0 TicketOffice/wwwroot/css/Management/Index.css | 188 +++++++++ .../wwwroot/db/TicketOffice-SQLite.db | Bin 53248 -> 53248 bytes TicketOffice/wwwroot/fonts/Roboto-Regular.ttf | Bin 0 -> 168260 bytes 35 files changed, 1778 insertions(+), 50 deletions(-) rename TicketOffice/Migrations/{20220529081528_Initial_Create.Designer.cs => 20220609073909_Initial_Create.Designer.cs} (97%) rename TicketOffice/Migrations/{20220529081528_Initial_Create.cs => 20220609073909_Initial_Create.cs} (98%) create mode 100644 TicketOffice/Models/DateString.cs create mode 100644 TicketOffice/Pages/Management/Index.cshtml create mode 100644 TicketOffice/Pages/Management/Index.cshtml.cs create mode 100644 TicketOffice/Pages/Management/Routes/Create.cshtml create mode 100644 TicketOffice/Pages/Management/Routes/Create.cshtml.cs create mode 100644 TicketOffice/Pages/Management/Routes/Edit.cshtml create mode 100644 TicketOffice/Pages/Management/Routes/Edit.cshtml.cs create mode 100644 TicketOffice/Pages/Management/Routes/Index.cshtml create mode 100644 TicketOffice/Pages/Management/Routes/Index.cshtml.cs create mode 100644 TicketOffice/Services/PdfService.cs create mode 100644 TicketOffice/Services/UserValidationService.cs create mode 100644 TicketOffice/wwwroot/css/Management/Create.css create mode 100644 TicketOffice/wwwroot/css/Management/Delete.css create mode 100644 TicketOffice/wwwroot/css/Management/Edit.css create mode 100644 TicketOffice/wwwroot/css/Management/Index.css create mode 100644 TicketOffice/wwwroot/fonts/Roboto-Regular.ttf diff --git a/Readme.md b/Readme.md index a5799c5..caa5854 100644 --- a/Readme.md +++ b/Readme.md @@ -4,30 +4,28 @@ ### Встановлення: -Скомпільований (на linux) та налаштований проєкт знаходиться у каталозі ~/TicketOffice/bin/Release/net6.0 -Якщо немає ніяких проблем із його запуском можна пропустити наступні пункти +1. Compile the project (`[~]$ dotnet build -c Release` or in IDE) +2. Copy ~/TicketOffice/wwwroot to the root directory of compiled project (clean database can be found in ~/wwwroot/db) +3. Launch -1. Скомпілювати проєкт ([~]$ dotnet build -c Release або за допомогою інтегрованої середи розробки) -2. Скопіювати каталог ~/wwwroot/ у кореневий каталог скомпільованого проєкту (Чиста БД міститься у ~/wwwroot/db. Вона заповнюється інформацією самостійно, при першому запуску програми) -3. Запустити скомпільований проєкт - -* ~ – кореневий каталог вихідного коду проєкту - -### Доступні маршрути: +### Available routes: #### № 027 - Сватове -> Красноріченське -> Кремінна -> Рубіжне -> Сєвєродонецьк -> Лисичанськ -> Сєвєродонецьк -> Рубіжне -> Кремінна -> Красноріченське -> Сватове -- (Дата: дата першого запуску проєкту після додавання пустого файлу бази даних) +- (Date: date of the first launch of project with clean database) #### № 013 - Кремінна -> Рубіжне -> Сєвєродонецьк -> Станиця Луганська -> Сєвєродонецьк -> Рубіжне -> Кремінна -- (Дата: дата першого запуску проєкту після додавання пустого файлу бази даних) +- (Date: date of the first launch of project with clean database) -### Тестовий аккаунт +### Test user account -#### e-mail: danylo.nazarko@nure.ua -#### password: *Hashed Password* +- e-mail: user +- password: user -#### Альтернативно можно створити власний аккаунт. +### Test admin account + +- e-mail: admin +- password: admin diff --git a/TicketOffice/Migrations/20220529081528_Initial_Create.Designer.cs b/TicketOffice/Migrations/20220609073909_Initial_Create.Designer.cs similarity index 97% rename from TicketOffice/Migrations/20220529081528_Initial_Create.Designer.cs rename to TicketOffice/Migrations/20220609073909_Initial_Create.Designer.cs index 38e595b..30a26dd 100644 --- a/TicketOffice/Migrations/20220529081528_Initial_Create.Designer.cs +++ b/TicketOffice/Migrations/20220609073909_Initial_Create.Designer.cs @@ -11,7 +11,7 @@ using TicketOffice.Data; namespace TicketOffice.Migrations { [DbContext(typeof(TicketOfficeContext))] - [Migration("20220529081528_Initial_Create")] + [Migration("20220609073909_Initial_Create")] partial class Initial_Create { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -133,6 +133,9 @@ namespace TicketOffice.Migrations .HasMaxLength(48) .HasColumnType("TEXT"); + b.Property("IsManager") + .HasColumnType("INTEGER"); + b.Property("Password") .IsRequired() .HasMaxLength(32) diff --git a/TicketOffice/Migrations/20220529081528_Initial_Create.cs b/TicketOffice/Migrations/20220609073909_Initial_Create.cs similarity index 98% rename from TicketOffice/Migrations/20220529081528_Initial_Create.cs rename to TicketOffice/Migrations/20220609073909_Initial_Create.cs index dc791e6..470892e 100644 --- a/TicketOffice/Migrations/20220529081528_Initial_Create.cs +++ b/TicketOffice/Migrations/20220609073909_Initial_Create.cs @@ -30,7 +30,8 @@ namespace TicketOffice.Migrations Id = table.Column(type: "INTEGER", nullable: false) .Annotation("Sqlite:Autoincrement", true), Email = table.Column(type: "TEXT", maxLength: 48, nullable: false), - Password = table.Column(type: "TEXT", maxLength: 32, nullable: false) + Password = table.Column(type: "TEXT", maxLength: 32, nullable: false), + IsManager = table.Column(type: "INTEGER", nullable: false) }, constraints: table => { diff --git a/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs b/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs index f70548a..570edbe 100644 --- a/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs +++ b/TicketOffice/Migrations/TicketOfficeContextModelSnapshot.cs @@ -131,6 +131,9 @@ namespace TicketOffice.Migrations .HasMaxLength(48) .HasColumnType("TEXT"); + b.Property("IsManager") + .HasColumnType("INTEGER"); + b.Property("Password") .IsRequired() .HasMaxLength(32) diff --git a/TicketOffice/Models/DateString.cs b/TicketOffice/Models/DateString.cs new file mode 100644 index 0000000..a63b8a9 --- /dev/null +++ b/TicketOffice/Models/DateString.cs @@ -0,0 +1,7 @@ +namespace TicketOffice.Models; + +public class DateString +{ + public string? DepartureDate { get; set; } + public string? ArrivalDate { get; set; } +} \ No newline at end of file diff --git a/TicketOffice/Models/Route.cs b/TicketOffice/Models/Route.cs index 24147bd..15da58f 100644 --- a/TicketOffice/Models/Route.cs +++ b/TicketOffice/Models/Route.cs @@ -1,15 +1,17 @@ using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc.ModelBinding; namespace TicketOffice.Models; public class Route { [Key] + [BindRequired] public int Id { get; set; } [Required(ErrorMessage = "Поле має бути заповненим")] [Display(Name = "Номер")] - [Range(1, 256)] + [Range(1, 9999)] public int Number { get; set; } [Required(ErrorMessage = "Поле має бути заповненим")] @@ -18,7 +20,7 @@ public class Route public int Capacity { get; set; } [Required] - public ICollection Cities { get; set; } = null!; + public List Cities { get; set; } = null!; - public ICollection? Tickets { get; set; } + public List? Tickets { get; set; } } \ No newline at end of file diff --git a/TicketOffice/Models/SeedData.cs b/TicketOffice/Models/SeedData.cs index 2364cb8..83360ca 100644 --- a/TicketOffice/Models/SeedData.cs +++ b/TicketOffice/Models/SeedData.cs @@ -28,8 +28,15 @@ public class SeedData { new User { - Email = "danylo.nazarko@nure.ua", - Password = "*Hashed Password*", + Email = "admin", + Password = "admin", + IsManager = true + }, + new User + { + Email = "user", + Password = "user", + IsManager = false } }); diff --git a/TicketOffice/Models/User.cs b/TicketOffice/Models/User.cs index 672db96..3c47989 100644 --- a/TicketOffice/Models/User.cs +++ b/TicketOffice/Models/User.cs @@ -25,6 +25,10 @@ public class User ErrorMessage = "Проль має містити великі та малі латинські літери, цифри та спеціальні знаки (@, $, % та ін.)")] public string Password { get; set; } = null!; + [Required(ErrorMessage = "Поле має бути заповненим")] + [Display(Name = "Адмімістратор?")] + public bool IsManager { get; set; } + public ICollection? Tickets { get; set; } } \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Account.cshtml b/TicketOffice/Pages/Auth/Account.cshtml index 7d62cfa..be61363 100644 --- a/TicketOffice/Pages/Auth/Account.cshtml +++ b/TicketOffice/Pages/Auth/Account.cshtml @@ -54,6 +54,7 @@
Маршрут + Скачати квиток Повернути
@@ -154,7 +155,7 @@
Відмінити - Повернути + Повернути
diff --git a/TicketOffice/Pages/Auth/Account.cshtml.cs b/TicketOffice/Pages/Auth/Account.cshtml.cs index bb5fe3d..a688bf5 100644 --- a/TicketOffice/Pages/Auth/Account.cshtml.cs +++ b/TicketOffice/Pages/Auth/Account.cshtml.cs @@ -3,31 +3,36 @@ using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.EntityFrameworkCore; using TicketOffice.Data; using TicketOffice.Models; +using TicketOffice.Services; namespace TicketOffice.Pages.Auth; public class AccountModel : PageModel { private readonly TicketOfficeContext context; + private readonly UserValidationService validationService; + private readonly PdfService pdfService; - public AccountModel(TicketOfficeContext context) + public AccountModel(TicketOfficeContext context, + UserValidationService validationService, + PdfService pdfService) { this.context = context; + this.validationService = validationService; + this.pdfService = pdfService; } // User's tickets. public List Tickets { get; set; } = null!; - // Will be set when user confirm ticket return. - [BindProperty(SupportsGet = true)] - public int ReturnTicketId { get; set; } - // Called when GET request is sent to the page. Checks if the session is // valid then retrieves all user's tickets. public ActionResult OnGet() { - if (!ValidateSession()) + if (!validationService.IsAuthorized(HttpContext)) + { return RedirectToPage("/Auth/Login"); + } Tickets = context.Ticket .Where(t => @@ -40,11 +45,11 @@ public class AccountModel : PageModel } // Called when user confirms ticket return. - public ActionResult OnGetReturnTicket() + public ActionResult OnGetReturnTicket(int returnTicketId) { OnGet(); - Ticket? returnTicket = context.Ticket.Find(ReturnTicketId); + Ticket? returnTicket = context.Ticket.Find(returnTicketId); if (returnTicket != null) { @@ -56,8 +61,18 @@ public class AccountModel : PageModel return NotFound(); } - private bool ValidateSession() + // Downloads ticket in PDF format + public ActionResult OnGetTicketPdf(int pdfTicketId) { - return HttpContext.Session.GetInt32("UserId") != null; + OnGet(); + + Ticket? ticket = Tickets.Find(t => t.Id == pdfTicketId); + + if (ticket == null) + { + return NotFound(); + } + + return pdfService.GetTicketPdf(ticket); } } \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Index.cshtml.cs b/TicketOffice/Pages/Auth/Index.cshtml.cs index 2eed9bd..d304a85 100644 --- a/TicketOffice/Pages/Auth/Index.cshtml.cs +++ b/TicketOffice/Pages/Auth/Index.cshtml.cs @@ -1,15 +1,23 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using TicketOffice.Services; namespace TicketOffice.Pages.Auth; public class IndexModel : PageModel { + private readonly UserValidationService validationService; + + public IndexModel(UserValidationService validationService) + { + this.validationService = validationService; + } + // Called when GET request is sent to the page. Determines what page // user will be redirected to depending on his/her authorization status. public ActionResult OnGet() { - if (HttpContext.Session.GetInt32("UserId") != null) + if (validationService.IsAuthorized(HttpContext)) { return RedirectToPage("/Auth/Account"); } diff --git a/TicketOffice/Pages/Auth/Login.cshtml.cs b/TicketOffice/Pages/Auth/Login.cshtml.cs index c921ec6..55c5de9 100644 --- a/TicketOffice/Pages/Auth/Login.cshtml.cs +++ b/TicketOffice/Pages/Auth/Login.cshtml.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using TicketOffice.Data; using TicketOffice.Models; +using TicketOffice.Services; namespace TicketOffice.Pages.Auth; @@ -15,10 +16,13 @@ public class LoginModel : PageModel public string PasswordValidationError = null!; private readonly TicketOfficeContext context; + private readonly UserValidationService validationService; - public LoginModel(TicketOfficeContext context) + public LoginModel(TicketOfficeContext context, + UserValidationService validationService) { this.context = context; + this.validationService = validationService; } // Object representing a user who wants to login. @@ -29,7 +33,7 @@ public class LoginModel : PageModel // redirects to "Account" page if user already logged in. public ActionResult OnGet() { - if (ValidateSession()) + if (validationService.IsAuthorized(HttpContext)) { return RedirectToPage("/Auth/Account"); } @@ -47,6 +51,7 @@ public class LoginModel : PageModel .FirstOrDefault(u => u.Email == User!.Email); HttpContext.Session.SetInt32("UserId", user!.Id); + HttpContext.Session.SetInt32("IsManager", user!.IsManager ? 1 : 0); return RedirectToPage("/Auth/Account"); } @@ -104,9 +109,4 @@ public class LoginModel : PageModel return false; } } - - private bool ValidateSession() - { - return HttpContext.Session.GetInt32("UserId") != null; - } } \ No newline at end of file diff --git a/TicketOffice/Pages/Auth/Registration.cshtml.cs b/TicketOffice/Pages/Auth/Registration.cshtml.cs index 5b683cb..26bb279 100644 --- a/TicketOffice/Pages/Auth/Registration.cshtml.cs +++ b/TicketOffice/Pages/Auth/Registration.cshtml.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using TicketOffice.Data; using TicketOffice.Models; +using TicketOffice.Services; namespace TicketOffice.Pages.Auth; @@ -15,10 +16,13 @@ public class RegistrationModel : PageModel public string PasswordValidationError = null!; private readonly TicketOfficeContext context; + private readonly UserValidationService validationService; - public RegistrationModel(TicketOfficeContext context) + public RegistrationModel(TicketOfficeContext context, + UserValidationService validationService) { this.context = context; + this.validationService = validationService; } [BindProperty] @@ -28,7 +32,7 @@ public class RegistrationModel : PageModel // redirects to "Account" page if user already logged in. public ActionResult OnGet() { - if (ValidateSession()) + if (validationService.IsAuthorized(HttpContext)) { return RedirectToPage("/Auth/Account"); } @@ -120,9 +124,4 @@ public class RegistrationModel : PageModel return true; } } - - private bool ValidateSession() - { - return HttpContext.Session.GetInt32("UserId") != null; - } } \ No newline at end of file diff --git a/TicketOffice/Pages/Management/Index.cshtml b/TicketOffice/Pages/Management/Index.cshtml new file mode 100644 index 0000000..3d5d9b8 --- /dev/null +++ b/TicketOffice/Pages/Management/Index.cshtml @@ -0,0 +1,19 @@ +@page +@model TicketOffice.Pages.Management.Index + +@{ + Layout = null; +} + + + + + + + + +
+ +
+ + \ No newline at end of file diff --git a/TicketOffice/Pages/Management/Index.cshtml.cs b/TicketOffice/Pages/Management/Index.cshtml.cs new file mode 100644 index 0000000..51f6d84 --- /dev/null +++ b/TicketOffice/Pages/Management/Index.cshtml.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using TicketOffice.Services; + +namespace TicketOffice.Pages.Management; + +public class Index : PageModel +{ + private readonly UserValidationService validationService; + + public Index(UserValidationService validationService) + { + this.validationService = validationService; + } + + public ActionResult OnGet() + { + if (!validationService.IsAuthorized(HttpContext)) + { + return RedirectToPage("/Index"); + } + else + { + return RedirectToPage("./Routes"); + } + } +} \ No newline at end of file diff --git a/TicketOffice/Pages/Management/Routes/Create.cshtml b/TicketOffice/Pages/Management/Routes/Create.cshtml new file mode 100644 index 0000000..4780ea1 --- /dev/null +++ b/TicketOffice/Pages/Management/Routes/Create.cshtml @@ -0,0 +1,116 @@ +@page +@model TicketOffice.Pages.Management.Routes.CreateModel +@{ + ViewData["Title"] = "Створити Маршрут"; + Layout = "~/Pages/Shared/_Layout.cshtml"; +} + + + +
+ +
+
+ Створити рейс +
+ +
+ +
@Model.NumberValidationError
+
+ +
+ +
@Model.CapacityValidationError
+
+ + @if (Model.CitiesCount != null) + { +

Маршрут

+ + @for (int i = 0; i < Model.CitiesCount; i++) + { +
+
+ +
@Model.NameValidationError[i]
+
+ +
+ +
@Model.ArrivalTimeValidationError[i]
+
+ +
+ +
@Model.DepartureTimeValidationError[i]
+
+
+ } + + + + + } + else + { +

Маршрут

+ +
+ +
+
+ + + } + +
+ Назад до Списку +
+
+ +
+ + \ No newline at end of file diff --git a/TicketOffice/Pages/Management/Routes/Create.cshtml.cs b/TicketOffice/Pages/Management/Routes/Create.cshtml.cs new file mode 100644 index 0000000..7351c63 --- /dev/null +++ b/TicketOffice/Pages/Management/Routes/Create.cshtml.cs @@ -0,0 +1,294 @@ +using System.Globalization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using TicketOffice.Data; +using TicketOffice.Models; +using TicketOffice.Services; +using Route = TicketOffice.Models.Route; + +namespace TicketOffice.Pages.Management.Routes; + +public class CreateModel : PageModel +{ + // Error massage displaying when route number validation failed. + public string NumberValidationError = null!; + + // Error massage displaying when route capacity validation failed. + public string CapacityValidationError = null!; + + // Array of error massages displaying when route name validation failed. + public string[] NameValidationError; + + // Array of error massages displaying when cities + // departure time validation failed. + public string[] DepartureTimeValidationError; + + // Array of error massages displaying when cities + // arrival time validation failed. + public string[] ArrivalTimeValidationError; + + private readonly TicketOfficeContext context; + private readonly UserValidationService validationService; + + public CreateModel(TicketOfficeContext context, + UserValidationService validationService) + { + this.context = context; + this.validationService = validationService; + } + + // Object representing that will be created. + [BindProperty] + public Route Route { get; set; } + + // Object holding cities' arrival/departure dates. + [BindProperty] + public DateString[] TimeStrings { get; set; } + + // Amount of cities to be added to the route + [BindProperty] + public int? CitiesCount { get; set; } + + // Called when GET request is sent to the page. + public IActionResult OnGet() + { + if (!validationService.IsManager(HttpContext)) + { + return RedirectToPage("/Index"); + } + + return Page(); + } + + // Called when POST request is sent to the page (when user tries to add new + // route). Validates input, creates new route in the database and + // redirects to "Management/Routes" page. + public ActionResult OnPost() + { + if (CitiesCount != null) + { + Route = new Route(); + Route.Cities = new List(); + + TimeStrings = new DateString[(int) CitiesCount]; + for (int i = 0; i < CitiesCount; i++) + { + TimeStrings[i] = new DateString(); + Route.Cities.Add(new RouteCity()); + } + + NameValidationError = new string[(int) CitiesCount]; + DepartureTimeValidationError = new string[(int) CitiesCount]; + ArrivalTimeValidationError = new string[(int) CitiesCount]; + + return Page(); + } + + NameValidationError = new string[Route.Cities.Count]; + DepartureTimeValidationError = new string[Route.Cities.Count]; + ArrivalTimeValidationError = new string[Route.Cities.Count]; + + InsertDatesIntoCities(); + + if (!ValidateInput()) + { + return Page(); + } + + context.Route.Add(Route); + context.SaveChanges(); + + return RedirectToPage("./Index"); + } + + private void InsertDatesIntoCities() + { + for (int i = 0; i < Route.Cities.Count; i++) + { + + try + { + Route.Cities[i].DepartureTime = + ConvertStringToDate(TimeStrings[i].DepartureDate); + } + catch(Exception e) + { + if (Route.Cities.Count > 2) + { + InitializeArray(DepartureTimeValidationError, + Route.Cities.Count, + ""); + } + + DepartureTimeValidationError[i] = "Формат: dd.MM.yyyy, hh:mm"; + } + + try + { + Route.Cities[i].ArrivalTime = + ConvertStringToDate(TimeStrings[i].ArrivalDate); + } + catch(Exception e) + { + if (Route.Cities.Count > 2) + { + InitializeArray(ArrivalTimeValidationError, + Route.Cities.Count, + ""); + } + + ArrivalTimeValidationError[i] = "Формат: dd.MM.yyyy, hh:mm"; + } + } + + DateTime? ConvertStringToDate(string dateStr) + { + if (String.IsNullOrWhiteSpace(dateStr) || + String.IsNullOrEmpty(dateStr)) + { + return null; + } + + if (dateStr.Count(c => c == '.') != 2 && + dateStr.Count(c => c == ':') != 2 && + dateStr.Count(c => c == ',') != 1) + { + throw new ArgumentException("Invalid input format"); + } + + string[] date = dateStr.Split(",")[0].Split("."); + string[] time = dateStr.Split(",")[1].Split(":"); + + date.ToList().ForEach(s => s.Trim()); + time.ToList().ForEach(s => s.Trim()); + + return new DateTime( + Int32.Parse(date[2]), + Int32.Parse(date[1]), + Int32.Parse(date[0]), + Int32.Parse(time[0]), + Int32.Parse(time[1]), + 0); + } + } + + private bool ValidateInput() + { + bool isValidNumber = ValidateNumber(Route.Number, out NumberValidationError); + + bool isValidCapacity = ValidateCapacity(Route.Capacity, out CapacityValidationError); + + for (int i = 0; i < Route.Cities.Count; i++) + { + if (Route.Cities.Count > 2) + { + InitializeArray(NameValidationError, + Route.Cities.Count, + ""); + } + + ValidateName(Route.Cities[i].Name, out NameValidationError[i]); + } + + for (int i = 0; i < Route.Cities.Count; i++) + { + if (Route.Cities.Count > 2) + { + InitializeArray(DepartureTimeValidationError, + Route.Cities.Count, + ""); + } + + ValidateDate(Route.Cities[i].DepartureTime, out DepartureTimeValidationError[i]); + } + + for (int i = 0; i < Route.Cities.Count; i++) + { + if (Route.Cities.Count > 2) + { + InitializeArray(ArrivalTimeValidationError, + Route.Cities.Count, + ""); + } + + ValidateDate(Route.Cities[i].ArrivalTime, out ArrivalTimeValidationError[i]); + } + + if (!isValidNumber || !isValidCapacity || + NameValidationError.Any(e => e != "") || + DepartureTimeValidationError.Any(e => e != "") || + ArrivalTimeValidationError.Any(e => e != "")) + { + return false; + } + + return true; + + bool ValidateNumber(int number, out string validationError) + { + validationError = ""; + + if (number < 1 || number > 9999) + { + validationError = "Має бути в проміжку від 1 до 9999"; + return false; + } + + return true; + } + + bool ValidateCapacity(int capacity, out string validationError) + { + validationError = ""; + + if (capacity < 1 || capacity > 40) + { + validationError = "Має бути в проміжку від 5 до 45"; + return false; + } + + return true; + } + + bool ValidateName(string name, out string validationError) + { + validationError = ""; + + if (String.IsNullOrWhiteSpace(name) || String.IsNullOrEmpty(name)) + { + validationError = "Поле має бути заповненим"; + return false; + } + + return true; + } + + bool ValidateDate(DateTime? date, out string validationError) + { + validationError = ""; + + if (date == null) + { + return true; + } + + if (date < DateTime.Today) + { + validationError = $"Має бути не раніше ніж {DateTime.Today.ToString(CultureInfo.GetCultureInfo("uk-UA")).Split(" ")[0]}"; + return false; + } + + return true; + } + } + + private void InitializeArray(T[] arr, int length, T initVal) + { + arr = new T[length]; + + for (int i = 0; i < length; i++) + { + arr[i] = initVal; + } + } +} \ No newline at end of file diff --git a/TicketOffice/Pages/Management/Routes/Edit.cshtml b/TicketOffice/Pages/Management/Routes/Edit.cshtml new file mode 100644 index 0000000..01c7498 --- /dev/null +++ b/TicketOffice/Pages/Management/Routes/Edit.cshtml @@ -0,0 +1,60 @@ +@page +@model TicketOffice.Pages.Management.Routes.EditModel + +@{ + ViewData["Title"] = $"Редагування Маршруту"; + Layout = "~/Pages/Shared/_Layout.cshtml"; +} + + + +
+ +
+
+ Редагування рейсу +
+ +
+ +
@Model.NumberValidationError
+
+ +
+ +
@Model.CapacityValidationError
+
+ +

Маршрут

+ + @for (int i = 0; i < @Model.Route.Cities.Count; i++) + { +
+
+ +
@Model.NameValidationError[i]
+
+ +
+ +
@Model.ArrivalTimeValidationError[i]
+
+ +
+ +
@Model.DepartureTimeValidationError[i]
+
+ + +
+ } + + + +
+ Назад до Списку +
+
+ +
+ diff --git a/TicketOffice/Pages/Management/Routes/Edit.cshtml.cs b/TicketOffice/Pages/Management/Routes/Edit.cshtml.cs new file mode 100644 index 0000000..79accd6 --- /dev/null +++ b/TicketOffice/Pages/Management/Routes/Edit.cshtml.cs @@ -0,0 +1,360 @@ +using System.Globalization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; +using TicketOffice.Data; +using TicketOffice.Models; +using TicketOffice.Services; +using Route = TicketOffice.Models.Route; + +namespace TicketOffice.Pages.Management.Routes; + +public class EditModel : PageModel +{ + // Error massage displaying when route number validation failed. + public string NumberValidationError = null!; + + // Error massage displaying when route capacity validation failed. + public string CapacityValidationError = null!; + + // Array of error massages displaying when route name validation failed. + public string[] NameValidationError; + + // Array of error massages displaying when cities + // departure time validation failed. + public string[] DepartureTimeValidationError; + + // Array of error massages displaying when cities + // arrival time validation failed. + public string[] ArrivalTimeValidationError; + + private readonly TicketOfficeContext context; + private readonly UserValidationService validationService; + + public EditModel(TicketOfficeContext context, + UserValidationService validationService) + { + this.context = context; + this.validationService = validationService; + } + + // Object representing that will be created. + [BindProperty] + public Route Route { get; set; } + + // Object holding cities' arrival/departure dates. + [BindProperty] + public DateString[] TimeStrings { get; set; } + + // Holds cities' ids between loading and saving + [BindProperty] + public int[] CityIds { get; set; } + + // Called when GET request is sent to the page. + // Retrieves route. + public IActionResult OnGet(int? id) + { + if (!validationService.IsManager(HttpContext)) + { + return RedirectToPage("/Index"); + } + + if (id == null) + { + return NotFound(); + } + + Route = context.Route.Where(m => m.Id == id) + .Include(r => r.Cities) + .First(); + + InitializeArrays(); + + TimeStrings = new DateString[Route.Cities.Count]; + for (int i = 0; i < TimeStrings.Length; i++) + { + TimeStrings[i] = new DateString(); + } + + InsertDatesIntoStrings(); + SaveCityIds(); + + if (Route == null) + { + return NotFound(); + } + return Page(); + } + + // Called when POST request is sent to the page. + // Saves changes made to route. + public IActionResult OnPost(int? id) + { + InitializeArrays(); + InsertDatesIntoCities(); + LoadCityIds(); + Route.Id = (int) id; + + if (!ValidateInput()) + { + return Page(); + } + + context.Attach(Route).State = EntityState.Modified; + + foreach (var city in Route.Cities) + { + context.Attach(city).State = EntityState.Modified; + } + + try + { + context.SaveChanges(); + } + catch (DbUpdateConcurrencyException) + { + if (!RouteExists(Route.Id)) + { + return NotFound(); + } + else + { + throw; + } + } + + return RedirectToPage("./Index"); + } + + private bool RouteExists(int id) + { + return context.Route.Any(e => e.Id == id); + } + + private void InsertDatesIntoCities() + { + for (int i = 0; i < Route.Cities.Count; i++) + { + + try + { + Route.Cities[i].DepartureTime = + ConvertStringToDate(TimeStrings[i].DepartureDate); + } + catch(Exception e) + { + if (Route.Cities.Count > 2) + { + DepartureTimeValidationError= InitializeArray( + Route.Cities.Count, ""); + } + + DepartureTimeValidationError[i] = "Формат: dd.MM.yyyy, hh:mm"; + } + + try + { + Route.Cities[i].ArrivalTime = + ConvertStringToDate(TimeStrings[i].ArrivalDate); + } + catch(Exception e) + { + if (Route.Cities.Count > 2) + { + ArrivalTimeValidationError = InitializeArray( + Route.Cities.Count, ""); + } + + ArrivalTimeValidationError[i] = "Формат: dd.MM.yyyy, hh:mm"; + } + } + + DateTime? ConvertStringToDate(string dateStr) + { + if (String.IsNullOrWhiteSpace(dateStr) || + String.IsNullOrEmpty(dateStr)) + { + return null; + } + + string[] date = dateStr.Split(",")[0].Split("."); + string[] time = dateStr.Split(",")[1].Split(":"); + + date.ToList().ForEach(s => s.Trim()); + time.ToList().ForEach(s => s.Trim()); + + return new DateTime( + Int32.Parse(date[2]), + Int32.Parse(date[1]), + Int32.Parse(date[0]), + Int32.Parse(time[0]), + Int32.Parse(time[1]), + 0); + } + } + + private void InsertDatesIntoStrings() + { + for (int i = 0; i < Route.Cities.Count; i++) + { + if (Route.Cities[i].DepartureTime != null) + { + TimeStrings[i].DepartureDate = Route.Cities[i].DepartureTime + .Value.ToString("dd.MM.yyyy, hh:mm"); + } + + if (Route.Cities[i].ArrivalTime != null) + { + TimeStrings[i].ArrivalDate = Route.Cities[i].ArrivalTime + .Value.ToString("dd.MM.yyyy, hh:mm"); + } + } + } + + // This method doesn't actually work, but stays here for representing + // an idea. It should be removed. + private void SaveCityIds() + { + CityIds = new int[Route.Cities.Count]; + + for (int i = 0; i < Route.Cities.Count; i++) + { + CityIds[i] = Route.Cities[i].Id; + } + } + + private void LoadCityIds() + { + for (int i = 0; i < CityIds.Length; i++) + { + Route.Cities[i].Id = CityIds[i]; + } + } + + private bool ValidateInput() + { + bool isValidNumber = ValidateNumber(Route.Number, out NumberValidationError); + + bool isValidCapacity = ValidateCapacity(Route.Capacity, out CapacityValidationError); + + for (int i = 0; i < Route.Cities.Count; i++) + { + if (Route.Cities.Count > 2) + { + NameValidationError = InitializeArray( + Route.Cities.Count, ""); + } + + ValidateName(Route.Cities[i].Name, out NameValidationError[i]); + } + + for (int i = 0; i < Route.Cities.Count; i++) + { + if (Route.Cities.Count > 2) + { + DepartureTimeValidationError= InitializeArray( + Route.Cities.Count, ""); + } + + ValidateDate(Route.Cities[i].DepartureTime, out DepartureTimeValidationError[i]); + } + + for (int i = 0; i < Route.Cities.Count; i++) + { + if (Route.Cities.Count > 2) + { + ArrivalTimeValidationError = InitializeArray( + Route.Cities.Count, ""); + } + + ValidateDate(Route.Cities[i].ArrivalTime, out ArrivalTimeValidationError[i]); + } + + if (!isValidNumber || !isValidCapacity || + NameValidationError.Any(e => e != "") || + DepartureTimeValidationError.Any(e => e != "") || + ArrivalTimeValidationError.Any(e => e != "")) + { + return false; + } + + return true; + + bool ValidateNumber(int number, out string validationError) + { + validationError = ""; + + if (number < 1 || number > 9999) + { + validationError = "Має бути в проміжку від 1 до 9999"; + return false; + } + + return true; + } + + bool ValidateCapacity(int capacity, out string validationError) + { + validationError = ""; + + if (capacity < 1 || capacity > 40) + { + validationError = "Має бути в проміжку від 5 до 45"; + return false; + } + + return true; + } + + bool ValidateName(string name, out string validationError) + { + validationError = ""; + + if (String.IsNullOrWhiteSpace(name) || String.IsNullOrEmpty(name)) + { + validationError = "Поле має бути заповненим"; + return false; + } + + return true; + } + + bool ValidateDate(DateTime? date, out string validationError) + { + validationError = ""; + + if (date == null) + { + return true; + } + + if (date < DateTime.Today) + { + validationError = $"Має бути пізніше ніж {DateTime.Today.ToString(CultureInfo.GetCultureInfo("uk-UA"))}"; + return false; + } + + return true; + } + } + + private T[] InitializeArray(int length, T initVal) + { + T[] arr = new T[length]; + + for (int i = 0; i < length; i++) + { + arr[i] = initVal; + } + + return arr; + } + + private void InitializeArrays() + { + NameValidationError = InitializeArray(Route.Cities.Count, ""); + DepartureTimeValidationError = InitializeArray(Route.Cities.Count, ""); + ArrivalTimeValidationError = InitializeArray(Route.Cities.Count, ""); + } +} + diff --git a/TicketOffice/Pages/Management/Routes/Index.cshtml b/TicketOffice/Pages/Management/Routes/Index.cshtml new file mode 100644 index 0000000..173495d --- /dev/null +++ b/TicketOffice/Pages/Management/Routes/Index.cshtml @@ -0,0 +1,208 @@ +@page +@model TicketOffice.Pages.Management.Routes.IndexModel +@{ + ViewData["Title"] = "Управління Маршрутами"; + Layout = "~/Pages/Shared/_Layout.cshtml"; +} + + + + + +
+ +
+
+
+
+ № автобуса +
+ +
+ +
+
+ Звідки +
+ +
+ +
+
+ Куди +
+ +
+ +
+
+ Дата рейсу +
+ +
+ +
+ +
+
+
+ +

+ Створити новий +

+ + @if (Model.Routes != null && Model.Routes.Count > 0) + { + + + + + + + + + + + + @foreach (var route in Model.Routes) { + + + + + + + + } + +
+ № автобуса + + Ємність автобуса + + Квитків продано + + Дата відправлення + + Дії +
+ @Html.DisplayFor(modelItem => route.Number) + + @Html.DisplayFor(modelItem => route.Capacity) + + @route.Tickets.Count + + @route.Cities.First().DepartureTime.Value.ToString("dd.MM.yyyy") + + Маршрут + Редагувати + Видалити +
+ } + else + { +
+

Маршрутів не знайдено. Перевірте критерії пошуку або додайте новий рейс

+
+ } + + @if (Model.Routes != null) + { + foreach (var route in Model.Routes) + { + + + + } + } + +
\ No newline at end of file diff --git a/TicketOffice/Pages/Management/Routes/Index.cshtml.cs b/TicketOffice/Pages/Management/Routes/Index.cshtml.cs new file mode 100644 index 0000000..3be773a --- /dev/null +++ b/TicketOffice/Pages/Management/Routes/Index.cshtml.cs @@ -0,0 +1,131 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; +using TicketOffice.Data; +using TicketOffice.Models; +using TicketOffice.Services; +using Route = TicketOffice.Models.Route; + +namespace TicketOffice.Pages.Management.Routes +{ + public class IndexModel : PageModel + { + private readonly TicketOfficeContext context; + private readonly UserValidationService validationService; + + public IndexModel(TicketOfficeContext context, + UserValidationService validationService) + { + this.context = context; + this.validationService = validationService; + } + + public List? Routes { get; set; } + + // Search condition: route number. + [BindProperty(SupportsGet = true)] + public int? Number { get; set; } + + // Search condition: departure city. + [BindProperty(SupportsGet = true)] + public string? From { get; set; } + + // Search condition: arrival city. + [BindProperty(SupportsGet = true)] + public string? To { get; set; } + + // Search condition: departure date. + [BindProperty(SupportsGet = true)] + public DateTime? Date { get; set; } + + // Will be set when user confirm route deletion. + [BindProperty(SupportsGet = true)] + public int DeleteRouteId { get; set; } + + // Called when GET request is sent to the page. + // Retrieves routes based on search conditions. + public ActionResult OnGet() + { + if (!validationService.IsManager(HttpContext)) + { + return RedirectToPage("/Index"); + } + + RetrieveAllRoutes(); + FilterRoutesByNumber(); + FilterRoutesByFrom(); + FilterRoutesByTo(); + FilterRoutesByDate(); + + return Page(); + } + + // Called when user confirms route deletion. + public ActionResult OnGetDeleteRoute() + { + OnGet(); + + Route? deleteRoute = context.Route.Find(DeleteRouteId); + + if (deleteRoute != null) + { + context.Remove(deleteRoute); + context.SaveChanges(); + return RedirectToPage("./Index"); + } + + return NotFound(); + } + + private void RetrieveAllRoutes() + { + Routes = context.Route + .Include(r => r.Cities) + .Include(r => r.Tickets) + .ToList(); + } + + private void FilterRoutesByNumber() + { + if (Number == null || Number < 1) + { + return; + } + + Routes.RemoveAll(r => r.Number != Number); + } + + private void FilterRoutesByFrom() + { + if (String.IsNullOrWhiteSpace(From) || String.IsNullOrEmpty(From)) + { + return; + } + + Routes.RemoveAll(r => r.Cities.All(c => c.Name != From)); + } + + private void FilterRoutesByTo() + { + if (String.IsNullOrWhiteSpace(To) || String.IsNullOrEmpty(To)) + { + return; + } + + Routes.RemoveAll(r => r.Cities.All(c => c.Name != To)); + } + + private void FilterRoutesByDate() + { + if (Date == null) + { + return; + } + + Routes.RemoveAll(r => + r.Cities.All(c => + c.DepartureTime?.Date != Date?.Date && + c.ArrivalTime?.Date != Date?.Date)); + } + } +} diff --git a/TicketOffice/Pages/Routes/Index.cshtml b/TicketOffice/Pages/Routes/Index.cshtml index b48dbb9..9de965d 100644 --- a/TicketOffice/Pages/Routes/Index.cshtml +++ b/TicketOffice/Pages/Routes/Index.cshtml @@ -197,7 +197,7 @@