diff --git a/Car_Centre/CarCentreContracts/BindingModels/ClientBindingModel.cs b/Car_Centre/CarCentreContracts/BindingModels/ClientBindingModel.cs new file mode 100644 index 0000000..3dfe611 --- /dev/null +++ b/Car_Centre/CarCentreContracts/BindingModels/ClientBindingModel.cs @@ -0,0 +1,17 @@ +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BindingModels +{ + public class ClientBindingModel : IClientModel + { + public int Id { get; set; } + public string ClientFIO { get; set; } = string.Empty; + public string EMail { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; + } +} diff --git a/Car_Centre/CarCentreContracts/BindingModels/EmployeeBindingModel.cs b/Car_Centre/CarCentreContracts/BindingModels/EmployeeBindingModel.cs new file mode 100644 index 0000000..1538c96 --- /dev/null +++ b/Car_Centre/CarCentreContracts/BindingModels/EmployeeBindingModel.cs @@ -0,0 +1,18 @@ +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BindingModels +{ + public class EmployeeBindingModel : IEmployeeModel + { + public int Id { get; set; } + public string EmployeeFIO { get; set; } = string.Empty; + public string Login { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; + + } +} diff --git a/Car_Centre/CarCentreContracts/BindingModels/PaymentBindingModel.cs b/Car_Centre/CarCentreContracts/BindingModels/PaymentBindingModel.cs new file mode 100644 index 0000000..fbf8422 --- /dev/null +++ b/Car_Centre/CarCentreContracts/BindingModels/PaymentBindingModel.cs @@ -0,0 +1,19 @@ +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BindingModels +{ + public class PaymentBindingModel : IPaymentModel + { + public int Id { get; set; } + public int PaySum { get; set; } + public DateTime? DateOfPayment { get; set; } = DateTime.Now; + public int RequestID { get; set; } + public int Auto { get; set; } + public object RequestWorkId { get; set; } + } +} diff --git a/Car_Centre/CarCentreContracts/BindingModels/RequestBindingModel.cs b/Car_Centre/CarCentreContracts/BindingModels/RequestBindingModel.cs new file mode 100644 index 0000000..df4ed9c --- /dev/null +++ b/Car_Centre/CarCentreContracts/BindingModels/RequestBindingModel.cs @@ -0,0 +1,26 @@ +using CarCentreDataModels.Enums; +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BindingModels +{ + public class RequestBindingModel + { + public int Id { get; set; } + public int ClientId { get; set; } + public string RequestName { get; set; } = string.Empty; + public double RequestPrice { get; set; } + public RequestStatus Status { get; set; } = RequestStatus.Неоплачен; + public DateTime DateStart { get; set; } + public DateTime DateFinish { get; set; } + public Dictionary RequestWork + { + get; + set; + } = new(); + } +} diff --git a/Car_Centre/CarCentreContracts/BindingModels/WorkBindingModel.cs b/Car_Centre/CarCentreContracts/BindingModels/WorkBindingModel.cs new file mode 100644 index 0000000..cdb81fd --- /dev/null +++ b/Car_Centre/CarCentreContracts/BindingModels/WorkBindingModel.cs @@ -0,0 +1,16 @@ +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BindingModels +{ + public class WorkBindingModel : IAutoModel + { + public int Id { get; set; } + public string AutoName { get; set; } = string.Empty; + public double AutoPrice { get; set; } + } +} diff --git a/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IAutoLogic.cs b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IAutoLogic.cs new file mode 100644 index 0000000..ce3a0cf --- /dev/null +++ b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IAutoLogic.cs @@ -0,0 +1,20 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BusinessLogicsContracts +{ + public interface IAutoLogic + { + List? ReadList(AutoSearchModel? model); + AutoViewModel? ReadElement(AutoSearchModel model); + bool Create(WorkBindingModel model); + bool Update(WorkBindingModel model); + bool Delete(WorkBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IClientLogic.cs b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IClientLogic.cs new file mode 100644 index 0000000..64a2103 --- /dev/null +++ b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IClientLogic.cs @@ -0,0 +1,20 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BusinessLogicsContracts +{ + public interface IClientLogic + { + List? ReadList(ClientSearchModel? model); + ClientViewModel? ReadElement(ClientSearchModel model); + bool Create(ClientBindingModel model); + bool Update(ClientBindingModel model); + bool Delete(ClientBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IEmployeeLogic.cs b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IEmployeeLogic.cs new file mode 100644 index 0000000..1260d8c --- /dev/null +++ b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IEmployeeLogic.cs @@ -0,0 +1,20 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BusinessLogicsContracts +{ + public interface IEmployeeLogic + { + List? ReadList(EmployeeSearchModel? model); + EmployeeViewModel? ReadElement(EmployeeSearchModel model); + bool Create(EmployeeBindingModel model); + bool Update(EmployeeBindingModel model); + bool Delete(EmployeeBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IPaymentLogic.cs b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IPaymentLogic.cs new file mode 100644 index 0000000..bae4e09 --- /dev/null +++ b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IPaymentLogic.cs @@ -0,0 +1,21 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BusinessLogicsContracts +{ + public interface IPaymentLogic + { + List? ReadList(PaymentSearchModel? model); + PaymentViewModel? ReadElement(PaymentSearchModel model); + bool Create(PaymentBindingModel model); + bool Update(PaymentBindingModel model); + bool Delete(PaymentBindingModel model); + + } +} diff --git a/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IRequestLogic.cs b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IRequestLogic.cs new file mode 100644 index 0000000..87fc71b --- /dev/null +++ b/Car_Centre/CarCentreContracts/BusinessLogicsContracts/IRequestLogic.cs @@ -0,0 +1,20 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using CarCentreDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.BusinessLogicsContracts +{ + public interface IRequestLogic + { + List? ReadList(RequestSearchModel? model); + bool Create(RequestBindingModel model); + bool CheckRequestPay(RequestBindingModel model, RequestStatus status); + bool RequestWasPaid(RequestBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/CarCentreContracts.csproj b/Car_Centre/CarCentreContracts/CarCentreContracts.csproj new file mode 100644 index 0000000..6407a88 --- /dev/null +++ b/Car_Centre/CarCentreContracts/CarCentreContracts.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/Car_Centre/CarCentreContracts/Class1.cs b/Car_Centre/CarCentreContracts/Class1.cs new file mode 100644 index 0000000..dc6478d --- /dev/null +++ b/Car_Centre/CarCentreContracts/Class1.cs @@ -0,0 +1,7 @@ +namespace CarCentreContracts +{ + public class Class1 + { + + } +} diff --git a/Car_Centre/CarCentreContracts/SearchModels/AutoSearchModel.cs b/Car_Centre/CarCentreContracts/SearchModels/AutoSearchModel.cs new file mode 100644 index 0000000..cb114dd --- /dev/null +++ b/Car_Centre/CarCentreContracts/SearchModels/AutoSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.SearchModels +{ + public class AutoSearchModel + { + public int? Id { get; set; } + public string? AutoName { get; set; } + } +} diff --git a/Car_Centre/CarCentreContracts/SearchModels/ClientSearchModel.cs b/Car_Centre/CarCentreContracts/SearchModels/ClientSearchModel.cs new file mode 100644 index 0000000..a3add95 --- /dev/null +++ b/Car_Centre/CarCentreContracts/SearchModels/ClientSearchModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.SearchModels +{ + public class ClientSearchModel + { + public int? Id { get; set; } + + public string? ClientFIO { get; set; } + + public string? Email { get; set; } + + public string? Password { get; set; } + } +} diff --git a/Car_Centre/CarCentreContracts/SearchModels/EmployeeSearchModel.cs b/Car_Centre/CarCentreContracts/SearchModels/EmployeeSearchModel.cs new file mode 100644 index 0000000..ec1d216 --- /dev/null +++ b/Car_Centre/CarCentreContracts/SearchModels/EmployeeSearchModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.SearchModels +{ + public class EmployeeSearchModel + { + public int? Id { get; set; } + public string? EmployeeFIO { get; set; } + public string Login { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; + } +} diff --git a/Car_Centre/CarCentreContracts/SearchModels/PaymentSearchModel.cs b/Car_Centre/CarCentreContracts/SearchModels/PaymentSearchModel.cs new file mode 100644 index 0000000..06aa676 --- /dev/null +++ b/Car_Centre/CarCentreContracts/SearchModels/PaymentSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.SearchModels +{ + public class PaymentSearchModel + { + public int? Id { get; set; } + public int? AutoID { get; set; } + } +} diff --git a/Car_Centre/CarCentreContracts/SearchModels/RequestSearchModel.cs b/Car_Centre/CarCentreContracts/SearchModels/RequestSearchModel.cs new file mode 100644 index 0000000..c158496 --- /dev/null +++ b/Car_Centre/CarCentreContracts/SearchModels/RequestSearchModel.cs @@ -0,0 +1,20 @@ +using CarCentreDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.SearchModels +{ + public class RequestSearchModel + { + public int? Id { get; set; } + public int? ClientId { get; set; } + public string? RequestName { get; set; } = string.Empty; + public double? RequestPrice { get; set; } + public RequestStatus Status { get; set; } = RequestStatus.Неоплачен; + public DateTime? DateStart { get; set; } + public DateTime? DateFinish { get; set; } + } +} diff --git a/Car_Centre/CarCentreContracts/StorageContracts/IAutoStorage.cs b/Car_Centre/CarCentreContracts/StorageContracts/IAutoStorage.cs new file mode 100644 index 0000000..2354ea6 --- /dev/null +++ b/Car_Centre/CarCentreContracts/StorageContracts/IAutoStorage.cs @@ -0,0 +1,21 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.StorageContracts +{ + public interface IAutoStorage + { + List GetFullList(); + List GetFilteredList(AutoSearchModel model); + AutoViewModel? GetElement(AutoSearchModel model); + AutoViewModel? Insert(WorkBindingModel model); + AutoViewModel? Update(WorkBindingModel model); + AutoViewModel? Delete(WorkBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/StorageContracts/IClientStorage.cs b/Car_Centre/CarCentreContracts/StorageContracts/IClientStorage.cs new file mode 100644 index 0000000..c1597e3 --- /dev/null +++ b/Car_Centre/CarCentreContracts/StorageContracts/IClientStorage.cs @@ -0,0 +1,21 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.StorageContracts +{ + public interface IClientStorage + { + List GetFullList(); + List GetFilteredList(ClientSearchModel model); + ClientViewModel? GetElement(ClientSearchModel model); + ClientViewModel? Insert(ClientBindingModel model); + ClientViewModel? Update(ClientBindingModel model); + ClientViewModel? Delete(ClientBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/StorageContracts/IEmployeeStorage.cs b/Car_Centre/CarCentreContracts/StorageContracts/IEmployeeStorage.cs new file mode 100644 index 0000000..03166bf --- /dev/null +++ b/Car_Centre/CarCentreContracts/StorageContracts/IEmployeeStorage.cs @@ -0,0 +1,21 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.StorageContracts +{ + public interface IEmployeeStorage + { + List GetFullList(); + List GetFilteredList(EmployeeSearchModel model); + EmployeeViewModel? GetElement(EmployeeSearchModel model); + EmployeeViewModel? Insert(EmployeeBindingModel model); + EmployeeViewModel? Update(EmployeeBindingModel model); + EmployeeViewModel? Delete(EmployeeBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/StorageContracts/IPaymentStorage.cs b/Car_Centre/CarCentreContracts/StorageContracts/IPaymentStorage.cs new file mode 100644 index 0000000..38828c7 --- /dev/null +++ b/Car_Centre/CarCentreContracts/StorageContracts/IPaymentStorage.cs @@ -0,0 +1,21 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.StorageContracts +{ + public interface IPaymentStorage + { + List GetFullList(); + List GetFilteredList(PaymentSearchModel model); + PaymentViewModel GetElement(PaymentSearchModel model); + PaymentViewModel? Insert(PaymentBindingModel model); + PaymentViewModel? Update(PaymentBindingModel model); + PaymentViewModel? Delete(PaymentBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/StorageContracts/IRequestStorage.cs b/Car_Centre/CarCentreContracts/StorageContracts/IRequestStorage.cs new file mode 100644 index 0000000..d911880 --- /dev/null +++ b/Car_Centre/CarCentreContracts/StorageContracts/IRequestStorage.cs @@ -0,0 +1,21 @@ +using CarCentreContracts.BindingModels; +using CarCentreContracts.SearchModels; +using CarCentreContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.StorageContracts +{ + public interface IRequestStorage + { + List GetFullList(); + List GetFilteredList(RequestSearchModel model); + RequestViewModel? GetElement(RequestSearchModel model); + RequestViewModel? Insert(RequestBindingModel model); + RequestViewModel? Update(RequestBindingModel model); + RequestViewModel? Delete(RequestBindingModel model); + } +} diff --git a/Car_Centre/CarCentreContracts/ViewModels/AutoViewModel.cs b/Car_Centre/CarCentreContracts/ViewModels/AutoViewModel.cs new file mode 100644 index 0000000..a18d2f6 --- /dev/null +++ b/Car_Centre/CarCentreContracts/ViewModels/AutoViewModel.cs @@ -0,0 +1,19 @@ +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.ViewModels +{ + public class AutoViewModel : IAutoModel + { + public int Id { get; set; } + [DisplayName("Название Автомобиля")] + public string AutoName { get; set; } = string.Empty; + [DisplayName("Стоимость ")] + public double AutoPrice { get; set; } + } +} diff --git a/Car_Centre/CarCentreContracts/ViewModels/ClientViewModel.cs b/Car_Centre/CarCentreContracts/ViewModels/ClientViewModel.cs new file mode 100644 index 0000000..c19fcd4 --- /dev/null +++ b/Car_Centre/CarCentreContracts/ViewModels/ClientViewModel.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.ViewModels +{ + public class ClientViewModel + { + public int Id { get; set; } + [DisplayName("ФИО клиента")] + public string ClientFIO { get; set; } = string.Empty; + [DisplayName("Email клиента")] + public string Email { get; set; } = string.Empty; + [DisplayName("Пароль клиента")] + public string Password { get; set; } = string.Empty; + + } +} diff --git a/Car_Centre/CarCentreContracts/ViewModels/EmployeeViewModel.cs b/Car_Centre/CarCentreContracts/ViewModels/EmployeeViewModel.cs new file mode 100644 index 0000000..51f2f0b --- /dev/null +++ b/Car_Centre/CarCentreContracts/ViewModels/EmployeeViewModel.cs @@ -0,0 +1,22 @@ +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.ViewModels +{ + public class EmployeeViewModel : IEmployeeModel + { + public int Id { get; set; } + [DisplayName("ФИО сотрудника")] + public string EmployeeFIO { get; set; } = string.Empty; + [DisplayName("Логин сотрудника")] + public string Login { get; set; } = string.Empty; + [DisplayName("Пароль сотрудника")] + public string Password { get; set; } = string.Empty; + + } +} diff --git a/Car_Centre/CarCentreContracts/ViewModels/PaymentViewModel.cs b/Car_Centre/CarCentreContracts/ViewModels/PaymentViewModel.cs new file mode 100644 index 0000000..dbe3f4a --- /dev/null +++ b/Car_Centre/CarCentreContracts/ViewModels/PaymentViewModel.cs @@ -0,0 +1,20 @@ +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.ViewModels +{ + public class PaymentViewModel : IPaymentModel + { + public int Id { get; set; } + public int PaySum { get; set; } + public int Auto { get; set; } + public DateTime? DateOfPayment { get; set; } + public int RequestID { get; set; } + public int RequestWorks { get; set; } + + } +} diff --git a/Car_Centre/CarCentreContracts/ViewModels/RequestViewModel.cs b/Car_Centre/CarCentreContracts/ViewModels/RequestViewModel.cs new file mode 100644 index 0000000..1135b6b --- /dev/null +++ b/Car_Centre/CarCentreContracts/ViewModels/RequestViewModel.cs @@ -0,0 +1,36 @@ +using CarCentreDataModels.Enums; +using CarCentreDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreContracts.ViewModels +{ + public class RequestViewModel + { + [DisplayName("Номер")] + public int Id { get; set; } + public int ClientId { get; set; } + [DisplayName("ФИО клиента")] + public string ClientFIO { get; set; } = string.Empty; + + [DisplayName("Название сделки")] + public string RequestName { get; set; } = string.Empty; + [DisplayName("Стоимость сделки")] + public double RequestPrice { get; set; } + [DisplayName("Статус")] + public RequestStatus Status { get; set; } = RequestStatus.Неоплачен; + [DisplayName("Дата начала")] + public DateTime DateStart { get; set; } + [DisplayName("Дата окончания")] + public DateTime DateFinish { get; set; } + public Dictionary Works + { + get; + set; + } = new(); + } +} diff --git a/Car_Centre/Car_Centre/Car_Centre.csproj b/Car_Centre/CarCentreDataModels/CarCentreDataModels.csproj similarity index 51% rename from Car_Centre/Car_Centre/Car_Centre.csproj rename to Car_Centre/CarCentreDataModels/CarCentreDataModels.csproj index 663fdb8..27ac386 100644 --- a/Car_Centre/Car_Centre/Car_Centre.csproj +++ b/Car_Centre/CarCentreDataModels/CarCentreDataModels.csproj @@ -1,11 +1,9 @@  - WinExe - net8.0-windows - enable - true + net6.0 enable + enable - \ No newline at end of file + diff --git a/Car_Centre/CarCentreDataModels/Class1.cs b/Car_Centre/CarCentreDataModels/Class1.cs new file mode 100644 index 0000000..716035e --- /dev/null +++ b/Car_Centre/CarCentreDataModels/Class1.cs @@ -0,0 +1,7 @@ +namespace CarCentreDataModels +{ + public class Class1 + { + + } +} diff --git a/Car_Centre/CarCentreDataModels/Enums/RequestStatus.cs b/Car_Centre/CarCentreDataModels/Enums/RequestStatus.cs new file mode 100644 index 0000000..8ac3067 --- /dev/null +++ b/Car_Centre/CarCentreDataModels/Enums/RequestStatus.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreDataModels.Enums +{ + public enum RequestStatus + { + Неоплачен = -1, + Неполностью = 0, + Оплачен = 1 + } +} diff --git a/Car_Centre/CarCentreDataModels/IId.cs b/Car_Centre/CarCentreDataModels/IId.cs new file mode 100644 index 0000000..856f19f --- /dev/null +++ b/Car_Centre/CarCentreDataModels/IId.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreDataModels +{ + public interface IId + { + int Id { get; } + } +} diff --git a/Car_Centre/CarCentreDataModels/Models/IAutoModel.cs b/Car_Centre/CarCentreDataModels/Models/IAutoModel.cs new file mode 100644 index 0000000..3ce102b --- /dev/null +++ b/Car_Centre/CarCentreDataModels/Models/IAutoModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreDataModels.Models +{ + public interface IAutoModel : IId + { + string AutoName { get; } + double AutoPrice { get; } + + } +} diff --git a/Car_Centre/CarCentreDataModels/Models/IClientModel.cs b/Car_Centre/CarCentreDataModels/Models/IClientModel.cs new file mode 100644 index 0000000..4c6ef35 --- /dev/null +++ b/Car_Centre/CarCentreDataModels/Models/IClientModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreDataModels.Models +{ + public interface IClientModel : IId + { + string ClientFIO { get; } + string EMail { get; } + string Password { get; } + } +} diff --git a/Car_Centre/CarCentreDataModels/Models/IEmployeeModel.cs b/Car_Centre/CarCentreDataModels/Models/IEmployeeModel.cs new file mode 100644 index 0000000..27714b4 --- /dev/null +++ b/Car_Centre/CarCentreDataModels/Models/IEmployeeModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreDataModels.Models +{ + public interface IEmployeeModel : IId + { + string EmployeeFIO { get; } + string Login { get; } + string Password { get; } + } +} diff --git a/Car_Centre/CarCentreDataModels/Models/IPaymentModel.cs b/Car_Centre/CarCentreDataModels/Models/IPaymentModel.cs new file mode 100644 index 0000000..c40fcaa --- /dev/null +++ b/Car_Centre/CarCentreDataModels/Models/IPaymentModel.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreDataModels.Models +{ + /// + /// Оплата + /// + public interface IPaymentModel : IId + { + /// + /// Оплаченная сумма + /// + public int PaySum { get; } + /// + /// Дата платежа + /// + public DateTime? DateOfPayment { get; } + /// + /// Id занятия + /// + public int RequestID { get; } + /// + /// Остатки + /// + public int Auto { get; } + + } + +} diff --git a/Car_Centre/CarCentreDataModels/Models/IRequestModel.cs b/Car_Centre/CarCentreDataModels/Models/IRequestModel.cs new file mode 100644 index 0000000..77818f8 --- /dev/null +++ b/Car_Centre/CarCentreDataModels/Models/IRequestModel.cs @@ -0,0 +1,20 @@ +using CarCentreDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarCentreDataModels.Models +{ + public interface IRequestModel + { + int ClientId { get; } + string RequestName { get; } + double RequestPrice { get; } + RequestStatus Status { get; } + DateTime DateStart { get; } + DateTime DateFinish { get; } + Dictionary RequestWorks { get; } + } +} diff --git a/Car_Centre/Car_Centre.sln b/Car_Centre/Car_Centre.sln index 4b31405..bffa55a 100644 --- a/Car_Centre/Car_Centre.sln +++ b/Car_Centre/Car_Centre.sln @@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Car_Centre", "Car_Centre\Car_Centre.csproj", "{DA05731B-065E-4E50-A864-5E2B887EB100}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarCentreDataModels", "CarCentreDataModels\CarCentreDataModels.csproj", "{44ABE0E6-CF7F-4401-8264-CA9278EEE541}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarCentreContracts", "CarCentreContracts\CarCentreContracts.csproj", "{C7B3BF74-07D4-4C4B-948D-EC87F53FC3B3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +13,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA05731B-065E-4E50-A864-5E2B887EB100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA05731B-065E-4E50-A864-5E2B887EB100}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA05731B-065E-4E50-A864-5E2B887EB100}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA05731B-065E-4E50-A864-5E2B887EB100}.Release|Any CPU.Build.0 = Release|Any CPU + {44ABE0E6-CF7F-4401-8264-CA9278EEE541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44ABE0E6-CF7F-4401-8264-CA9278EEE541}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44ABE0E6-CF7F-4401-8264-CA9278EEE541}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44ABE0E6-CF7F-4401-8264-CA9278EEE541}.Release|Any CPU.Build.0 = Release|Any CPU + {C7B3BF74-07D4-4C4B-948D-EC87F53FC3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C7B3BF74-07D4-4C4B-948D-EC87F53FC3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C7B3BF74-07D4-4C4B-948D-EC87F53FC3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C7B3BF74-07D4-4C4B-948D-EC87F53FC3B3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Car_Centre/Car_Centre/Form1.Designer.cs b/Car_Centre/Car_Centre/Form1.Designer.cs deleted file mode 100644 index 441ea3d..0000000 --- a/Car_Centre/Car_Centre/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace Car_Centre -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/Car_Centre/Car_Centre/Form1.cs b/Car_Centre/Car_Centre/Form1.cs deleted file mode 100644 index baa4337..0000000 --- a/Car_Centre/Car_Centre/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Car_Centre -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/Car_Centre/Car_Centre/Form1.resx b/Car_Centre/Car_Centre/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/Car_Centre/Car_Centre/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Car_Centre/Car_Centre/Program.cs b/Car_Centre/Car_Centre/Program.cs deleted file mode 100644 index c4811b8..0000000 --- a/Car_Centre/Car_Centre/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Car_Centre -{ - internal static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); - } - } -} \ No newline at end of file