AnnaLioness/PIbd21.LyovushkinaA.A.LawFirm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-21, Лёвушкина Анна, лаб7 простая #18

Closed
AnnaLioness wants to merge 5 commits from лаб7 into лаб6
pull from: лаб7
merge into: AnnaLioness:лаб6
Conversation 0 Commits 5 Files Changed 45 +45 -38
5 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 111d1eee56 - Show all commits

7
LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/OrderLogic.cs
View File

@ -94,7 +94,12 @@ namespace AbstractLawFirmBusinessLogic.BusinessLogic
model.Status = status;
if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now;
if (element.ImplementerId.HasValue) model.ImplementerId = element.ImplementerId;
_orderStorage.Update(model);
element = _orderStorage.Update(model);
if(element == null)
{
_logger.LogWarning("Update operation failed");
return false;
}
var clientView = _clientStorage.GetElement(new() { Id = element.ClientId });
SendEmail(clientView, element);

1
LawFirm/AbstractLawFirmBusinessLogic/MailWorker/MailKitWorker.cs
View File

@ -52,6 +52,7 @@ messageInfoLogic) : base(logger, messageInfoLogic) { }
{
try
{
client.CheckCertificateRevocation = false;
client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
client.Authenticate(_mailLogin, _mailPassword);
for (int i = 0; i < client.Count; i++)

5
LawFirm/AbstractLawFirmClientApp/Controllers/HomeController.cs
View File

@ -142,9 +142,8 @@ namespace AbstractLawFirmClientApp.Controllers
{
return Redirect("~/Home/Enter");
}
return
View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={ APIClient.Client.Id}"));
}
return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
}
}
}

68
LawFirm/AbstractLawFirmClientApp/Views/Home/Mails.cshtml
View File

@ -1,51 +1,53 @@
@using AbstractLawFirmContracts.ViewModels
@model List<MessageInfoViewModel>
@{
ViewData["Title"] = "Mails";
}
<div class="text-center">
<h1 class="display-4">Заказы</h1>
<h1 class="display-4">Письма</h1>
</div>
<div class="text-center">
@{
if (Model == null)
{
<h3 class="display-4">Авторизируйтесь</h3>
<h3 class="display-4">Login bobr!</h3>
return;
}
<table class="table">
<thead>
<tr>
<th>
Дата письма
</th>
<th>
Заголовок
</th>
<th>
Текст
</th>
</tr>
</thead>
<tbody>
<table class="table">
<thead>
<tr>
<th>
Дата
</th>
<th>
Заголовок
</th>
<th>
Текст
</th>
</tr>
</thead>
<tbody>
@foreach (var item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem =>
item.DateDelivery)
</td>
<td>
@Html.DisplayFor(modelItem =>
item.Subject)
</td>
<td>
@Html.DisplayFor(modelItem =>
item.Body)
</td>
</tr>
<tr>
<td>
@Html.DisplayFor(modelItem => item.DateDelivery)
</td>
<td>
@Html.DisplayFor(modelItem => item.Subject)
</td>
<td>
@Html.DisplayFor(modelItem => item.Body)
</td>
</tr>
}
</tbody>
</table>
</tbody>
</table>
}
</div>

2
LawFirm/LawFirmView/Program.cs
View File

@ -46,7 +46,7 @@ namespace LawFirmView
System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ??
string.Empty,
SmtpClientPort =
Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClient Port"]),
Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
PopHost =
System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
PopPort =