diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs index def32b9..403b878 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs @@ -51,7 +51,7 @@ namespace LawFirmBusinessLogic.BusinessLogics { record.Blanks.Add(new Tuple(blank.BlankName, document.DocumentBlanks[blank.Id].Item2)); record.TotalCount += - document.DocumentBlanks[blank.Id].Item2; + document.DocumentBlanks[blank.Id].Item2; } } list.Add(record); diff --git a/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index a315e88..b63d08a 100644 --- a/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -23,10 +23,10 @@ namespace LawFirmBusinessLogic.OfficePackage = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center }); - CreateTable(new List { "2cm", "3cm", "6cm", "3cm" }); + CreateTable(new List { "2cm", "3cm", "6cm", "3cm", "3cm" }); CreateRow(new PdfRowParameters { - Texts = new List { "Номер", "Дата заказа", "Изделие", "Сумма" }, + Texts = new List { "Номер", "Дата заказа", "Изделие", "Статус заказа", "Сумма" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); @@ -34,7 +34,7 @@ namespace LawFirmBusinessLogic.OfficePackage { CreateRow(new PdfRowParameters { - Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.DocumentName, order.Sum.ToString() }, + Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.DocumentName, order.OrderStatus, order.Sum.ToString() }, Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Left }); diff --git a/LawFirm/LawFirmBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/LawFirm/LawFirmBusinessLogic/OfficePackage/Implements/SaveToWord.cs index c309228..0047c30 100644 --- a/LawFirm/LawFirmBusinessLogic/OfficePackage/Implements/SaveToWord.cs +++ b/LawFirm/LawFirmBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -102,8 +102,7 @@ namespace LawFirmBusinessLogic.OfficePackage.Implements docRun.AppendChild(new Text { Text = run.Item1, - Space = - SpaceProcessingModeValues.Preserve + Space = SpaceProcessingModeValues.Preserve }); docParagraph.AppendChild(docRun); } diff --git a/LawFirm/LawFirmClientApp/Views/Home/Create.cshtml b/LawFirm/LawFirmClientApp/Views/Home/Create.cshtml index 6ca8b08..95ea5d7 100644 --- a/LawFirm/LawFirmClientApp/Views/Home/Create.cshtml +++ b/LawFirm/LawFirmClientApp/Views/Home/Create.cshtml @@ -29,25 +29,27 @@ - \ No newline at end of file +@section scripts{ + +} \ No newline at end of file diff --git a/LawFirm/LawFirmDatabaseImplement/Implements/ClientStorage.cs b/LawFirm/LawFirmDatabaseImplement/Implements/ClientStorage.cs index 24678d6..cfbd8cb 100644 --- a/LawFirm/LawFirmDatabaseImplement/Implements/ClientStorage.cs +++ b/LawFirm/LawFirmDatabaseImplement/Implements/ClientStorage.cs @@ -32,7 +32,9 @@ namespace LawFirmDatabaseImplement.Implements && x.Password.Equals(model.Password)) ?.GetViewModel; if (model.Email != null) - return context.Clients.FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel; + return context.Clients + .FirstOrDefault(x => x.Email + .Equals(model.Email))?.GetViewModel; return null; } diff --git a/LawFirm/LawFirmView/LawFirmView.csproj b/LawFirm/LawFirmView/LawFirmView.csproj index 725b3ef..5904c43 100644 --- a/LawFirm/LawFirmView/LawFirmView.csproj +++ b/LawFirm/LawFirmView/LawFirmView.csproj @@ -27,4 +27,10 @@ + + + Always + + + \ No newline at end of file diff --git a/LawFirm/LawFirmView/ReportOrders.rdlc b/LawFirm/LawFirmView/ReportOrders.rdlc index 3d5e2af..f807d65 100644 --- a/LawFirm/LawFirmView/ReportOrders.rdlc +++ b/LawFirm/LawFirmView/ReportOrders.rdlc @@ -1,599 +1,599 @@ - + - 0 - - - - System.Data.DataSet - /* Local Connection */ - - 10791c83-cee8-4a38-bbd0-245fc17cefb3 - - - - - - LawFirmContractsViewModels - /* Local Query */ - - - - Id - System.Int32 - - - DateCreate - System.DateTime - - - DocumentName - System.String - - - OrderStatus - System.String - - - Sum - System.Decimal - - - - LawFirmContracts.ViewModels - ReportOrdersViewModel - LawFirmContracts.ViewModels.ReportOrdersViewModel, LawFirmContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - - - - - - - true - true - - - - - =Parameters!ReportParameterPeriod.Value - - - - - - - ReportParameterPeriod - 1cm - 1cm - 21cm - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Заказы - - - - - - - 1cm - 21cm - 1 - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - 2.5cm - - - 3.21438cm - - - 8.23317cm - - - 2.5cm - - - 2.5cm - - - - - 0.6cm - - - - - true - true - - - - - Номер - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Дата создания - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Документ - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Статус - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Сумма - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Fields!Id.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!DateCreate.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!DocumentName.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!OrderStatus.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Sum.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - - - After - - - - - - - DataSetOrders - 2.48391cm - 0.55245cm - 1.2cm - 18.94755cm - 2 - - - - - - true - true - - - - - Итого: - - - - - - - 4cm - 12cm - 0.6cm - 2.5cm - 3 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Sum(Fields!Sum.Value, "DataSetOrders") - - - - - - - 4cm - 14.5cm - 0.6cm - 2.5cm - 4 - - - 2pt - 2pt - 2pt - 2pt - - - - 5.72875cm - + + + + + + ReportParameterPeriod + 1cm + 1cm 21cm - - 29.7cm - 21cm - 2cm - 2cm - 2cm - 2cm - 0.13cm - + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Заказы + + + + + + + 1cm + 21cm + 1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 2.5cm + + + 3.21438cm + + + 8.23317cm + + + 2.5cm + + + 2.5cm + + + + + 0.6cm + + + + + true + true + + + + + Номер + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Дата создания + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Документ + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Статус + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Сумма + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Id.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DateCreate.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DocumentName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!OrderStatus.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 2.48391cm + 0.55245cm + 1.2cm + 18.94755cm + 2 + + + + + + true + true + + + + + Итого: + + + + + + + 4cm + 12cm + 0.6cm + 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Sum.Value, "DataSetOrders") + + + + + + + 4cm + 14.5cm + 0.6cm + 2.5cm + 4 + + + 2pt + 2pt + 2pt + 2pt + + + + 5.72875cm +