diff --git a/Confectionery/FormReplyMail.cs b/Confectionery/FormReplyMail.cs index 8247d8e..7c6ba2d 100644 --- a/Confectionery/FormReplyMail.cs +++ b/Confectionery/FormReplyMail.cs @@ -22,7 +22,7 @@ namespace ConfectioneryView private readonly IMessageInfoLogic _logic; private MessageInfoViewModel _message; - public string MessageId { get; set; } + public string MessageId { get; set; } = string.Empty; public FormReplyMail(ILogger logger, AbstractMailWorker mailWorker, IMessageInfoLogic logic) { @@ -67,7 +67,10 @@ namespace ConfectioneryView Text += $"для {_message.SenderName}"; textBoxHead.Text = _message.Subject; textBoxMail.Text = _message.Body; - _logic.Update(new() { MessageId = MessageId, HasRead = true }); + if (_message.HasRead is false) + { + _logic.Update(new() { MessageId = MessageId, HasRead = true, Reply = _message.Reply }); + } } catch (Exception ex) { diff --git a/Confectionery/FormViewMail.cs b/Confectionery/FormViewMail.cs index 2bedb35..9c7655c 100644 --- a/Confectionery/FormViewMail.cs +++ b/Confectionery/FormViewMail.cs @@ -104,10 +104,7 @@ namespace ConfectioneryView { form.MessageId = (string)dataGridView.Rows[e.RowIndex].Cells["MessageId"].Value; form.ShowDialog(); - if (form.DialogResult == DialogResult.OK) - { - MailLoad(); - } + MailLoad(); } } } diff --git a/ConfectioneryClientApp/Controllers/HomeController.cs b/ConfectioneryClientApp/Controllers/HomeController.cs index 3f551de..f47d812 100644 --- a/ConfectioneryClientApp/Controllers/HomeController.cs +++ b/ConfectioneryClientApp/Controllers/HomeController.cs @@ -192,7 +192,7 @@ namespace ConfectioneryClientApp.Controllers $"{mail.DateDelivery}" + $"{mail.Subject}" + $"{mail.Body}" + - $"{mail.HasRead}" + + "" + (mail.HasRead ? "Прочитано" : "Непрочитано") + "" + $"{mail.Reply}" + ""); } diff --git a/ConfectioneryClientApp/Views/Home/Mails.cshtml b/ConfectioneryClientApp/Views/Home/Mails.cshtml index dfc5013..98fdf1f 100644 --- a/ConfectioneryClientApp/Views/Home/Mails.cshtml +++ b/ConfectioneryClientApp/Views/Home/Mails.cshtml @@ -15,7 +15,7 @@ Текст - Прочитано + Статус Ответ