From 868d6c5c1478178e639d0b8fe7e712b2d72963cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Wed, 17 Apr 2024 15:10:57 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B8=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/CarBindingModel.cs | 24 +++++++++++++++++ .../BindingModels/DefectBindingModel.cs | 23 ++++++++++++++++ .../BindingModels/ExecutorBindingModel.cs | 22 +++++++++++++++ .../TechnicalWorkBindingModel.cs | 23 ++++++++++++++++ .../BusinessLogicsContracts/ICarLogic.cs | 21 +++++++++++++++ .../BusinessLogicsContracts/IDefectLogic.cs | 21 +++++++++++++++ .../BusinessLogicsContracts/IExecutorLogic.cs | 21 +++++++++++++++ .../ITechnicalWorkLogic.cs | 21 +++++++++++++++ .../SearchModels/CarSearchModel.cs | 14 ++++++++++ .../SearchModels/DefectSearchModel.cs | 14 ++++++++++ .../SearchModels/ExecutorSearchModel.cs | 15 +++++++++++ .../SearchModels/TechnicalWorkSearchModel.cs | 14 ++++++++++ .../ServiceStationContracts.csproj | 6 +---- .../StoragesContracts/ICarStorage.cs | 22 +++++++++++++++ .../StoragesContracts/IDefectStorage.cs | 22 +++++++++++++++ .../StoragesContracts/IExecutorStorage.cs | 22 +++++++++++++++ .../ITechnicalWorkStorage.cs | 22 +++++++++++++++ .../ViewModels/CarViewModel.cs | 27 +++++++++++++++++++ .../ViewModels/DefectViewModel.cs | 25 +++++++++++++++++ .../ViewModels/ExecutorViewModel.cs | 23 ++++++++++++++++ .../ViewModels/TechnicalWorkViewModel.cs | 23 ++++++++++++++++ 21 files changed, 420 insertions(+), 5 deletions(-) create mode 100644 ServiceStation/ServiceStationContracts/BindingModels/CarBindingModel.cs create mode 100644 ServiceStation/ServiceStationContracts/BindingModels/DefectBindingModel.cs create mode 100644 ServiceStation/ServiceStationContracts/BindingModels/ExecutorBindingModel.cs create mode 100644 ServiceStation/ServiceStationContracts/BindingModels/TechnicalWorkBindingModel.cs create mode 100644 ServiceStation/ServiceStationContracts/BusinessLogicsContracts/ICarLogic.cs create mode 100644 ServiceStation/ServiceStationContracts/BusinessLogicsContracts/IDefectLogic.cs create mode 100644 ServiceStation/ServiceStationContracts/BusinessLogicsContracts/IExecutorLogic.cs create mode 100644 ServiceStation/ServiceStationContracts/BusinessLogicsContracts/ITechnicalWorkLogic.cs create mode 100644 ServiceStation/ServiceStationContracts/SearchModels/CarSearchModel.cs create mode 100644 ServiceStation/ServiceStationContracts/SearchModels/DefectSearchModel.cs create mode 100644 ServiceStation/ServiceStationContracts/SearchModels/ExecutorSearchModel.cs create mode 100644 ServiceStation/ServiceStationContracts/SearchModels/TechnicalWorkSearchModel.cs create mode 100644 ServiceStation/ServiceStationContracts/StoragesContracts/ICarStorage.cs create mode 100644 ServiceStation/ServiceStationContracts/StoragesContracts/IDefectStorage.cs create mode 100644 ServiceStation/ServiceStationContracts/StoragesContracts/IExecutorStorage.cs create mode 100644 ServiceStation/ServiceStationContracts/StoragesContracts/ITechnicalWorkStorage.cs create mode 100644 ServiceStation/ServiceStationContracts/ViewModels/CarViewModel.cs create mode 100644 ServiceStation/ServiceStationContracts/ViewModels/DefectViewModel.cs create mode 100644 ServiceStation/ServiceStationContracts/ViewModels/ExecutorViewModel.cs create mode 100644 ServiceStation/ServiceStationContracts/ViewModels/TechnicalWorkViewModel.cs diff --git a/ServiceStation/ServiceStationContracts/BindingModels/CarBindingModel.cs b/ServiceStation/ServiceStationContracts/BindingModels/CarBindingModel.cs new file mode 100644 index 0000000..5c8950b --- /dev/null +++ b/ServiceStation/ServiceStationContracts/BindingModels/CarBindingModel.cs @@ -0,0 +1,24 @@ +using ServiceStationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.BindingModels +{ + public class CarBindingModel : ICarModel + { + public int Id { get; set; } + + public string CarNumber { get; set; } = string.Empty; + + public string CarBrand { get; set; } = string.Empty; + + public int ExecutorId { get; set; } + + public Dictionary CarDefects { get; set; } = new(); + + public Dictionary CarTechnicalWorks { get; set; } = new(); + } +} diff --git a/ServiceStation/ServiceStationContracts/BindingModels/DefectBindingModel.cs b/ServiceStation/ServiceStationContracts/BindingModels/DefectBindingModel.cs new file mode 100644 index 0000000..7c1717d --- /dev/null +++ b/ServiceStation/ServiceStationContracts/BindingModels/DefectBindingModel.cs @@ -0,0 +1,23 @@ +using ServiceStationDataModels.Enums; +using ServiceStationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.BindingModels +{ + public class DefectBindingModel : IDefectModel + { + public int Id { get; set; } + + public string DefectType { get; set; } = string.Empty; + + public Status DefectStatus { get; set; } = Status.Неизвестен; + + public double DefectPrice { get; set; } + + public int ExecutorId { get; set; } + } +} diff --git a/ServiceStation/ServiceStationContracts/BindingModels/ExecutorBindingModel.cs b/ServiceStation/ServiceStationContracts/BindingModels/ExecutorBindingModel.cs new file mode 100644 index 0000000..08891f9 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/BindingModels/ExecutorBindingModel.cs @@ -0,0 +1,22 @@ +using ServiceStationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.BindingModels +{ + public class ExecutorBindingModel : IExecutorModel + { + public int Id { get; set; } + + public string ExecutorFIO { get; set; } = string.Empty; + + public string ExecutorEmail { get; set; } = string.Empty; + + public string ExecutorPassword { get; set; } = string.Empty; + + public string ExecutorNumber { get; set; } = string.Empty; + } +} diff --git a/ServiceStation/ServiceStationContracts/BindingModels/TechnicalWorkBindingModel.cs b/ServiceStation/ServiceStationContracts/BindingModels/TechnicalWorkBindingModel.cs new file mode 100644 index 0000000..c2e459e --- /dev/null +++ b/ServiceStation/ServiceStationContracts/BindingModels/TechnicalWorkBindingModel.cs @@ -0,0 +1,23 @@ +using ServiceStationDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.BindingModels +{ + public class TechnicalWorkBindingModel : ITechnicalWorkModel + { + public int Id { get; set; } + + public string WorkType { get; set; } = string.Empty; + + public DateTime DateLastWork { get; set; } = DateTime.Now; + + public double WorkPrice { get; set; } + + public int ExecutorId { get; set; } + + } +} diff --git a/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/ICarLogic.cs b/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/ICarLogic.cs new file mode 100644 index 0000000..6abc8a4 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/ICarLogic.cs @@ -0,0 +1,21 @@ +using ServiceStationContracts.BindingModels; +using ServiceStationContracts.SearchModels; +using ServiceStationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.BusinessLogicsContracts +{ + public interface ICarLogic + { + List? ReadList(CarSearchModel? model); + CarViewModel? ReadElement(CarSearchModel? model); + + bool Create(CarBindingModel model); + bool Update(CarBindingModel model); + bool Delete(CarBindingModel model); + } +} diff --git a/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/IDefectLogic.cs b/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/IDefectLogic.cs new file mode 100644 index 0000000..f6495e3 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/IDefectLogic.cs @@ -0,0 +1,21 @@ +using ServiceStationContracts.BindingModels; +using ServiceStationContracts.SearchModels; +using ServiceStationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.BusinessLogicsContracts +{ + public interface IDefectLogic + { + List? ReadList(DefectSearchModel? model); + DefectViewModel? ReadElement(DefectSearchModel? model); + + bool Create(DefectBindingModel model); + bool Update(DefectBindingModel model); + bool Delete(DefectBindingModel model); + } +} diff --git a/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/IExecutorLogic.cs b/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/IExecutorLogic.cs new file mode 100644 index 0000000..e032a52 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/IExecutorLogic.cs @@ -0,0 +1,21 @@ +using ServiceStationContracts.BindingModels; +using ServiceStationContracts.SearchModels; +using ServiceStationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.BusinessLogicsContracts +{ + public interface IExecutorLogic + { + List? ReadList(ExecutorSearchModel? model); + ExecutorViewModel? ReadElement(ExecutorSearchModel? model); + + bool Create(ExecutorBindingModel model); + bool Update(ExecutorBindingModel model); + bool Delete(ExecutorBindingModel model); + } +} diff --git a/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/ITechnicalWorkLogic.cs b/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/ITechnicalWorkLogic.cs new file mode 100644 index 0000000..a11ee7a --- /dev/null +++ b/ServiceStation/ServiceStationContracts/BusinessLogicsContracts/ITechnicalWorkLogic.cs @@ -0,0 +1,21 @@ +using ServiceStationContracts.BindingModels; +using ServiceStationContracts.SearchModels; +using ServiceStationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.BusinessLogicsContracts +{ + public interface ITechnicalWorkLogic + { + List? ReadList(TechnicalWorkSearchModel? model); + TechnicalWorkViewModel? ReadElement(TechnicalWorkSearchModel? model); + + bool Create(TechnicalWorkBindingModel model); + bool Update(TechnicalWorkBindingModel model); + bool Delete(TechnicalWorkBindingModel model); + } +} diff --git a/ServiceStation/ServiceStationContracts/SearchModels/CarSearchModel.cs b/ServiceStation/ServiceStationContracts/SearchModels/CarSearchModel.cs new file mode 100644 index 0000000..c9d28eb --- /dev/null +++ b/ServiceStation/ServiceStationContracts/SearchModels/CarSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.SearchModels +{ + public class CarSearchModel + { + public int? Id { get; set; } + public string? CarNumber { get; set; } + } +} diff --git a/ServiceStation/ServiceStationContracts/SearchModels/DefectSearchModel.cs b/ServiceStation/ServiceStationContracts/SearchModels/DefectSearchModel.cs new file mode 100644 index 0000000..e1edfdf --- /dev/null +++ b/ServiceStation/ServiceStationContracts/SearchModels/DefectSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.SearchModels +{ + public class DefectSearchModel + { + public int? Id { get; set; } + public string? DefectType { get; set; } + } +} diff --git a/ServiceStation/ServiceStationContracts/SearchModels/ExecutorSearchModel.cs b/ServiceStation/ServiceStationContracts/SearchModels/ExecutorSearchModel.cs new file mode 100644 index 0000000..e0d11b8 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/SearchModels/ExecutorSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.SearchModels +{ + public class ExecutorSearchModel + { + public int? Id { get; set; } + public string? ExecutorFIO { get; set; } + public string? ExecutorEmail { get; set; } + } +} diff --git a/ServiceStation/ServiceStationContracts/SearchModels/TechnicalWorkSearchModel.cs b/ServiceStation/ServiceStationContracts/SearchModels/TechnicalWorkSearchModel.cs new file mode 100644 index 0000000..732de0a --- /dev/null +++ b/ServiceStation/ServiceStationContracts/SearchModels/TechnicalWorkSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.SearchModels +{ + public class TechnicalWorkSearchModel + { + public int? Id { get; set; } + public string? WorkType { get; set; } + } +} diff --git a/ServiceStation/ServiceStationContracts/ServiceStationContracts.csproj b/ServiceStation/ServiceStationContracts/ServiceStationContracts.csproj index 38b0ca1..18fee99 100644 --- a/ServiceStation/ServiceStationContracts/ServiceStationContracts.csproj +++ b/ServiceStation/ServiceStationContracts/ServiceStationContracts.csproj @@ -7,11 +7,7 @@ - - - - - + diff --git a/ServiceStation/ServiceStationContracts/StoragesContracts/ICarStorage.cs b/ServiceStation/ServiceStationContracts/StoragesContracts/ICarStorage.cs new file mode 100644 index 0000000..cfc507e --- /dev/null +++ b/ServiceStation/ServiceStationContracts/StoragesContracts/ICarStorage.cs @@ -0,0 +1,22 @@ +using ServiceStationContracts.BindingModels; +using ServiceStationContracts.SearchModels; +using ServiceStationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.StoragesContracts +{ + public interface ICarStorage + { + List GetFullList(); + List GetFilteredList(CarSearchModel model); + + CarViewModel? GetElement(CarSearchModel model); + CarViewModel? Insert(CarBindingModel model); + CarViewModel? Update(CarBindingModel model); + CarViewModel? Delete(CarBindingModel model); + } +} diff --git a/ServiceStation/ServiceStationContracts/StoragesContracts/IDefectStorage.cs b/ServiceStation/ServiceStationContracts/StoragesContracts/IDefectStorage.cs new file mode 100644 index 0000000..7cb3757 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/StoragesContracts/IDefectStorage.cs @@ -0,0 +1,22 @@ +using ServiceStationContracts.BindingModels; +using ServiceStationContracts.SearchModels; +using ServiceStationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.StoragesContracts +{ + public interface IDefectStorage + { + List GetFullList(); + List GetFilteredList(DefectSearchModel model); + + DefectViewModel? GetElement(DefectSearchModel model); + DefectViewModel? Insert(DefectBindingModel model); + DefectViewModel? Update(DefectBindingModel model); + DefectViewModel? Delete(DefectBindingModel model); + } +} diff --git a/ServiceStation/ServiceStationContracts/StoragesContracts/IExecutorStorage.cs b/ServiceStation/ServiceStationContracts/StoragesContracts/IExecutorStorage.cs new file mode 100644 index 0000000..574652e --- /dev/null +++ b/ServiceStation/ServiceStationContracts/StoragesContracts/IExecutorStorage.cs @@ -0,0 +1,22 @@ +using ServiceStationContracts.BindingModels; +using ServiceStationContracts.SearchModels; +using ServiceStationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.StoragesContracts +{ + public interface IExecutorStorage + { + List GetFullList(); + List GetFilteredList(ExecutorSearchModel model); + + ExecutorViewModel? GetElement(ExecutorSearchModel model); + ExecutorViewModel? Insert(ExecutorBindingModel model); + ExecutorViewModel? Update(ExecutorBindingModel model); + ExecutorViewModel? Delete(ExecutorBindingModel model); + } +} diff --git a/ServiceStation/ServiceStationContracts/StoragesContracts/ITechnicalWorkStorage.cs b/ServiceStation/ServiceStationContracts/StoragesContracts/ITechnicalWorkStorage.cs new file mode 100644 index 0000000..7cd3a02 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/StoragesContracts/ITechnicalWorkStorage.cs @@ -0,0 +1,22 @@ +using ServiceStationContracts.BindingModels; +using ServiceStationContracts.SearchModels; +using ServiceStationContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.StoragesContracts +{ + public interface ITechnicalWorkStorage + { + List GetFullList(); + List GetFilteredList(TechnicalWorkSearchModel model); + + TechnicalWorkViewModel? GetElement(TechnicalWorkSearchModel model); + TechnicalWorkViewModel? Insert(TechnicalWorkBindingModel model); + TechnicalWorkViewModel? Update(TechnicalWorkBindingModel model); + TechnicalWorkViewModel? Delete(TechnicalWorkBindingModel model); + } +} diff --git a/ServiceStation/ServiceStationContracts/ViewModels/CarViewModel.cs b/ServiceStation/ServiceStationContracts/ViewModels/CarViewModel.cs new file mode 100644 index 0000000..de04054 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/ViewModels/CarViewModel.cs @@ -0,0 +1,27 @@ +using ServiceStationDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.ViewModels +{ + public class CarViewModel : ICarModel + { + public int Id { get; set; } + + [DisplayName("Номер машины")] + public string CarNumber { get; set; } = string.Empty; + + [DisplayName("Бренд машины")] + public string CarBrand { get; set; } = string.Empty; + + public int ExecutorId { get; set; } + + public Dictionary CarDefects { get; set; } = new(); + + public Dictionary CarTechnicalWorks { get; set; } = new(); + } +} diff --git a/ServiceStation/ServiceStationContracts/ViewModels/DefectViewModel.cs b/ServiceStation/ServiceStationContracts/ViewModels/DefectViewModel.cs new file mode 100644 index 0000000..4588589 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/ViewModels/DefectViewModel.cs @@ -0,0 +1,25 @@ +using ServiceStationDataModels.Enums; +using ServiceStationDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.ViewModels +{ + public class DefectViewModel : IDefectModel + { + public int Id { get; set; } + + [DisplayName("Тип неисправности")] + public string DefectType { get; set; } = string.Empty; + [DisplayName("Статус неисправности")] //? + public Status DefectStatus { get; set; } = Status.Неизвестен; + [DisplayName("Цена неисправности")] + public double DefectPrice { get; set; } + + public int ExecutorId { get; set; } + } +} diff --git a/ServiceStation/ServiceStationContracts/ViewModels/ExecutorViewModel.cs b/ServiceStation/ServiceStationContracts/ViewModels/ExecutorViewModel.cs new file mode 100644 index 0000000..a765d3a --- /dev/null +++ b/ServiceStation/ServiceStationContracts/ViewModels/ExecutorViewModel.cs @@ -0,0 +1,23 @@ +using ServiceStationDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.ViewModels +{ + public class ExecutorViewModel : IExecutorModel + { + public int Id { get; set; } + [DisplayName("ФИО исполнителя")] + public string ExecutorFIO { get; set; } = string.Empty; + [DisplayName("Почти исполнителя(логин)")] + public string ExecutorEmail { get; set; } = string.Empty; + [DisplayName("Пароль исполнителя")] + public string ExecutorPassword { get; set; } = string.Empty; + [DisplayName("Номер телефона исполнителя")] + public string ExecutorNumber { get; set; } = string.Empty; + } +} diff --git a/ServiceStation/ServiceStationContracts/ViewModels/TechnicalWorkViewModel.cs b/ServiceStation/ServiceStationContracts/ViewModels/TechnicalWorkViewModel.cs new file mode 100644 index 0000000..48ee738 --- /dev/null +++ b/ServiceStation/ServiceStationContracts/ViewModels/TechnicalWorkViewModel.cs @@ -0,0 +1,23 @@ +using ServiceStationDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ServiceStationContracts.ViewModels +{ + public class TechnicalWorkViewModel : ITechnicalWorkModel + { + public int Id { get; set; } + [DisplayName("Тип ТО")] + public string WorkType { get; set; } = string.Empty; + [DisplayName("Дата последнего ТО")] + public DateTime DateLastWork { get; set; } = DateTime.Now; + [DisplayName("Цена ТО")] + public double WorkPrice { get; set; } + + public int ExecutorId { get; set; } + } +} From 9aab6dc017183acde454bd84aabbf5377378d670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Wed, 17 Apr 2024 16:38:34 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/DefectBindingModel.cs | 2 -- .../ServiceStationContracts/ViewModels/DefectViewModel.cs | 3 +-- ServiceStation/ServiceStationDataModels/Models/IDefectModel.cs | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ServiceStation/ServiceStationContracts/BindingModels/DefectBindingModel.cs b/ServiceStation/ServiceStationContracts/BindingModels/DefectBindingModel.cs index 7c1717d..c3ce5a2 100644 --- a/ServiceStation/ServiceStationContracts/BindingModels/DefectBindingModel.cs +++ b/ServiceStation/ServiceStationContracts/BindingModels/DefectBindingModel.cs @@ -14,8 +14,6 @@ namespace ServiceStationContracts.BindingModels public string DefectType { get; set; } = string.Empty; - public Status DefectStatus { get; set; } = Status.Неизвестен; - public double DefectPrice { get; set; } public int ExecutorId { get; set; } diff --git a/ServiceStation/ServiceStationContracts/ViewModels/DefectViewModel.cs b/ServiceStation/ServiceStationContracts/ViewModels/DefectViewModel.cs index 4588589..4bb85be 100644 --- a/ServiceStation/ServiceStationContracts/ViewModels/DefectViewModel.cs +++ b/ServiceStation/ServiceStationContracts/ViewModels/DefectViewModel.cs @@ -15,8 +15,7 @@ namespace ServiceStationContracts.ViewModels [DisplayName("Тип неисправности")] public string DefectType { get; set; } = string.Empty; - [DisplayName("Статус неисправности")] //? - public Status DefectStatus { get; set; } = Status.Неизвестен; + [DisplayName("Цена неисправности")] public double DefectPrice { get; set; } diff --git a/ServiceStation/ServiceStationDataModels/Models/IDefectModel.cs b/ServiceStation/ServiceStationDataModels/Models/IDefectModel.cs index 4484c2d..84679c8 100644 --- a/ServiceStation/ServiceStationDataModels/Models/IDefectModel.cs +++ b/ServiceStation/ServiceStationDataModels/Models/IDefectModel.cs @@ -10,7 +10,6 @@ namespace ServiceStationDataModels.Models public interface IDefectModel : IId { string DefectType { get; } - Status DefectStatus { get; } double DefectPrice { get; } int ExecutorId { get; } }