From 5e46d3249ffdb392548adc4fe18398e59a9ae045 Mon Sep 17 00:00:00 2001 From: Extrimal Date: Fri, 3 May 2024 21:12:43 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=8E=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=82=D1=80=D0=B0=D0=BA=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/BookingViewModel.cs | 20 +++++++++++++++++-- .../ViewModels/ClientViewModel.cs | 14 ++++++++++++- .../ViewModels/PostViewModel.cs | 7 ++++++- .../ViewModels/RoomViewModel.cs | 16 ++++++++++++++- .../ViewModels/WorkerViewModel.cs | 11 +++++----- 5 files changed, 58 insertions(+), 10 deletions(-) diff --git a/Hotel/HotelContracts/ViewModels/BookingViewModel.cs b/Hotel/HotelContracts/ViewModels/BookingViewModel.cs index dd0a134..c677ec1 100644 --- a/Hotel/HotelContracts/ViewModels/BookingViewModel.cs +++ b/Hotel/HotelContracts/ViewModels/BookingViewModel.cs @@ -1,5 +1,7 @@ -using System; +using HotelDataModels.Enums; +using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,5 +10,19 @@ namespace HotelContracts.ViewModels { public class BookingViewModel { - } + public int Id { get; set; } + public int RoomId { get; set; } + + public int ClientId { get; set; } + [DisplayName("Дата заезда")] + public DateTime ArrivalDate { get; set; } = DateTime.Now; + [DisplayName("Дата выезда")] + public DateTime DepartureDate { get; set; } = DateTime.Now; + [DisplayName("Количество проведенных часов")] + public int NumberHoursSpent { get; set; } + [DisplayName("Статус проверки")] + public AcceptanceStatus Status { get; set; } = AcceptanceStatus.Неизвестен; + [DisplayName("Полная стоимость")] + public int TotalCost { get; set; } + } } diff --git a/Hotel/HotelContracts/ViewModels/ClientViewModel.cs b/Hotel/HotelContracts/ViewModels/ClientViewModel.cs index 6c295f0..0d754b9 100644 --- a/Hotel/HotelContracts/ViewModels/ClientViewModel.cs +++ b/Hotel/HotelContracts/ViewModels/ClientViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,5 +9,16 @@ namespace HotelContracts.ViewModels { public class ClientViewModel { - } + public int Id { get; set; } + [DisplayName("Имя")] + public string Name { get; set; } = string.Empty; + [DisplayName("Фамилия")] + public string Surname { get; set; } = string.Empty; + [DisplayName("Дата рождения")] + public DateTime DateOfBirth { get; set; } = DateTime.Now; + [DisplayName("Номер телефона")] + public string PhoneNumber { get; set; } = string.Empty; + [DisplayName("Пароль")] + public string Password { get; set; } = string.Empty; + } } diff --git a/Hotel/HotelContracts/ViewModels/PostViewModel.cs b/Hotel/HotelContracts/ViewModels/PostViewModel.cs index 82a2ffc..a1655a0 100644 --- a/Hotel/HotelContracts/ViewModels/PostViewModel.cs +++ b/Hotel/HotelContracts/ViewModels/PostViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,5 +9,9 @@ namespace HotelContracts.ViewModels { public class PostViewModel { - } + [DisplayName("Номер")] + public int Id { get; set; } + [DisplayName("Название должности")] + public string PostName { get; set; } = string.Empty; + } } diff --git a/Hotel/HotelContracts/ViewModels/RoomViewModel.cs b/Hotel/HotelContracts/ViewModels/RoomViewModel.cs index adff0c9..c069e71 100644 --- a/Hotel/HotelContracts/ViewModels/RoomViewModel.cs +++ b/Hotel/HotelContracts/ViewModels/RoomViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,5 +9,18 @@ namespace HotelContracts.ViewModels { public class RoomViewModel { - } + public int Id { get; set; } + + public int WorkerId { get; set; } + [DisplayName("Номер комнаты")] + public int Number { get; set; } + [DisplayName("Этаж")] + public int Floor { get; set; } + [DisplayName("Количество спальных мест")] + public int NumberOfBeds { get; set; } + [DisplayName("Состояние")] + public string Condition { get; set; } = string.Empty; + [DisplayName("Цена")] + public int Cost { get; set; } + } } diff --git a/Hotel/HotelContracts/ViewModels/WorkerViewModel.cs b/Hotel/HotelContracts/ViewModels/WorkerViewModel.cs index cc9daf1..f08322c 100644 --- a/Hotel/HotelContracts/ViewModels/WorkerViewModel.cs +++ b/Hotel/HotelContracts/ViewModels/WorkerViewModel.cs @@ -1,6 +1,7 @@ using HotelDataModels.Models; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -12,15 +13,15 @@ namespace HotelContracts.ViewModels public int Id { get; set; } public int PostId { get; set; } - + [DisplayName("ФИО")] public string FIO { get; set; } = string.Empty; - + [DisplayName("Дата рождения")] public DateTime DateOfBirth { get; set; } = DateTime.Now; - + [DisplayName("Опыт работы")] public int WorkExperience { get; set; } - + [DisplayName("Зарплата")] public int Salary { get; set; } - + [DisplayName("Номер телефона")] public string Phone { get; set; } = string.Empty; } } \ No newline at end of file