diff --git a/Hospital/HospitalBusinessLogic/BusinessLogics/KurseLogic.cs b/Hospital/HospitalBusinessLogic/BusinessLogics/KurseLogic.cs index f70ca39..296b7ed 100644 --- a/Hospital/HospitalBusinessLogic/BusinessLogics/KurseLogic.cs +++ b/Hospital/HospitalBusinessLogic/BusinessLogics/KurseLogic.cs @@ -109,3 +109,4 @@ namespace HospitalBusinessLogic.BusinessLogics } } } + diff --git a/Hospital/HospitalBusinessLogic/BusinessLogics/RecipesLogic.cs b/Hospital/HospitalBusinessLogic/BusinessLogics/RecipesLogic.cs index 6a442ca..8d256f2 100644 --- a/Hospital/HospitalBusinessLogic/BusinessLogics/RecipesLogic.cs +++ b/Hospital/HospitalBusinessLogic/BusinessLogics/RecipesLogic.cs @@ -3,6 +3,7 @@ using HospitalContracts.BusinessLogicsContracts; using HospitalContracts.SearchModels; using HospitalContracts.StoragesContracts; using HospitalContracts.ViewModels; +using HospitalDataModels.Models; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -21,6 +22,40 @@ namespace HospitalBusinessLogic.BusinessLogics _logger = logger; _recipesStorage = recipesStorage; } + + public bool AddProcedures(RecipesSearchModel model, IProceduresModel procedure) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + + _logger.LogInformation("AddProcedure.Id:{ Id}", model.Id); + var element = _recipesStorage.GetElement(model); + + if (element == null) + { + _logger.LogWarning("AddProcedure element not found"); + return false; + } + + _logger.LogInformation("AddProcedure find. Id:{Id}", element.Id); + + element.RecipeProcedures[procedure.Id] = procedure; + + _recipesStorage.Update(new() + { + Id = element.Id, + Dose = element.Dose, + ModeOfApplication = element.ModeOfApplication, + Date = element.Date, + ClientId = element.ClientId, + RecipeProcedures = element.RecipeProcedures + }); + + return true; + } + public bool Create(RecipesBindingModel model) { CheckModel(model); diff --git a/Hospital/HospitalBusinessLogic/HospitalBusinessLogic.csproj b/Hospital/HospitalBusinessLogic/HospitalBusinessLogic.csproj index 2da2e32..68b9b32 100644 --- a/Hospital/HospitalBusinessLogic/HospitalBusinessLogic.csproj +++ b/Hospital/HospitalBusinessLogic/HospitalBusinessLogic.csproj @@ -7,7 +7,10 @@ + + + diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToExcel.cs new file mode 100644 index 0000000..5b490ad --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -0,0 +1,88 @@ +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using HospitalBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToExcel + { + /// + /// Создание отчета + /// + /// + public void CreateReport(ExcelInfo info) + { + CreateExcel(info); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = 1, + Text = info.Title, + StyleInfo = ExcelStyleInfoType.Title + }); + MergeCells(new ExcelMergeParameters + { + CellFromName = "A1", + CellToName = "C1" + }); + uint rowIndex = 2; + foreach (var pc in info.KurseMedicines) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = pc.KurseId.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + foreach (var Medicine in pc.Medicines) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = rowIndex, + Text = Medicine, + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + rowIndex++; + } + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = "Итого", + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + } + SaveExcel(info); + } + /// + /// Создание excel-файла + /// + /// + protected abstract void CreateExcel(ExcelInfo info); + /// + /// Добавляем новую ячейку в лист + /// + /// + protected abstract void InsertCellInWorksheet(ExcelCellParameters + excelParams); + /// + /// Объединение ячеек + /// + /// + protected abstract void MergeCells(ExcelMergeParameters excelParams); + /// + /// Сохранение файла + /// + /// + protected abstract void SaveExcel(ExcelInfo info); + + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToPdf.cs new file mode 100644 index 0000000..7c80749 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -0,0 +1,75 @@ +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using HospitalBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToPdf + { + 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 { "2cm", "6cm"}); + CreateRow(new PdfRowParameters + { + Texts = new List { "Номер", "Дата создания рецепта" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + foreach (var recipe in info.RecipeMedicine) + { + CreateRow(new PdfRowParameters + { + Texts = new List { recipe.Id.ToString(), + recipe.DateCreate.ToShortDateString() }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + SavePdf(info); + } + /// + /// Создание doc-файла + /// + /// + protected abstract void CreatePdf(PdfInfo info); + /// + /// Создание параграфа с текстом + /// + /// + /// + protected abstract void CreateParagraph(PdfParagraph paragraph); + /// + /// Создание таблицы + /// + /// + /// + protected abstract void CreateTable(List columns); + /// + /// Создание и заполнение строки + /// + /// + protected abstract void CreateRow(PdfRowParameters rowParameters); + /// + /// Сохранение файла + /// + /// + protected abstract void SavePdf(PdfInfo info); + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToWord.cs new file mode 100644 index 0000000..dcad3aa --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -0,0 +1,68 @@ +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using HospitalBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToWord + { + public void CreateDoc(WordInfo info) + { + CreateWord(info); + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Center + } + }); + foreach (var kurse in info.KurseMedicines) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> { (kurse.Title, new WordTextProperties { Size = "24", Bold = true, }) }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + foreach (var medicine in kurse.Medicines) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> { (medicine, new WordTextProperties { Size = "20", Bold = false, }) }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + } + SaveWord(info); + } + } + /// + /// Создание doc-файла + /// + /// + protected abstract void CreateWord(WordInfo info); + /// + /// Создание абзаца с текстом + /// + /// + /// + protected abstract void CreateParagraph(WordParagraph paragraph); + /// + /// Сохранение файла + /// + /// + protected abstract void SaveWord(WordInfo info); + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs new file mode 100644 index 0000000..9ce4c7a --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperEnums +{ + public enum ExcelStyleInfoType + { + Title, + Text, + TextWithBroder + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs new file mode 100644 index 0000000..8809e1c --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperEnums +{ + public enum PdfParagraphAlignmentType + { + Center, + Left, + Right + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs new file mode 100644 index 0000000..0558e3f --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperEnums +{ + public enum WordJustificationType + { + Center, + Both + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs new file mode 100644 index 0000000..37b9a79 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs @@ -0,0 +1,18 @@ +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelCellParameters + { + public string ColumnName { get; set; } = string.Empty; + public uint RowIndex { get; set; } + public string Text { get; set; } = string.Empty; + public string CellReference => $"{ColumnName}{RowIndex}"; + public ExcelStyleInfoType StyleInfo { get; set; } + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs new file mode 100644 index 0000000..0527bb7 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs @@ -0,0 +1,20 @@ +using HospitalContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public List KurseMedicines + { + get; + set; + } = new(); + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs new file mode 100644 index 0000000..9b6b6b0 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelMergeParameters + { + public string CellFromName { get; set; } = string.Empty; + public string CellToName { get; set; } = string.Empty; + public string Merge => $"{CellFromName}:{CellToName}"; + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs new file mode 100644 index 0000000..fe4e4bc --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs @@ -0,0 +1,18 @@ +using HospitalContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class PdfInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public DateTime DateFrom { get; set; } + public DateTime DateTo { get; set; } + public List RecipeMedicine { get; set; } = new(); + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs new file mode 100644 index 0000000..5c32a5f --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs @@ -0,0 +1,16 @@ +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class PdfParagraph + { + public string Text { get; set; } = string.Empty; + public string Style { get; set; } = string.Empty; + public PdfParagraphAlignmentType ParagraphAlignment { get; set; } + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs new file mode 100644 index 0000000..1b6a1fa --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs @@ -0,0 +1,16 @@ +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class PdfRowParameters + { + public List Texts { get; set; } = new(); + public string Style { get; set; } = string.Empty; + public PdfParagraphAlignmentType ParagraphAlignment { get; set; } + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordInfo.cs new file mode 100644 index 0000000..c751971 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -0,0 +1,16 @@ +using HospitalContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class WordInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public List KurseMedicines { get; set; } = new(); + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs new file mode 100644 index 0000000..d8a1a46 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class WordParagraph + { + public List<(string, WordTextProperties)> Texts { get; set; } = new(); + public WordTextProperties? TextProperties { get; set; } + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs new file mode 100644 index 0000000..5d0bc32 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs @@ -0,0 +1,16 @@ +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.HelperModels +{ + public class WordTextProperties + { + public string Size { get; set; } = string.Empty; + public bool Bold { get; set; } + public WordJustificationType JustificationType { get; set; } + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToExcel.cs new file mode 100644 index 0000000..4705318 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -0,0 +1,355 @@ +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Office2010.Excel; +using DocumentFormat.OpenXml.Office2013.Excel; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using HospitalBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.Implements +{ + public class SaveToExcel : AbstractSaveToExcel + { + private SpreadsheetDocument? _spreadsheetDocument; + private SharedStringTablePart? _shareStringPart; + private Worksheet? _worksheet; + /// + /// Настройка стилей для файла + /// + /// + private static void CreateStyles(WorkbookPart workbookpart) + { + var sp = workbookpart.AddNewPart(); + sp.Stylesheet = new Stylesheet(); + var fonts = new Fonts() { Count = 2U, KnownFonts = true }; + var fontUsual = new Font(); + fontUsual.Append(new FontSize() { Val = 12D }); + fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() + { Theme = 1U }); + fontUsual.Append(new FontName() { Val = "Times New Roman" }); + fontUsual.Append(new FontFamilyNumbering() { Val = 2 }); + fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + var fontTitle = new Font(); + fontTitle.Append(new Bold()); + fontTitle.Append(new FontSize() { Val = 14D }); + fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() + { Theme = 1U }); + fontTitle.Append(new FontName() { Val = "Times New Roman" }); + fontTitle.Append(new FontFamilyNumbering() { Val = 2 }); + fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + fonts.Append(fontUsual); + fonts.Append(fontTitle); + var fills = new Fills() { Count = 2U }; + var fill1 = new Fill(); + fill1.Append(new PatternFill() { PatternType = PatternValues.None }); + var fill2 = new Fill(); + fill2.Append(new PatternFill() + { + PatternType = PatternValues.Gray125 + }); + fills.Append(fill1); + fills.Append(fill2); + var borders = new Borders() { Count = 2U }; + var borderNoBorder = new Border(); + borderNoBorder.Append(new LeftBorder()); + borderNoBorder.Append(new RightBorder()); + borderNoBorder.Append(new TopBorder()); + borderNoBorder.Append(new BottomBorder()); + borderNoBorder.Append(new DiagonalBorder()); + var borderThin = new Border(); + var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin }; + leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() + { Indexed = 64U }); + var rightBorder = new RightBorder() + { + Style = BorderStyleValues.Thin + }; + rightBorder.Append(new + DocumentFormat.OpenXml.Office2010.Excel.Color() + { Indexed = 64U }); + var topBorder = new TopBorder() { Style = BorderStyleValues.Thin }; + topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() + { Indexed = 64U }); + var bottomBorder = new BottomBorder() + { + Style = + BorderStyleValues.Thin + }; + bottomBorder.Append(new + DocumentFormat.OpenXml.Office2010.Excel.Color() + { Indexed = 64U }); + borderThin.Append(leftBorder); + borderThin.Append(rightBorder); + borderThin.Append(topBorder); + borderThin.Append(bottomBorder); + borderThin.Append(new DiagonalBorder()); + borders.Append(borderNoBorder); + borders.Append(borderThin); + var cellStyleFormats = new CellStyleFormats() { Count = 1U }; + var cellFormatStyle = new CellFormat() + { + NumberFormatId = 0U, + FontId + = 0U, + FillId = 0U, + BorderId = 0U + }; + cellStyleFormats.Append(cellFormatStyle); + var cellFormats = new CellFormats() { Count = 3U }; + var cellFormatFont = new CellFormat() + { + NumberFormatId = 0U, + FontId = + 0U, + FillId = 0U, + BorderId = 0U, + FormatId = 0U, + ApplyFont = true + }; + var cellFormatFontAndBorder = new CellFormat() + { + NumberFormatId = 0U, + FontId = 0U, + FillId = 0U, + BorderId = 1U, + FormatId = 0U, + ApplyFont = true, + ApplyBorder = true + }; + var cellFormatTitle = new CellFormat() + { + NumberFormatId = 0U, + FontId + = 1U, + FillId = 0U, + BorderId = 0U, + FormatId = 0U, + Alignment = new Alignment() + { + Vertical = VerticalAlignmentValues.Center, + WrapText = true, + Horizontal = + HorizontalAlignmentValues.Center + }, + ApplyFont = true + }; + cellFormats.Append(cellFormatFont); + cellFormats.Append(cellFormatFontAndBorder); + cellFormats.Append(cellFormatTitle); + var cellStyles = new CellStyles() { Count = 1U }; + cellStyles.Append(new CellStyle() + { + Name = "Normal", + FormatId = 0U, + BuiltinId = 0U + }); + var differentialFormats = new + DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() + { Count = 0U }; + + var tableStyles = new TableStyles() + { + Count = 0U, + DefaultTableStyle = + "TableStyleMedium2", + DefaultPivotStyle = "PivotStyleLight16" + }; + var stylesheetExtensionList = new StylesheetExtensionList(); + var stylesheetExtension1 = new StylesheetExtension() + { + Uri = + "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" + }; + stylesheetExtension1.AddNamespaceDeclaration("x14", + "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"); + stylesheetExtension1.Append(new SlicerStyles() + { + DefaultSlicerStyle = + "SlicerStyleLight1" + }); + var stylesheetExtension2 = new StylesheetExtension() + { + Uri = + "{9260A510-F301-46a8-8635-F512D64BE5F5}" + }; + stylesheetExtension2.AddNamespaceDeclaration("x15", + "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"); + stylesheetExtension2.Append(new TimelineStyles() + { + DefaultTimelineStyle = "TimeSlicerStyleLight1" + }); + stylesheetExtensionList.Append(stylesheetExtension1); + stylesheetExtensionList.Append(stylesheetExtension2); + sp.Stylesheet.Append(fonts); + sp.Stylesheet.Append(fills); + sp.Stylesheet.Append(borders); + sp.Stylesheet.Append(cellStyleFormats); + sp.Stylesheet.Append(cellFormats); + sp.Stylesheet.Append(cellStyles); + sp.Stylesheet.Append(differentialFormats); + sp.Stylesheet.Append(tableStyles); + sp.Stylesheet.Append(stylesheetExtensionList); + } + /// + /// Получение номера стиля из типа + /// + /// + /// + private static uint GetStyleValue(ExcelStyleInfoType styleInfo) + { + return styleInfo switch + { + ExcelStyleInfoType.Title => 2U, + ExcelStyleInfoType.TextWithBroder => 1U, + ExcelStyleInfoType.Text => 0U, + _ => 0U, + }; + } + protected override void CreateExcel(ExcelInfo info) + { + _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, + SpreadsheetDocumentType.Workbook); + // Создаем книгу (в ней хранятся листы) + var workbookpart = _spreadsheetDocument.AddWorkbookPart(); + workbookpart.Workbook = new Workbook(); + CreateStyles(workbookpart); + // Получаем/создаем хранилище текстов для книги + _shareStringPart = + _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any() + ? + _spreadsheetDocument.WorkbookPart.GetPartsOfType().First() + : + _spreadsheetDocument.WorkbookPart.AddNewPart(); + // Создаем SharedStringTable, если его нет + if (_shareStringPart.SharedStringTable == null) + { + _shareStringPart.SharedStringTable = new SharedStringTable(); + } + // Создаем лист в книгу + var worksheetPart = workbookpart.AddNewPart(); + worksheetPart.Worksheet = new Worksheet(new SheetData()); + // Добавляем лист в книгу + var sheets = + _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets()); + var sheet = new Sheet() + { + Id = + _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart), + SheetId = 1, + Name = "Лист" + }; + sheets.Append(sheet); + _worksheet = worksheetPart.Worksheet; + } + protected override void InsertCellInWorksheet(ExcelCellParameters + excelParams) + { + if (_worksheet == null || _shareStringPart == null) + { + return; + } + var sheetData = _worksheet.GetFirstChild(); + if (sheetData == null) + { + return; + } + // Ищем строку, либо добавляем ее + Row row; + if (sheetData.Elements().Where(r => r.RowIndex! == + excelParams.RowIndex).Any()) + { + row = sheetData.Elements().Where(r => r.RowIndex! == + excelParams.RowIndex).First(); + } + else + { + row = new Row() { RowIndex = excelParams.RowIndex }; + sheetData.Append(row); + } + // Ищем нужную ячейку + Cell cell; + if (row.Elements().Where(c => c.CellReference!.Value == + excelParams.CellReference).Any()) + { + cell = row.Elements().Where(c => c.CellReference!.Value == + excelParams.CellReference).First(); + } + else + { + // Все ячейки должны быть последовательно друг за другом расположены + // нужно определить, после какой вставлять + Cell? refCell = null; + foreach (Cell rowCell in row.Elements()) + { + if (string.Compare(rowCell.CellReference!.Value, + excelParams.CellReference, true) > 0) + { + refCell = rowCell; + break; + } + } + var newCell = new Cell() + { + CellReference = + excelParams.CellReference + }; + row.InsertBefore(newCell, refCell); + cell = newCell; + } + // вставляем новый текст + _shareStringPart.SharedStringTable.AppendChild(new + SharedStringItem(new Text(excelParams.Text))); + _shareStringPart.SharedStringTable.Save(); + cell.CellValue = new + CellValue((_shareStringPart.SharedStringTable.Elements().Count( + ) - 1).ToString()); + cell.DataType = new EnumValue(CellValues.SharedString); + cell.StyleIndex = GetStyleValue(excelParams.StyleInfo); + } + protected override void MergeCells(ExcelMergeParameters excelParams) + { + if (_worksheet == null) + { + return; + } + MergeCells mergeCells; + if (_worksheet.Elements().Any()) + { + mergeCells = _worksheet.Elements().First(); + } + else + { + mergeCells = new MergeCells(); + if (_worksheet.Elements().Any()) + { + _worksheet.InsertAfter(mergeCells, + _worksheet.Elements().First()); + } + else + { + _worksheet.InsertAfter(mergeCells, + _worksheet.Elements().First()); + } + } + var mergeCell = new MergeCell() + { + Reference = new StringValue(excelParams.Merge) + }; + mergeCells.Append(mergeCell); + } + protected override void SaveExcel(ExcelInfo info) + { + if (_spreadsheetDocument == null) + { + return; + } + _spreadsheetDocument.WorkbookPart!.Workbook.Save(); + _spreadsheetDocument.Close(); + } + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToPdf.cs new file mode 100644 index 0000000..84b9b2a --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToPdf.cs @@ -0,0 +1,106 @@ +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using HospitalBusinessLogic.OfficePackage.HelperModels; +using MigraDoc.DocumentObjectModel; +using MigraDoc.DocumentObjectModel.Tables; +using MigraDoc.Rendering; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.Implements +{ + public class SaveToPdf : AbstractSaveToPdf + { + 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, + }; + } + /// + /// Создание стилей для документа + /// + /// + 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 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); + } + } +} diff --git a/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToWord.cs new file mode 100644 index 0000000..6676496 --- /dev/null +++ b/Hospital/HospitalBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -0,0 +1,132 @@ +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; +using HospitalBusinessLogic.OfficePackage.HelperEnums; +using HospitalBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HospitalBusinessLogic.OfficePackage.Implements +{ + public class SaveToWord : AbstractSaveToWord + + { + private WordprocessingDocument? _wordDocument; + private Body? _docBody; + /// + /// Получение типа выравнивания + /// + /// + /// + private static JustificationValues + GetJustificationValues(WordJustificationType type) + { + return type switch + { + WordJustificationType.Both => JustificationValues.Both, + WordJustificationType.Center => JustificationValues.Center, + _ => JustificationValues.Left, + }; + } + /// + /// Настройки страницы + /// + /// + private static SectionProperties CreateSectionProperties() + { + var properties = new SectionProperties(); + var pageSize = new PageSize + { + Orient = PageOrientationValues.Portrait + }; + properties.AppendChild(pageSize); + return properties; + } + /// + /// Задание форматирования для абзаца + /// + /// + /// + private static ParagraphProperties? + CreateParagraphProperties(WordTextProperties? paragraphProperties) + { + if (paragraphProperties == null) + { + return null; + } + var properties = new ParagraphProperties(); + properties.AppendChild(new Justification() + { + Val = + GetJustificationValues(paragraphProperties.JustificationType) + }); + properties.AppendChild(new SpacingBetweenLines + { + LineRule = LineSpacingRuleValues.Auto + }); + properties.AppendChild(new Indentation()); + var paragraphMarkRunProperties = new ParagraphMarkRunProperties(); + if (!string.IsNullOrEmpty(paragraphProperties.Size)) + { + paragraphMarkRunProperties.AppendChild(new FontSize + { + Val = + paragraphProperties.Size + }); + } + properties.AppendChild(paragraphMarkRunProperties); + return properties; + } + protected override void CreateWord(WordInfo info) + { + _wordDocument = WordprocessingDocument.Create(info.FileName, + WordprocessingDocumentType.Document); + MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart(); + mainPart.Document = new Document(); + _docBody = mainPart.Document.AppendChild(new Body()); + } + protected override void CreateParagraph(WordParagraph paragraph) + { + if (_docBody == null || paragraph == null) + { + return; + } + var docParagraph = new Paragraph(); + + docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties)); + foreach (var run in paragraph.Texts) + { + var docRun = new Run(); + var properties = new RunProperties(); + properties.AppendChild(new FontSize { Val = run.Item2.Size }); + if (run.Item2.Bold) + { + properties.AppendChild(new Bold()); + } + docRun.AppendChild(properties); + docRun.AppendChild(new Text + { + Text = run.Item1, + Space = + SpaceProcessingModeValues.Preserve + }); + docParagraph.AppendChild(docRun); + } + _docBody.AppendChild(docParagraph); + } + protected override void SaveWord(WordInfo info) + { + if (_docBody == null || _wordDocument == null) + { + return; + } + _docBody.AppendChild(CreateSectionProperties()); + _wordDocument.MainDocumentPart!.Document.Save(); + _wordDocument.Close(); + } + + } +} diff --git a/Hospital/HospitalClientApp/APIClient.cs b/Hospital/HospitalClientApp/APIClient.cs index 6e8c682..8685ff4 100644 --- a/Hospital/HospitalClientApp/APIClient.cs +++ b/Hospital/HospitalClientApp/APIClient.cs @@ -32,10 +32,7 @@ namespace HospitalClientApp public static void PostRequest(string requestUrl, T model) { var json = JsonConvert.SerializeObject(model); - var data = new StringContent(json, Encoding.UTF8, - - - "application/json"); + var data = new StringContent(json, Encoding.UTF8, "application/json"); var response = _client.PostAsync(requestUrl, data); var result = response.Result.Content.ReadAsStringAsync().Result; if (!response.Result.IsSuccessStatusCode) diff --git a/Hospital/HospitalClientApp/Controllers/HomeController.cs b/Hospital/HospitalClientApp/Controllers/HomeController.cs index 9e252c1..9115940 100644 --- a/Hospital/HospitalClientApp/Controllers/HomeController.cs +++ b/Hospital/HospitalClientApp/Controllers/HomeController.cs @@ -1,6 +1,12 @@ using HospitalClientApp.Models; +using HospitalContracts.BindingModels; +using HospitalContracts.SearchModels; +using HospitalContracts.ViewModels; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Hosting; using System.Diagnostics; +using System.Diagnostics.Metrics; +using System.Xml.Linq; namespace HospitalClientApp.Controllers { @@ -15,14 +21,350 @@ namespace HospitalClientApp.Controllers public IActionResult Index() { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } return View(); } - public IActionResult Privacy() + [HttpGet] + public IActionResult Enter() { return View(); } + [HttpPost] + public void Enter(string login, string password) + { + if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password)) + { + throw new Exception("Введите логин и пароль"); + } + APIClient.Client = APIClient.GetRequest($"api/client/login?login={login}&password={password}"); + if (APIClient.Client == null) + { + throw new Exception("Неверный логин/пароль"); + } + Response.Redirect("Index"); + } + [HttpGet] + public IActionResult Privacy() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + return View(APIClient.Client); + } + [HttpPost] + public void Privacy(string login, string password, string fio) + { + if (APIClient.Client == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio)) + { + throw new Exception("Введите логин, пароль и ФИО"); + } + APIClient.PostRequest("api/client/updatedata", new ClientBindingModel + { + Id = APIClient.Client.Id, + ClientFIO = fio, + Email = login, + Password = password + }); + + APIClient.Client.ClientFIO = fio; + APIClient.Client.Email = login; + APIClient.Client.Password = password; + Response.Redirect("Index"); + } + + [HttpGet] + public IActionResult Register() + { + return View(); + } + + [HttpPost] + public void Register(string login, string password, string fio) + { + if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio)) + { + throw new Exception("Введите логин, пароль и ФИО"); + } + APIClient.PostRequest("api/client/register", new ClientBindingModel + { + ClientFIO = fio, + Email = login, + Password = password + }); + Response.Redirect("Enter"); + return; + } + + /// + /// ПРОЦЕДУРЫ + /// + /// + public IActionResult ListProcedures() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + return View(APIClient.GetRequest>($"api/main/GetProcedureList?ClientId={APIClient.Client.Id}")); + } + public IActionResult CreateProcedure(int? id) + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + + if (!id.HasValue) + { + return View(); + } + var model = APIClient.GetRequest($"api/main/getprocedure?id={id}"); + return View(model); + } + [HttpPost] + public void CreateProcedure(int? id, string procedurename, string proceduretype ) + { + + if (APIClient.Client == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + if (id.HasValue) + { + APIClient.PostRequest("api/main/updateprocedure", new ProceduresBindingModel + { + Id = id.Value, + ProceduresName = procedurename, + Type = proceduretype + }); + } + else + { + APIClient.PostRequest("api/main/createprocedure", new ProceduresBindingModel + { + ClientId = APIClient.Client.Id, + ProceduresName = procedurename, + Type = proceduretype + + }); + } + Response.Redirect("ListProcedures"); + } + [HttpGet] + public ProceduresViewModel? GetProcedure(int procedureId) + { + if (APIClient.Client == null) + { + throw new Exception("Необходима авторизация"); + } + var result = APIClient.GetRequest($"api/main/getprocedure?procedureid={procedureId}"); + if (result == null) + { + return default; + } + var proceduresName = result.ProceduresName; + var proceduretype = result.Type; + + return result; + } + + [HttpPost] + public void DeleteProcedure(int procedure) + { + if (APIClient.Client == null) + { + throw new Exception("Доступно только авторизованным пользователям"); + } + + APIClient.PostRequest($"api/main/DeleteProcedure", new ProceduresBindingModel { Id = procedure }); + Response.Redirect("ListProcedures"); + } + + public IActionResult DeleteProcedure() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + ViewBag.Procedures = APIClient.GetRequest>($"api/main/getprocedurelist?clientId={APIClient.Client.Id}"); + return View(); + } + /// + /// ЛЕКАРСТВА + /// + /// + public IActionResult ListMedicines() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + return View(APIClient.GetRequest>($"api/main/getmedicineslist?clientId={APIClient.Client.Id}")); + } + public IActionResult CreateMedicine(int? id) + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + + if (!id.HasValue) + { + return View(); + } + var model = APIClient.GetRequest($"api/main/getmedicine?id={id}"); + return View(model); + } + [HttpPost] + public void CreateMedicine(int? id, string namemedicine, string group) + { + if (APIClient.Client == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + if (id.HasValue) + { + APIClient.PostRequest("api/main/updatemedicine", new MedicinesBindingModel + { + Id = id.Value, + MedicinesName = namemedicine, + Group = group + }); + } + else + { + APIClient.PostRequest("api/main/createmedicine", new MedicinesBindingModel + { + ClientId = APIClient.Client.Id, + MedicinesName = namemedicine, + Group = group + + }); + } + Response.Redirect("ListMedicines"); + } + [HttpGet] + public MedicinesViewModel? GetMedicine(int medicineId) + { + if (APIClient.Client == null) + { + throw new Exception("Необходима авторизация"); + } + var result = APIClient.GetRequest($"api/main/getmedicine?medicineid={medicineId}"); + if (result == null) + { + return default; + } + var medicineName = result.MedicinesName; + var group = result.Group; + + return result; + } + + [HttpPost] + public void DeleteMedicine(int medicine) + { + if (APIClient.Client == null) + { + throw new Exception("Доступно только авторизованным пользователям"); + } + + APIClient.PostRequest($"api/main/DeleteMedicine", new ProceduresBindingModel { Id = medicine }); + Response.Redirect("ListMedicines"); + } + + public IActionResult DeleteMedicine() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + ViewBag.Medicines = APIClient.GetRequest>($"api/main/GetMedicinesList?clientId={APIClient.Client.Id}"); + return View(); + } + /// + /// РЕЦЕПТЫ + /// + /// + public IActionResult ListRecipes() + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + return View(APIClient.GetRequest>($"api/main/getrecipeslist?clientId={APIClient.Client.Id}")); + } + public IActionResult CreateRecipe(int? id) + { + if (APIClient.Client == null) + { + return Redirect("~/Home/Enter"); + } + ViewBag.Medicines = APIClient.GetRequest>("api/main/getmedicineslist"); + ViewBag.Procedures = APIClient.GetRequest>("api/main/getprocedurelist"); + if (!id.HasValue) + { + return View(new RecipesViewModel()); + } + var model = APIClient.GetRequest($"api/main/getrecipe?id={id}"); + return View(model); + + } + + [HttpPost] + public void CreateRecipe(RecipesBindingModel model) + { + if (APIClient.Client == null) + { + throw new Exception("Вы как сюда попали? Сюда вход только авторизованным"); + } + model.ClientId = APIClient.Client.Id; + if (model.Id != 0) + { + APIClient.PostRequest("api/main/updaterecipe", model); + } + else + { + APIClient.PostRequest("api/main/createrecipe", model); + } + Response.Redirect("ListRecipes"); + } + + [HttpGet] + public Tuple? GetRecipe(int recipeId) + { + if (APIClient.Client == null) + { + throw new Exception("Необходима авторизация"); + } + var result = APIClient.GetRequest>>>($"api/main/getrecipe?recipeId={recipeId}"); + if (result == null) + { + return default; + } + string table = ""; + for (int i = 0; i < result.Item2.Count; i++) + { + var proceduresName = result.Item2[i].Item1; + var type = result.Item2[i].Item2; + table += ""; + table += $"{proceduresName}"; + table += $"{type}"; + table += ""; + } + return Tuple.Create(result.Item1, table); + } + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() { diff --git a/Hospital/HospitalClientApp/HospitalClientApp.csproj b/Hospital/HospitalClientApp/HospitalClientApp.csproj index 8372342..651d9b3 100644 --- a/Hospital/HospitalClientApp/HospitalClientApp.csproj +++ b/Hospital/HospitalClientApp/HospitalClientApp.csproj @@ -14,4 +14,8 @@ + + + + diff --git a/Hospital/HospitalClientApp/Program.cs b/Hospital/HospitalClientApp/Program.cs index 0727468..b06f63e 100644 --- a/Hospital/HospitalClientApp/Program.cs +++ b/Hospital/HospitalClientApp/Program.cs @@ -1,10 +1,10 @@ -var builder = WebApplication.CreateBuilder(args); +using HospitalClientApp; +var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddControllersWithViews(); - var app = builder.Build(); - +APIClient.Connect(builder.Configuration); // Configure the HTTP request pipeline. if (!app.Environment.IsDevelopment()) { @@ -12,16 +12,11 @@ if (!app.Environment.IsDevelopment()) // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. app.UseHsts(); } - app.UseHttpsRedirection(); app.UseStaticFiles(); - app.UseRouting(); - app.UseAuthorization(); - app.MapControllerRoute( - name: "default", - pattern: "{controller=Home}/{action=Index}/{id?}"); - + name: "default", + pattern: "{controller=Home}/{action=Index}/{id?}"); app.Run(); diff --git a/Hospital/HospitalClientApp/Views/Home/AddProcedures.cshtml b/Hospital/HospitalClientApp/Views/Home/AddProcedures.cshtml new file mode 100644 index 0000000..59a8393 --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/AddProcedures.cshtml @@ -0,0 +1,33 @@ +@using HospitalContracts.ViewModels; +@using System.Globalization +@{ + ViewData["Title"] = "AddProcedures"; +} + +@{ + +
+

Привязка процедуры

+
+ +
+
+
Процедура:
+
+ +
+
+
+
Лекарство:
+
+ +
+
+
+
+
+ +
+
+
+} diff --git a/Hospital/HospitalClientApp/Views/Home/CreateMedicine.cshtml b/Hospital/HospitalClientApp/Views/Home/CreateMedicine.cshtml new file mode 100644 index 0000000..10e0ab6 --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/CreateMedicine.cshtml @@ -0,0 +1,32 @@ +@{ + ViewData["Title"] = "CreateMedicine"; +} + +@{ + if (Model != null) + { +
+

Редактирование лекарства

+
+ } + else + { +
+

Создание лекарства

+
+ } +} +
+
+
Название лекарства:
+
+
+
+
Группа:
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/Hospital/HospitalClientApp/Views/Home/CreateProcedure.cshtml b/Hospital/HospitalClientApp/Views/Home/CreateProcedure.cshtml new file mode 100644 index 0000000..fa7051f --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/CreateProcedure.cshtml @@ -0,0 +1,31 @@ +@{ + ViewData["Title"] = "CreateProcedure"; +} + +@{ +if (Model != null) + { +
+

Редактирование процедуры

+
+ } + else { +
+

Создание процедуры

+
+ } +} +
+
+
Название процедуры:
+
+
+
+
Тип:
+
+
+
+
+
+
+
diff --git a/Hospital/HospitalClientApp/Views/Home/CreateRecipe.cshtml b/Hospital/HospitalClientApp/Views/Home/CreateRecipe.cshtml new file mode 100644 index 0000000..f87313a --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/CreateRecipe.cshtml @@ -0,0 +1,95 @@ +@using HospitalContracts.ViewModels; +@{ + ViewData["Title"] = "CreateRecipe"; +} + +
+

Создание рецепта

+
+
+
+
Доза:
+
+
+
+
Способ применения:
+
+
+
+
+
Лекарство:
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+

Процедуры

+ + + + + + + + + @foreach (var procedure in Model.RecipeProcedures) + { + + + + + } + +
Название
@procedure.Value.ProceduresName + +
+
+
+
+
+
+
+
+ +@section scripts { + + } diff --git a/Hospital/HospitalClientApp/Views/Home/DeleteMedicine.cshtml b/Hospital/HospitalClientApp/Views/Home/DeleteMedicine.cshtml new file mode 100644 index 0000000..1c262c4 --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/DeleteMedicine.cshtml @@ -0,0 +1,16 @@ +@{ + ViewData["Title"] = "DeleteMedicine"; +} + +
+
+ +
+ +
+
+
+
+
+
+
diff --git a/Hospital/HospitalClientApp/Views/Home/DeleteProcedure.cshtml b/Hospital/HospitalClientApp/Views/Home/DeleteProcedure.cshtml new file mode 100644 index 0000000..707964a --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/DeleteProcedure.cshtml @@ -0,0 +1,16 @@ +@{ + ViewData["Title"] = "DeleteProcedure"; +} + +
+
+ +
+ +
+
+
+
+
+
+
diff --git a/Hospital/HospitalClientApp/Views/Home/Enter.cshtml b/Hospital/HospitalClientApp/Views/Home/Enter.cshtml new file mode 100644 index 0000000..49dbc3a --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/Enter.cshtml @@ -0,0 +1,21 @@ +@{ + ViewData["Title"] = "Enter"; +} + +
+

Вход в приложение

+
+ +
+
+ + +
+
+ + +
+
+ +
+
diff --git a/Hospital/HospitalClientApp/Views/Home/Index.cshtml b/Hospital/HospitalClientApp/Views/Home/Index.cshtml index d2d19bd..7ab9688 100644 --- a/Hospital/HospitalClientApp/Views/Home/Index.cshtml +++ b/Hospital/HospitalClientApp/Views/Home/Index.cshtml @@ -1,8 +1,34 @@ -@{ +@using HospitalContracts.ViewModels + + +@model List + +@{ ViewData["Title"] = "Home Page"; } - -
-

Welcome

-

Learn about building Web apps with ASP.NET Core.

-
+ + + +
+

+ Поликлиника +

+

+ Приложение для персонала +

+ + +
+
+ +
+
+ + + + +
diff --git a/Hospital/HospitalClientApp/Views/Home/ListMedicines.cshtml b/Hospital/HospitalClientApp/Views/Home/ListMedicines.cshtml new file mode 100644 index 0000000..3e5a8c1 --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/ListMedicines.cshtml @@ -0,0 +1,63 @@ +@using HospitalContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "ListMedicines"; +} + +
+

Лекарства

+
+ +
+ @{ + if (Model == null) + { +

Авторизируйтесь

+ return; + } + +

+ Создать лекарство + Удалить +

+ + + + + + + + + + + @foreach (var item in Model) + { + + + + + + + } + +
+ Номер + + Название лекарства + + Группа + + +
+ @Html.DisplayFor(modelItem => item.Id) + + @Html.DisplayFor(modelItem => item.MedicinesName) + + @Html.DisplayFor(modelItem => item.Group) + + Редактировать +
+ } +
\ No newline at end of file diff --git a/Hospital/HospitalClientApp/Views/Home/ListProcedures.cshtml b/Hospital/HospitalClientApp/Views/Home/ListProcedures.cshtml new file mode 100644 index 0000000..33f9290 --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/ListProcedures.cshtml @@ -0,0 +1,63 @@ +@using HospitalContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "ListProcedures"; +} + +
+

Процедуры

+
+ +
+ @{ + if (Model == null) + { +

Авторизируйтесь

+ return; + } + +

+ Создать процедуру + Удалить +

+ + + + + + + + + + + @foreach (var item in Model) + { + + + + + + + } + +
+ Номер + + Название процедуры + + Тип процедуры + + +
+ @Html.DisplayFor(modelItem => item.Id) + + @Html.DisplayFor(modelItem => item.ProceduresName) + + @Html.DisplayFor(modelItem => item.Type) + + Редактировать +
+ } +
diff --git a/Hospital/HospitalClientApp/Views/Home/ListRecipes.cshtml b/Hospital/HospitalClientApp/Views/Home/ListRecipes.cshtml new file mode 100644 index 0000000..25bed75 --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/ListRecipes.cshtml @@ -0,0 +1,71 @@ +@using HospitalContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "ListRecipes"; +} + +
+

Рецепты

+
+ +
+ @{ + if (Model == null) + { +

Авторизируйтесь

+ return; + } + +

+ Создать рецепт + Удалить + Добавить процедуры + Добавить симптомы +

+ + + + + + + + + + + + @foreach (var item in Model) + { + + + + + + + + } + +
+ Номер + + Дата + + Доза + + Лекарство + + +
+ @Html.DisplayFor(modelItem => item.Id) + + @Html.DisplayFor(modelItem => item.Date) + + @Html.DisplayFor(modelItem => item.Dose) + + @Html.DisplayFor(modelItem => item.MedicinesName) + + Редактировать +
+ } +
\ No newline at end of file diff --git a/Hospital/HospitalClientApp/Views/Home/Privacy.cshtml b/Hospital/HospitalClientApp/Views/Home/Privacy.cshtml index 1ab381c..26dcf6e 100644 --- a/Hospital/HospitalClientApp/Views/Home/Privacy.cshtml +++ b/Hospital/HospitalClientApp/Views/Home/Privacy.cshtml @@ -3,7 +3,7 @@ @model ClientViewModel @{ - ViewData["Title"] = "Privacy Policy"; + ViewData["Title"] = "Privacy"; }

Личные данные

@@ -26,4 +26,3 @@
- diff --git a/Hospital/HospitalClientApp/Views/Home/Register.cshtml b/Hospital/HospitalClientApp/Views/Home/Register.cshtml new file mode 100644 index 0000000..c0021d2 --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/Register.cshtml @@ -0,0 +1,26 @@ +@{ + ViewData["Title"] = "Register"; +} + +
+

Регистрация

+
+
+ +
+ + +
+
+ + +
+
+ + +
+ +
+ +
+
diff --git a/Hospital/HospitalClientApp/Views/Home/UpdateMedicine.cshtml b/Hospital/HospitalClientApp/Views/Home/UpdateMedicine.cshtml new file mode 100644 index 0000000..30a3e11 --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/UpdateMedicine.cshtml @@ -0,0 +1,35 @@ +@{ + ViewData["Title"] = "UpdateMedicine"; +} + +
+

Изменения лекарства

+
+
+
+ +
+ +
+
+
+ + +
+
+ + +
+
+
+
+
+
diff --git a/Hospital/HospitalClientApp/Views/Home/UpdateProcedure.cshtml b/Hospital/HospitalClientApp/Views/Home/UpdateProcedure.cshtml new file mode 100644 index 0000000..6a625cb --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/UpdateProcedure.cshtml @@ -0,0 +1,35 @@ +@{ + ViewData["Title"] = "UpdateProcedure"; +} + +
+

Изменения процедуры

+
+
+
+ +
+ +
+
+
+ + +
+
+ + +
+
+
+
+
+
diff --git a/Hospital/HospitalClientApp/Views/Home/UpdateRecipe.cshtml b/Hospital/HospitalClientApp/Views/Home/UpdateRecipe.cshtml new file mode 100644 index 0000000..39d90fa --- /dev/null +++ b/Hospital/HospitalClientApp/Views/Home/UpdateRecipe.cshtml @@ -0,0 +1,39 @@ +@{ + ViewData["Title"] = "UpdateRecipe"; +} + +
+

Изменения рецепта

+
+
+
+ +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
diff --git a/Hospital/HospitalClientApp/Views/Shared/_Layout.cshtml b/Hospital/HospitalClientApp/Views/Shared/_Layout.cshtml index 64b4155..947b973 100644 --- a/Hospital/HospitalClientApp/Views/Shared/_Layout.cshtml +++ b/Hospital/HospitalClientApp/Views/Shared/_Layout.cshtml @@ -3,16 +3,17 @@ - @ViewData["Title"] - HospitalClientApp + @ViewData["Title"] - Поликлиника +
-