diff --git a/TravelAgency/TravelAgency.sln b/TravelAgency/TravelAgency.sln index e15f538..556dc05 100644 --- a/TravelAgency/TravelAgency.sln +++ b/TravelAgency/TravelAgency.sln @@ -3,9 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34322.80 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravelAgencyView", "TravelAgencyView\TravelAgencyView.csproj", "{1C65EB1E-2405-44DD-84E3-6BEA3A5A0197}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TravelAgencyView", "TravelAgencyView\TravelAgencyView.csproj", "{1C65EB1E-2405-44DD-84E3-6BEA3A5A0197}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravelAgencyDataModels", "TravelAgencyDataModels\TravelAgencyDataModels.csproj", "{DF3667E3-B2C0-4303-BE54-D23B19D72667}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TravelAgencyDataModels", "TravelAgencyDataModels\TravelAgencyDataModels.csproj", "{DF3667E3-B2C0-4303-BE54-D23B19D72667}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravelAgencyCompanyContracts", "TravelAgencyCompanyContracts\TravelAgencyCompanyContracts.csproj", "{EEC43C70-1112-4652-B3DB-58A1515FC3AC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,6 +23,10 @@ Global {DF3667E3-B2C0-4303-BE54-D23B19D72667}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF3667E3-B2C0-4303-BE54-D23B19D72667}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF3667E3-B2C0-4303-BE54-D23B19D72667}.Release|Any CPU.Build.0 = Release|Any CPU + {EEC43C70-1112-4652-B3DB-58A1515FC3AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EEC43C70-1112-4652-B3DB-58A1515FC3AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EEC43C70-1112-4652-B3DB-58A1515FC3AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EEC43C70-1112-4652-B3DB-58A1515FC3AC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TravelAgency/TravelAgencyCompanyContracts/BindingModels/CustomerBindingModel.cs b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/CustomerBindingModel.cs new file mode 100644 index 0000000..52beab7 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/CustomerBindingModel.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.BindingModels +{ + public class CustomerBindingModel: ICustomerModel + { + public int Id { get; set; } + public string Fio { get; set; } = string.Empty; + public string PhoneNumber { get; set; } = string.Empty; + + public string Email { get; set; } = string.Empty; + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BindingModels/HotelBindingModel.cs b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/HotelBindingModel.cs new file mode 100644 index 0000000..8f92293 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/HotelBindingModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.BindingModels +{ + public class HotelBindingModel : IHotelModel + { + public int Id { get; set; } + public string Name { get; set; } = string.Empty; + public string Address { get; set; } = string.Empty; + public int NumberStars { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BindingModels/MedicalInsuranceBindingModel.cs b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/MedicalInsuranceBindingModel.cs new file mode 100644 index 0000000..3daea98 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/MedicalInsuranceBindingModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.BindingModels +{ + public class MedicalInsuranceBindingModel: IMedicalInsuranceModel + { + public int Id { get; set; } + public string Type { get; set; } = string.Empty; + public int Sum { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BindingModels/ReportBindingModel.cs b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/ReportBindingModel.cs new file mode 100644 index 0000000..e606901 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/ReportBindingModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelAgencyCompanyContracts.BindingModels +{ + public class ReportBindingModel + { + public string FileName { get; set; } = string.Empty; + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } + + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BindingModels/TourBindingModel.cs b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/TourBindingModel.cs new file mode 100644 index 0000000..0077a15 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/TourBindingModel.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Enums; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.BindingModels +{ + public class TourBindingModel:ITourModel + { + public int Id { get; set; } + public int CustomerId { get; set; } + public int HotelId { get; set; } + public int TransportId { get; set; } + public int InsuranceId { get; set; } + public string ToPlace { get; set; } = string.Empty; + public string FromPlace { get; set; } = string.Empty; + public int CountNight { get; set; } + public StructureStatus Status { get; set; } = StructureStatus.Неизвестен; + public DateTime DepartureDate { get; set; } = DateTime.Now; + public DateTime? ArrivalDate { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BindingModels/TransportBindingModel.cs b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/TransportBindingModel.cs new file mode 100644 index 0000000..d786e4e --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BindingModels/TransportBindingModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.BindingModels +{ + public class TransportBindingModel:ITransportModel + { + public int Id { get; set; } + public string Type { get; set; } = string.Empty; + public string Number { get; set; } = string.Empty; + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ICustomerLogic.cs b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ICustomerLogic.cs new file mode 100644 index 0000000..ac2db05 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ICustomerLogic.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.BusinessLogicsContracts +{ + public interface ICustomerLogic + { + List? ReadList(CustomerSearchModel? model); + CustomerViewModel? ReadElement(CustomerSearchModel model); + bool Create(CustomerBindingModel model); + bool Update(CustomerBindingModel model); + bool Delete(CustomerBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IHotelLogic.cs b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IHotelLogic.cs new file mode 100644 index 0000000..9327f06 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IHotelLogic.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.BusinessLogicsContracts +{ + public interface IHotelLogic + { + List? ReadList(HotelSearchModel? model); + HotelViewModel? ReadElement(HotelSearchModel model); + bool Create(HotelBindingModel model); + bool Update(HotelBindingModel model); + bool Delete(HotelBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IMedicalInsuranceLogic.cs b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IMedicalInsuranceLogic.cs new file mode 100644 index 0000000..75a7e5c --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IMedicalInsuranceLogic.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.BusinessLogicsContracts +{ + public interface IMedicalInsuranceLogic + { + List? ReadList(MedicalInsuranceSearchModel? model); + MedicalInsuranceViewModel? ReadElement(MedicalInsuranceSearchModel model); + bool Create(MedicalInsuranceBindingModel model); + bool Update(MedicalInsuranceBindingModel model); + bool Delete(MedicalInsuranceBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IReportLogic.cs b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IReportLogic.cs new file mode 100644 index 0000000..0da7018 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/IReportLogic.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; + +namespace TravelAgencyCompanyContracts.BusinessLogicsContracts +{ + public interface IReportLogic + { + List GetStructures(ReportBindingModel model); + void SaveStructuresToWordFile(ReportBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ITourLogic.cs b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ITourLogic.cs new file mode 100644 index 0000000..ba8293d --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ITourLogic.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.BusinessLogicsContracts +{ + public interface ITourLogic + { + List? ReadList(TourSearchModel? model); + TourViewModel? ReadElement(TourSearchModel model); + bool Create(TourBindingModel model); + bool Update(TourBindingModel model); + bool Delete(TourBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ITransportLogic.cs b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ITransportLogic.cs new file mode 100644 index 0000000..5e9646d --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/BusinessLogicsContracts/ITransportLogic.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.BusinessLogicsContracts +{ + public interface ITransportLogic + { + List? ReadList(TransportSearchModel? model); + TransportViewModel? ReadElement(TransportSearchModel model); + bool Create(TransportBindingModel model); + bool Update(TransportBindingModel model); + bool Delete(TransportBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/SearchModel/CustomerSearchModel.cs b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/CustomerSearchModel.cs new file mode 100644 index 0000000..67220dd --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/CustomerSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelAgencyCompanyContracts.SearchModel +{ + public class CustomerSearchModel + { + public int? Id { get; set; } + public string? Fio { get; set; } + public string? PhoneNumber { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/SearchModel/HotelSearchModel.cs b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/HotelSearchModel.cs new file mode 100644 index 0000000..eb2789b --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/HotelSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelAgencyCompanyContracts.SearchModel +{ + public class HotelSearchModel + { + public int? Id { get; set; } + public string? Name { get;set; } + public int? NumberStars { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/SearchModel/MedicalInsuranceSearchModel.cs b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/MedicalInsuranceSearchModel.cs new file mode 100644 index 0000000..05ca636 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/MedicalInsuranceSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelAgencyCompanyContracts.SearchModel +{ + public class MedicalInsuranceSearchModel + { + public int? Id { get; set; } + public string? Type { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/SearchModel/TourSearchModel.cs b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/TourSearchModel.cs new file mode 100644 index 0000000..e39a295 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/TourSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelAgencyCompanyContracts.SearchModel +{ + public class TourSearchModel + { + public int? Id { get; set; } + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/SearchModel/TransportSearchModel.cs b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/TransportSearchModel.cs new file mode 100644 index 0000000..e79e865 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/SearchModel/TransportSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TravelAgencyCompanyContracts.SearchModel +{ + public class TransportSearchModel + { + public int? Id { get; set; } + public string? Type { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ICustomerStorage.cs b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ICustomerStorage.cs new file mode 100644 index 0000000..031b41d --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ICustomerStorage.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.StoragesContracts +{ + public interface ICustomerStorage + { + List GetFullList(); + List GetFilteredList(CustomerSearchModel model); + CustomerViewModel? GetElement(CustomerSearchModel model); + CustomerViewModel? Insert(CustomerBindingModel model); + CustomerViewModel? Update(CustomerBindingModel model); + CustomerViewModel? Delete(CustomerBindingModel model); + + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/IHotelStorage.cs b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/IHotelStorage.cs new file mode 100644 index 0000000..eb21332 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/IHotelStorage.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.StoragesContracts +{ + public interface IHotelStorage + { + List GetFullList(); + List GetFilteredList(HotelSearchModel model); + HotelViewModel? GetElement(HotelSearchModel model); + HotelViewModel? Insert(HotelBindingModel model); + HotelViewModel? Update(HotelBindingModel model); + HotelViewModel? Delete(HotelBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/IMedicalInsuranceStorage.cs b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/IMedicalInsuranceStorage.cs new file mode 100644 index 0000000..0d09a5a --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/IMedicalInsuranceStorage.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.StoragesContracts +{ + public interface IMedicalInsuranceStorage + { + List GetFullList(); + List GetFilteredList(MedicalInsuranceSearchModel model); + MedicalInsuranceViewModel? GetElement(MedicalInsuranceSearchModel model); + MedicalInsuranceViewModel? Insert(MedicalInsuranceBindingModel model); + MedicalInsuranceViewModel? Update(MedicalInsuranceBindingModel model); + MedicalInsuranceViewModel? Delete(MedicalInsuranceBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ITourStorage.cs b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ITourStorage.cs new file mode 100644 index 0000000..fa1aae5 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ITourStorage.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.StoragesContracts +{ + public interface ITourStorage + { + List GetFullList(); + List GetFilteredList(TourSearchModel model); + TourViewModel? GetElement(TourSearchModel model); + TourViewModel? Insert(TourBindingModel model); + TourViewModel? Update(TourBindingModel model); + TourViewModel? Delete(TourBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ITransportStorage.cs b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ITransportStorage.cs new file mode 100644 index 0000000..cdd7832 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/StoragesContracts/ITransportStorage.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyCompanyContracts.BindingModels; +using TravelAgencyCompanyContracts.SearchModel; +using TravelAgencyCompanyContracts.ViewModel; + +namespace TravelAgencyCompanyContracts.StoragesContracts +{ + public interface ITransportStorage + { + List GetFullList(); + List GetFilteredList(TransportSearchModel model); + TransportViewModel? GetElement(TransportSearchModel model); + TransportViewModel? Insert(TransportBindingModel model); + TransportViewModel? Update(TransportBindingModel model); + TransportViewModel? Delete(TransportBindingModel model); + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/TravelAgencyCompanyContracts.csproj b/TravelAgency/TravelAgencyCompanyContracts/TravelAgencyCompanyContracts.csproj new file mode 100644 index 0000000..e1f34a5 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/TravelAgencyCompanyContracts.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/TravelAgency/TravelAgencyCompanyContracts/ViewModel/CustomerViewModel.cs b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/CustomerViewModel.cs new file mode 100644 index 0000000..9505315 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/CustomerViewModel.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.ViewModel +{ + public class CustomerViewModel:ICustomerModel + { + public int Id { get; set; } + + [DisplayName("ФИО")] + public string Fio { get; set; } = string.Empty; + + [DisplayName("Номер телефона")] + public string PhoneNumber { get; set; } = string.Empty; + + [DisplayName("Электронная почта")] + public string Email { get; set; } = string.Empty; + + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/ViewModel/HotelViewModel.cs b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/HotelViewModel.cs new file mode 100644 index 0000000..e23e11d --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/HotelViewModel.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.ViewModel +{ + public class HotelViewModel:IHotelModel + + { + public int Id { get; set; } + + [DisplayName("Название отеля")] + public string Name { get; set; } = string.Empty; + [DisplayName("Адрес")] + public string Address { get; set; } = string.Empty; + + [DisplayName("Количество звёзд")] + public int NumberStars { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/ViewModel/MedicalInsuranceViewModel.cs b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/MedicalInsuranceViewModel.cs new file mode 100644 index 0000000..42a6249 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/MedicalInsuranceViewModel.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.ViewModel +{ + public class MedicalInsuranceViewModel:IMedicalInsuranceModel + { + public int Id { get; set; } + + [DisplayName("Тип страховки")] + public string Type { get; set; } = string.Empty; + [DisplayName("Стоимость страховки")] + public int Sum { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/ViewModel/ReportTourViewModel.cs b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/ReportTourViewModel.cs new file mode 100644 index 0000000..30735fa --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/ReportTourViewModel.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Enums; + +namespace TravelAgencyCompanyContracts.ViewModel +{ + public class ReportTourViewModel + { + public int Id { get; set; } + public DateTime DateCreate { get; set; } + public int CustomerId { get; set; } + public int HotelId { get; set; } + public int TransportId { get; set; } + public int InsuranceId { get; set; } + + [DisplayName("Пункт отправления")] + public string FromPlace { get; set; } = string.Empty; + + [DisplayName("Пункт прибытия")] + public string ToPlace { get; set; } = string.Empty; + + [DisplayName("Количество ночей")] + public int CountNight { get; set; } + [DisplayName("Статус")] + public StructureStatus Status { get; set; } = StructureStatus.Неизвестен; + + [DisplayName("Дата начала работ")] + public DateTime DepartureDate { get; set; } = DateTime.Now; + + [DisplayName("Дата окончания работ")] + public DateTime? ArrivalDate { get; set; } + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/ViewModel/TourViewModel.cs b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/TourViewModel.cs new file mode 100644 index 0000000..e2a5860 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/TourViewModel.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Enums; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.ViewModel +{ + public class TourViewModel:ITourModel + { + public int Id { get; set; } + public int CustomerId { get; set; } + public int HotelId { get; set; } + public int TransportId { get; set; } + public int InsuranceId { get; set; } + + [DisplayName("Пункт отправления")] + public string FromPlace { get; set; } = string.Empty; + + [DisplayName("Пункт прибытия")] + public string ToPlace { get; set; } = string.Empty; + + [DisplayName("Количество ночей")] + public int CountNight { get; set; } + [DisplayName("Статус")] + public StructureStatus Status { get; set; } = StructureStatus.Неизвестен; + + [DisplayName("Дата начала работ")] + public DateTime DepartureDate { get; set; } = DateTime.Now; + + [DisplayName("Дата окончания работ")] + public DateTime? ArrivalDate { get; set; } + + } +} diff --git a/TravelAgency/TravelAgencyCompanyContracts/ViewModel/TransportViewModel.cs b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/TransportViewModel.cs new file mode 100644 index 0000000..2c8bee5 --- /dev/null +++ b/TravelAgency/TravelAgencyCompanyContracts/ViewModel/TransportViewModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TravelAgencyDataModels.Models; + +namespace TravelAgencyCompanyContracts.ViewModel +{ + public class TransportViewModel:ITransportModel + { + public int Id { get; set; } + [DisplayName("Вид транспорта")] + public string Type { get; set; } = string.Empty; + [DisplayName("Номер транспорта")] + public string Number { get; set; } = string.Empty; + } +} diff --git a/TravelAgency/TravelAgencyDataModels/Models/ICustomerModel.cs b/TravelAgency/TravelAgencyDataModels/Models/ICustomerModel.cs index 956951d..5269f6e 100644 --- a/TravelAgency/TravelAgencyDataModels/Models/ICustomerModel.cs +++ b/TravelAgency/TravelAgencyDataModels/Models/ICustomerModel.cs @@ -4,7 +4,7 @@ { string Fio { get; } string PhoneNumber { get; } - string PassportNumber { get; } + string Email { get; } } } diff --git a/TravelAgency/TravelAgencyDataModels/Models/IHotel.cs b/TravelAgency/TravelAgencyDataModels/Models/IHotelModel.cs similarity index 88% rename from TravelAgency/TravelAgencyDataModels/Models/IHotel.cs rename to TravelAgency/TravelAgencyDataModels/Models/IHotelModel.cs index 50d2dd2..7e5e027 100644 --- a/TravelAgency/TravelAgencyDataModels/Models/IHotel.cs +++ b/TravelAgency/TravelAgencyDataModels/Models/IHotelModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace TravelAgencyDataModels.Models { - public interface IHotel:IId + public interface IHotelModel:IId { string Name { get; } string Address { get; } diff --git a/TravelAgency/TravelAgencyDataModels/Models/IMedicalInsurance.cs b/TravelAgency/TravelAgencyDataModels/Models/IMedicalInsuranceModel.cs similarity index 83% rename from TravelAgency/TravelAgencyDataModels/Models/IMedicalInsurance.cs rename to TravelAgency/TravelAgencyDataModels/Models/IMedicalInsuranceModel.cs index 39ab220..bdbd621 100644 --- a/TravelAgency/TravelAgencyDataModels/Models/IMedicalInsurance.cs +++ b/TravelAgency/TravelAgencyDataModels/Models/IMedicalInsuranceModel.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace TravelAgencyDataModels.Models { - public interface IMedicalInsurance : IId + public interface IMedicalInsuranceModel : IId { string Type { get; } int Sum { get; } diff --git a/TravelAgency/TravelAgencyDataModels/Models/ITour.cs b/TravelAgency/TravelAgencyDataModels/Models/ITourModel.cs similarity index 82% rename from TravelAgency/TravelAgencyDataModels/Models/ITour.cs rename to TravelAgency/TravelAgencyDataModels/Models/ITourModel.cs index cb52067..9e7b21d 100644 --- a/TravelAgency/TravelAgencyDataModels/Models/ITour.cs +++ b/TravelAgency/TravelAgencyDataModels/Models/ITourModel.cs @@ -7,12 +7,14 @@ using TravelAgencyDataModels.Enums; namespace TravelAgencyDataModels.Models { - public interface ITour:IId + public interface ITourModel:IId { int CustomerId { get; } int HotelId { get; } int TransportId { get; } int InsuranceId { get; } + string FromPlace { get; } + string ToPlace { get; } int CountNight { get; } StructureStatus Status { get; } DateTime DepartureDate { get; } diff --git a/TravelAgency/TravelAgencyDataModels/Models/ITransport.cs b/TravelAgency/TravelAgencyDataModels/Models/ITransportModel.cs similarity index 84% rename from TravelAgency/TravelAgencyDataModels/Models/ITransport.cs rename to TravelAgency/TravelAgencyDataModels/Models/ITransportModel.cs index b4435e3..6cba9b7 100644 --- a/TravelAgency/TravelAgencyDataModels/Models/ITransport.cs +++ b/TravelAgency/TravelAgencyDataModels/Models/ITransportModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace TravelAgencyDataModels.Models { - public interface ITransport: IId + public interface ITransportModel: IId { string Type { get; } string Number { get; }