From 872f6520625c90914c76a1d0bc5c192e547eebd6 Mon Sep 17 00:00:00 2001
From: Danila_Mochalov <volzhankaonelove@yandex.ru>
Date: Sat, 11 Mar 2023 20:51:58 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9D=D1=83=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5?=
 =?UTF-8?q?=20=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LawFirm/LawFirm/FormReportOrder.cs            |  6 +-
 LawFirm/LawFirm/ReportOrders.rdlc             | 73 ++++++++++++++++++-
 .../BusinessLogics/ReportLogic.cs             |  3 +-
 .../OfficePackage/AbstractSaveToPdf.cs        |  6 +-
 .../ViewModels/ReportOrdersViewModel.cs       |  4 +-
 5 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/LawFirm/LawFirm/FormReportOrder.cs b/LawFirm/LawFirm/FormReportOrder.cs
index 3d9046f..2201d1b 100644
--- a/LawFirm/LawFirm/FormReportOrder.cs
+++ b/LawFirm/LawFirm/FormReportOrder.cs
@@ -30,8 +30,7 @@ namespace LawFirmView
         {
             if (dateTimePickerStart.Value.Date >= dateTimePickerEnd.Value.Date)
             {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания",
-               "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Дата начала должна быть меньше даты окончания","Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             try
@@ -62,8 +61,7 @@ namespace LawFirmView
         {
             if (dateTimePickerStart.Value.Date >= dateTimePickerEnd.Value.Date)
             {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания",
-               "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
             using var dialog = new SaveFileDialog
diff --git a/LawFirm/LawFirm/ReportOrders.rdlc b/LawFirm/LawFirm/ReportOrders.rdlc
index d3766db..4c8ac1d 100644
--- a/LawFirm/LawFirm/ReportOrders.rdlc
+++ b/LawFirm/LawFirm/ReportOrders.rdlc
@@ -33,6 +33,10 @@
           <DataField>Sum</DataField>
           <rd:TypeName>System.Decimal</rd:TypeName>
         </Field>
+        <Field Name="Status">
+          <DataField>Status</DataField>
+          <rd:TypeName>System.String</rd:TypeName>
+        </Field>
       </Fields>
       <rd:DataSetInfo>
         <rd:DataSetName>LawFirmContracts.ViewModels</rd:DataSetName>
@@ -127,6 +131,9 @@
                 <TablixColumn>
                   <Width>2.5cm</Width>
                 </TablixColumn>
+                <TablixColumn>
+                  <Width>2.5cm</Width>
+                </TablixColumn>
               </TablixColumns>
               <TablixRows>
                 <TablixRow>
@@ -260,6 +267,39 @@
                         </Textbox>
                       </CellContents>
                     </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox2">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Статус</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox2</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                        <rd:Selected>true</rd:Selected>
+                      </CellContents>
+                    </TablixCell>
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
@@ -387,6 +427,36 @@
                         </Textbox>
                       </CellContents>
                     </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Status">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!Status.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Status</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
                   </TablixCells>
                 </TablixRow>
               </TablixRows>
@@ -397,6 +467,7 @@
                 <TablixMember />
                 <TablixMember />
                 <TablixMember />
+                <TablixMember />
               </TablixMembers>
             </TablixColumnHierarchy>
             <TablixRowHierarchy>
@@ -413,7 +484,7 @@
             <Top>2.48391cm</Top>
             <Left>0.55245cm</Left>
             <Height>1.2cm</Height>
-            <Width>16.44755cm</Width>
+            <Width>18.94755cm</Width>
             <ZIndex>2</ZIndex>
             <Style>
               <Border>
diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs
index 1a2618c..fdebf7e 100644
--- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs
+++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -69,7 +69,8 @@ namespace LawFirmBusinessLogic.BusinessLogics
                 Id = x.Id,
                 DateCreate = x.DateCreate,
                 DocumentName = x.DocumentName,
-                Sum = x.Sum
+                Sum = x.Sum,
+                Status = x.Status.ToString(),
             })
            .ToList();
         }
diff --git a/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
index 7d3f571..d0ad76a 100644
--- a/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
+++ b/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -23,10 +23,10 @@ namespace LawFirmBusinessLogic.OfficePackage
             {
                 Text = $"с{ info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
-            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm" });
+            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "4cm" });
             CreateRow(new PdfRowParameters
             {
-                Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма" },
+                Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма", "Статус" },
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
@@ -34,7 +34,7 @@ namespace LawFirmBusinessLogic.OfficePackage
             {
                 CreateRow(new PdfRowParameters
                 {
-                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.DocumentName, order.Sum.ToString() },
+                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.DocumentName, order.Sum.ToString(), order.Status},
                     Style = "Normal",
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
diff --git a/LawFirm/LawFirmContracts/ViewModels/ReportOrdersViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ReportOrdersViewModel.cs
index 8d1918c..6c6b1ce 100644
--- a/LawFirm/LawFirmContracts/ViewModels/ReportOrdersViewModel.cs
+++ b/LawFirm/LawFirmContracts/ViewModels/ReportOrdersViewModel.cs
@@ -1,4 +1,5 @@
-using System;
+using LawFirmDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -12,5 +13,6 @@ namespace LawFirmContracts.ViewModels
         public DateTime DateCreate { get; set; }
         public string DocumentName { get; set; } = string.Empty;
         public double Sum { get; set; }
+        public String Status { get; set; } = string.Empty;
     }
 }