динь дон в твой дом

This commit is contained in:
antoc0der 2024-05-25 22:45:25 +04:00
parent 4665f4a409
commit d9dd87f489
13 changed files with 380 additions and 66 deletions

View File

@ -9,6 +9,7 @@ using VeterinaryContracts.SearchModels;
using VeterinaryContracts.StorageContracts;
using VeterinaryContracts.ViewModels;
using Microsoft.Extensions.Logging;
using System.Text.RegularExpressions;
namespace VeterinaryBusinessLogic.BusinessLogic
{
@ -101,6 +102,10 @@ namespace VeterinaryBusinessLogic.BusinessLogic
throw new ArgumentNullException("Нет Login доктора",
nameof(model.Login));
}
if (!Regex.IsMatch(model.Login, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$"))
{
throw new ArgumentException("Некорретно введен email клиента", nameof(model.Login));
}
if (string.IsNullOrEmpty(model.Password))
{
throw new ArgumentNullException("Нет пароля доктора",

View File

@ -19,12 +19,15 @@ namespace VeterinaryBusinessLogic.BusinessLogic
private readonly IMedicationStorage _medicationStorage;
private readonly AbstractSaveToExcelDoctor _saveToExcel;
private readonly AbstractSaveToWordDoctor _saveToWord;
private readonly AbstractSaveToPdfDoctor _saveToPdf;
public ReportLogicDoctor( IMedicationStorage medicationStorage,
AbstractSaveToExcelDoctor saveToExcel, AbstractSaveToWordDoctor saveToWord)
AbstractSaveToExcelDoctor saveToExcel, AbstractSaveToWordDoctor saveToWord, AbstractSaveToPdfDoctor saveToPdf)
{
_medicationStorage = medicationStorage;
_saveToExcel = saveToExcel;
_saveToWord = saveToWord;
_saveToPdf = saveToPdf;
}
public void SavePurchasesToExcelFile(ReportPurchaseMedicationBindingModel model)
{
@ -54,5 +57,18 @@ namespace VeterinaryBusinessLogic.BusinessLogic
{
return _medicationStorage.GetReportDrugsVisits(new() { DateFrom = model.DateFrom, DateTo = model.DateTo });
}
public void SaveMedicationsToPdfFile(ReportDrugsVisitsBindingModel model)
{
_saveToPdf.CreateDoc(new PdfInfo
{
FileName = model.FileName,
Title = "Список медикаментов",
DateFrom = model.DateFrom!,
DateTo = model.DateTo!,
ReportDrugsVisits = GetVisitsDrugs(model)
});
}
}
}

View File

@ -0,0 +1,72 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VeterinaryBusinessLogic.OfficePackage.HelperEnums;
using VeterinaryBusinessLogic.OfficePackage.HelperModels;
using VeterinaryDatabaseImplement.Implements;
namespace VeterinaryBusinessLogic.OfficePackage
{
public abstract class AbstractSaveToPdfDoctor
{
public void CreateDoc(PdfInfo info)
{
CreatePdf(info);
CreateParagraph(new PdfParagraph
{
Text = info.Title,
Style =
"NormalTitle",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
CreateParagraph(new PdfParagraph
{
Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style
= "Normal",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
CreateTable(new List<string> { "4cm", "4cm", "4cm", "4cm" });
CreateRow(new PdfRowParameters
{
Texts = new List<string> { "Дата", "Название медикамента", "Услуга рекомендации","Название визита" },
Style = "NormalTitle",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
foreach (var medication in info.ReportDrugsVisits)
{
CreateRow(new PdfRowParameters
{
Texts = new List<string> { "", medication.MedicationName, "", "" },
Style = "NormalTitle",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
foreach(var visit in medication.Visits)
{
CreateRow(new PdfRowParameters
{
Texts = new List<string> { visit.DateVisit.ToString(), "", "", visit.VisitName },
Style = "Normal",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
}
foreach (var guidance in medication.Drugs)
{
CreateRow(new PdfRowParameters
{
Texts = new List<string> { guidance.DateCreate.ToString(), "", guidance.DrugName, "" },
Style = "Normal",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});
}
}
SavePdf(info);
}
protected abstract void CreatePdf(PdfInfo info);
protected abstract void CreateParagraph(PdfParagraph paragraph);
protected abstract void CreateTable(List<string> columns);
protected abstract void CreateRow(PdfRowParameters rowParameters);
protected abstract void SavePdf(PdfInfo info);
}
}

View File

@ -10,6 +10,6 @@ namespace VeterinaryBusinessLogic.OfficePackage.HelperModels
public DateTime DateFrom { get; set; }
public DateTime DateTo { get; set; }
public List<ReportDrugsVisitsViewModel> ReportDrugsVisits { get; set; } = new();
public List<ReportVisitsDrugsViewModel> ReportVisitsDrugs{ get; set; } = new();
public List<ReportVisitsDrugsViewModel> ReportVisitsDrugs{ get; set; } = new();// возможно надо убрать
}
}

View File

@ -0,0 +1,108 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VeterinaryBusinessLogic.OfficePackage.HelperEnums;
using VeterinaryBusinessLogic.OfficePackage.HelperModels;
using MigraDoc.DocumentObjectModel;
using MigraDoc.DocumentObjectModel.Tables;
using MigraDoc.Rendering;
using VeterinaryBusinessLogic.OfficePackage;
namespace VeterinaryBusinessLogic.OfficePackage.Implements
{
public class SaveToPdfDoctor : AbstractSaveToPdfDoctor
{
private Document? _document;
private Section? _section;
private Table? _table;
private static ParagraphAlignment
GetParagraphAlignment(PdfParagraphAlignmentType type)
{
return type switch
{
PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
PdfParagraphAlignmentType.Right => ParagraphAlignment.Right,
_ => ParagraphAlignment.Justify,
};
}
/// <summary>
/// Создание стилей для документа
/// </summary>
/// <param name="document"></param>
private static void DefineStyles(Document document)
{
var style = document.Styles["Normal"];
style.Font.Name = "Times New Roman";
style.Font.Size = 14;
style = document.Styles.AddStyle("NormalTitle", "Normal");
style.Font.Bold = true;
}
protected override void CreatePdf(PdfInfo info)
{
_document = new Document();
DefineStyles(_document);
_section = _document.AddSection();
}
protected override void CreateParagraph(PdfParagraph pdfParagraph)
{
if (_section == null)
{
return;
}
var paragraph = _section.AddParagraph(pdfParagraph.Text);
paragraph.Format.SpaceAfter = "1cm";
paragraph.Format.Alignment =
GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
paragraph.Style = pdfParagraph.Style;
}
protected override void CreateTable(List<string> columns)
{
if (_document == null)
{
return;
}
_table = _document.LastSection.AddTable();
foreach (var elem in columns)
{
_table.AddColumn(elem);
}
}
protected override void CreateRow(PdfRowParameters rowParameters)
{
if (_table == null)
{
return;
}
var row = _table.AddRow();
for (int i = 0; i < rowParameters.Texts.Count; ++i)
{
row.Cells[i].AddParagraph(rowParameters.Texts[i]);
if (!string.IsNullOrEmpty(rowParameters.Style))
{
row.Cells[i].Style = rowParameters.Style;
}
Unit borderWidth = 0.5;
row.Cells[i].Borders.Left.Width = borderWidth;
row.Cells[i].Borders.Right.Width = borderWidth;
row.Cells[i].Borders.Top.Width = borderWidth;
row.Cells[i].Borders.Bottom.Width = borderWidth;
row.Cells[i].Format.Alignment =
GetParagraphAlignment(rowParameters.ParagraphAlignment);
row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
}
}
protected override void SavePdf(PdfInfo info)
{
var renderer = new PdfDocumentRenderer(true)
{
Document = _document
};
renderer.RenderDocument();
renderer.PdfDocument.Save(info.FileName);
}
}
}

View File

@ -14,6 +14,7 @@
<ItemGroup>
<ProjectReference Include="..\VeterinaryContracts\VeterinaryContracts.csproj" />
<ProjectReference Include="..\VeterinaryDatabaseImplement\VeterinaryDatabaseImplement.csproj" />
</ItemGroup>
</Project>

View File

@ -9,8 +9,12 @@ namespace VeterinaryContracts.BindingModels
public class ReportDrugsVisitsBindingModel
{
public string FileName { get; set; } = string.Empty;
public List<int> Medications { get; set; } = new();
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
//public List<int> Medications { get; set; } = new();
public DateTime DateFrom { get; set; }
public DateTime DateTo { get; set; }
public int? DoctorId { get; set; }
public string? Email { get; set; }
}
}

View File

@ -110,7 +110,8 @@ namespace VeterinaryDatabaseImplement.Implements
{
MedicationName = pet.MedicationName,
Drugs = context.Drugs
.Where(drug => drug.Medications
.Where(drug => drug.DateCreate <= model.DateTo &&
drug.DateCreate >= model.DateFrom && drug.Medications
.Select(x => x.MedicationId)
.ToList()
.Contains(pet.Id))

View File

@ -4,6 +4,7 @@ using VeterinaryBusinessLogic.MailWorker;
//using VeterinaryBusinessLogic.MailWorker;
using VeterinaryContracts.BindingModels;
using VeterinaryContracts.BusinessLogicContracts;
using VeterinaryContracts.ViewModels;
using VeterinaryDatabaseImplement.Implements;
namespace VeterinaryRestApi.Controllers
@ -49,17 +50,17 @@ namespace VeterinaryRestApi.Controllers
}
}
[HttpGet]
public List<VisitsGuidesViewModel> GetVisitsGuidesReport(string dateFrom, string dateTo, int pharmacistId)
public List<ReportDrugsVisitsViewModel> GetVisitsGuidesReport(string dateFrom, string dateTo, int doctorId)// переименовать
{
try
{
DateTime DateFrom = DateTime.Parse(dateFrom);
DateTime DateTo = DateTime.Parse(dateTo);
VisitsGuidesBindingModel model = new();
ReportDrugsVisitsBindingModel model = new();
model.DateFrom = DateFrom;
model.DateTo = DateTo;
model.DoctorId = pharmacistId;
return _reportDoctor.GetMedicineVisitsAndGuidances(model);
model.DoctorId = doctorId;
return _reportDoctor.GetVisitsDrugs(model);
}
catch (Exception ex)
{
@ -68,11 +69,11 @@ namespace VeterinaryRestApi.Controllers
}
[HttpPost]
public void SendVisitsGuidesReportToEmail(VisitsGuidesBindingModel model)
public void SendVisitsGuidesReportToEmail(ReportDrugsVisitsBindingModel model)// переименовать
{
try
{
_reportDoctor.SaveMedicinesToPdfFile(model);
_reportDoctor.SaveMedicationsToPdfFile(model);
_mailWorker.MailSendAsync(new MailSendInfoBindingModel
{
MailAddress = model.Email!,

View File

@ -11,5 +11,5 @@
"PopHost": "pop.gmail.com",
"PopPort": "995",
"MailLogin": "anasirov48@gmail.com",
"MailPassword": "ozxp vjof uinv fcmj"
"MailPassword": "xoac ehyi tnar fiho"
}

View File

@ -7,6 +7,7 @@ using System.Text;
using VeterinaryDataModels.Models;
using VeterinaryContracts.SearchModels;
using VeterinaryContracts.StorageContracts;
using System.Globalization;
namespace VeterinaryShowDoctorApp.Controllers
{
@ -526,11 +527,95 @@ namespace VeterinaryShowDoctorApp.Controllers
[HttpGet]
public IActionResult Report()
{
if (APIDoctor.Doctor == null)
{
return Redirect("~/Home/Enter");
}
ViewBag.Report = new List<ReportDrugsVisitsBindingModel>();
return View();
}
[HttpGet]
public string GetMedicationsReport(DateTime dateFrom, DateTime dateTo)
{
if (APIDoctor.Doctor == null)
{
throw new Exception("Вы как суда попали? Суда вход только авторизованным");
}
List<ReportDrugsVisitsViewModel> result;
try
{
string dateFromS = dateFrom.ToString("s", CultureInfo.InvariantCulture);
string dateToS = dateTo.ToString("s", CultureInfo.InvariantCulture);
result = APIDoctor.GetRequest<List<ReportDrugsVisitsViewModel>>
($"api/report/getvisitsguidesreport?datefrom={dateFromS}&dateto={dateToS}&doctorid={APIDoctor.Doctor.Id}")!; // переделать
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка создания отчета");
throw;
}
string table = "";
table += "<h2 class=\"text-custom-color-1\">Предварительный отчет</h2>";
table += "<div class=\"table-responsive\">";
table += "<table class=\"table table-striped table-bordered table-hover\">";
table += "<thead class=\"table-dark\">";
table += "<tr>";
table += "<th scope=\"col\">Дата</th>";
table += "<th scope=\"col\">Название медикамента</th>";
table += "<th scope=\"col\">Лекарство</th>";
table += "<th scope=\"col\">Название визита</th>";
table += "</tr>";
table += "</thead>";
foreach (var medication in result)
{
table += "<tbody>";
table += "<tr>";
table += $"<td></td>";
table += $"<td>{medication.MedicationName}</td>";
table += $"<td></td>";
table += $"<td></td>";
table += "</tr>";
foreach (var drug in medication.Drugs)
{
table += "<tr>";
table += $"<td>{drug.DateCreate}</td>";
table += $"<td></td>";
table += $"<td>{drug.DrugName}</td>";
table += $"<td></td>";
table += "</tr>";
}
foreach (var visit in medication.Visits)
{
table += "<tr>";
table += $"<td>{visit.DateVisit}</td>";
table += $"<td></td>";
table += $"<td></td>";
table += $"<td>{visit.VisitName}</td>";
table += "</tr>";
}
table += "</tbody>";
}
table += "</table>";
table += "</div>";
return table;
}
[HttpPost]
public void Report(DateTime dateFrom, DateTime dateTo)
{
if (APIDoctor.Doctor == null)
{
throw new Exception("Вы как суда попали? Суда вход только авторизованным");
}
APIDoctor.PostRequest("api/report/sendvisitsguidesreporttoemail", new ReportDrugsVisitsBindingModel // поменять
{
FileName = "C:\\ReportsCourseWork\\pdffile.pdf",
DoctorId = APIDoctor.Doctor.Id,
DateFrom = dateFrom,
DateTo = dateTo,
Email = APIDoctor.Doctor.Login
});
Response.Redirect("Report");
}
}
}

View File

@ -33,6 +33,9 @@
<th>
Цена
</th>
<th>
Дата создания
</th>
</tr>
</thead>
<tbody>
@ -51,6 +54,9 @@
<td>
@Html.DisplayFor(modelItem =>item.Price)
</td>
<td>
@Html.DisplayFor(modelItem =>item.DateCreate)
</td>
</tr>
}
</tbody>

View File

@ -1,51 +1,66 @@
@{
ViewData["Title"] = "Report";

@{
ViewData["Title"] = "Report";
}
<div class="text-center">
<h1 class="display-4">Список медикаментов с расшифровкой по посещениям и лекарствам</h1>
<div class="container">
<div class="text-center mb-4">
<h2 class="text-custom-color-1">Отчет по медикаментам за период</h2>
</div>
<form method="post">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label for="dateFrom" class="form-label text-custom-color-1">Начало периода:</label>
<input type="datetime-local" id="dateFrom" name="dateFrom" class="form-control" placeholder="Выберите дату начала периода">
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label for="dateTo" class="form-label text-custom-color-1">Окончание периода:</label>
<input type="datetime-local" id="dateTo" name="dateTo" class="form-control" placeholder="Выберите дату окончания периода">
</div>
</div>
</div>
<div class="row mb-4">
<div class="col-md-8"></div>
<div class="col-md-4">
<button type="submit" class="btn btn-outline-dark w-100 text-center d-flex justify-content-md-center">Отправить на почту</button>
</div>
</div>
<div class="row mb-4">
<div class="col-md-8"></div>
<div class="col-md-4">
<button type="button" id="demonstrate" class="btn btn-outline-dark w-100 text-center d-flex justify-content-md-center">Продемонстрировать</button>
</div>
</div>
<div id="report"></div>
</form>
</div>
<div class="text-center">
@{
<div class="row mb-5">
<div class="col-4">Начальная дата:</div>
<div class="col-8">
<input type="date" id="startDate" name="startDate" class="form-control">
</div>
</div>
<div class="row mb-5">
<div class="col-4">Конечная дата:</div>
<div class="col-8">
<input type="date" id="endDate" name="endDate" class="form-control">
</div>
</div>
<table class="table">
<thead>
<tr>
<th>
Номер
</th>
<th>
Дата
</th>
<th>
Медикамент
</th>
<th>
Посещение
</th>
<th>
Лекарство
</th>
</tr>
</thead>
<tbody>
будет заполняться вьюшками отчета
</tbody>
</table>
<div class="row">
<div class="col-8"></div>
<div class="col-2"><input type="submit" value="Создать отчет" class="btn btn-primary" /></div>
<div class="col-1"><input type="submit" value="Отправить на почту" class="btn btn-primary" /></div>
</div>
}
</div>
@section Scripts {
<script>
function check() {
var dateFrom = $('#dateFrom').val();
var dateTo = $('#dateTo').val();
if (dateFrom && dateTo) {
$.ajax({
method: "GET",
url: "/Home/GetMedicationsReport",
data: { dateFrom: dateFrom, dateTo: dateTo },
success: function (result) {
if (result != null) {
$('#report').html(result);
}
}
});
};
}
check();
$('#demonstrate').on('click', (e) => check());
</script>
}