From b552441d433298b386e3bf90c04eb478d9cf7f0f Mon Sep 17 00:00:00 2001 From: Pavel_Sorokin Date: Sun, 30 Apr 2023 19:58:40 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B4=D0=B2=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/MessageInfoBindingModel.cs | 2 ++ .../ShipyardContracts/ViewModels/MessageInfoViewModel.cs | 6 ++++++ Shipyard/ShipyardDataBaseImplement/Models/Message.cs | 2 ++ Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs | 3 +++ Shipyard/ShipyardFileImplement/Models/Message.cs | 2 ++ Shipyard/ShipyardListImplement»/Models/Message.cs | 2 ++ 6 files changed, 17 insertions(+) diff --git a/Shipyard/ShipyardContracts/BindingModels/MessageInfoBindingModel.cs b/Shipyard/ShipyardContracts/BindingModels/MessageInfoBindingModel.cs index 8a0e5f1..e97840c 100644 --- a/Shipyard/ShipyardContracts/BindingModels/MessageInfoBindingModel.cs +++ b/Shipyard/ShipyardContracts/BindingModels/MessageInfoBindingModel.cs @@ -20,5 +20,7 @@ namespace ShipyardContracts.BindingModels public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + public bool IsRead { get; private set; } = false; + public string? AnswerText { get; private set; } } } diff --git a/Shipyard/ShipyardContracts/ViewModels/MessageInfoViewModel.cs b/Shipyard/ShipyardContracts/ViewModels/MessageInfoViewModel.cs index 416f0d9..47681cf 100644 --- a/Shipyard/ShipyardContracts/ViewModels/MessageInfoViewModel.cs +++ b/Shipyard/ShipyardContracts/ViewModels/MessageInfoViewModel.cs @@ -25,5 +25,11 @@ namespace ShipyardContracts.ViewModels [DisplayName("Текст")] public string Body { get; set; } = string.Empty; + + [DisplayName("Прочитано")] + public bool IsRead { get; private set; } = false; + + [DisplayName("Ответ")] + public string? AnswerText { get; private set; } } } diff --git a/Shipyard/ShipyardDataBaseImplement/Models/Message.cs b/Shipyard/ShipyardDataBaseImplement/Models/Message.cs index f0748e7..faaee6e 100644 --- a/Shipyard/ShipyardDataBaseImplement/Models/Message.cs +++ b/Shipyard/ShipyardDataBaseImplement/Models/Message.cs @@ -25,6 +25,8 @@ namespace ShipyardDataBaseImplement.Models public string Body { get; private set; } = string.Empty; + public bool IsRead { get; private set; } = false; + public string? AnswerText { get; private set; } public Client? Client { get; private set; } public static Message? Create(MessageInfoBindingModel model) { diff --git a/Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs b/Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs index 02063dd..bfcee84 100644 --- a/Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs +++ b/Shipyard/ShipyardDataModels/Models/IMessageInfoModel.cs @@ -19,5 +19,8 @@ namespace ShipyardDataModels.Models string Subject { get; } string Body { get; } + + bool IsRead { get; } + string? AnswerText { get; } } } diff --git a/Shipyard/ShipyardFileImplement/Models/Message.cs b/Shipyard/ShipyardFileImplement/Models/Message.cs index 6804164..aa37af0 100644 --- a/Shipyard/ShipyardFileImplement/Models/Message.cs +++ b/Shipyard/ShipyardFileImplement/Models/Message.cs @@ -23,6 +23,8 @@ namespace ShipyardFileImplement.Models public string Subject { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty; + public bool IsRead { get; private set; } = false; + public string? AnswerText { get; private set; } public static Message? Create(MessageInfoBindingModel model) { if (model == null) diff --git a/Shipyard/ShipyardListImplement»/Models/Message.cs b/Shipyard/ShipyardListImplement»/Models/Message.cs index 99d8e1c..ce3cf76 100644 --- a/Shipyard/ShipyardListImplement»/Models/Message.cs +++ b/Shipyard/ShipyardListImplement»/Models/Message.cs @@ -22,6 +22,8 @@ namespace ShipyardListImplement_.Models public string Subject { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty; + public bool IsRead { get; private set; } = false; + public string? AnswerText { get; private set; } public static Message? Create(MessageInfoBindingModel model) {