VoOneChek/PIbd-21_Danilov_V.V._RenovationWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21. Danilov V.V. Lab work 04 Base #4

Closed
VoOneChek wants to merge 5 commits from LabWork04 into LabWork03
pull from: LabWork04
merge into: VoOneChek:LabWork03
Conversation 1 Commits 5 Files Changed 39 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 03fa286223 - Show all commits

8
RenovationWork/RenovationWork/ReportOrders.rdlc
View File

@ -34,8 +34,8 @@
<rd:TypeName>System.Decimal</rd:TypeName>
</Field>
<Field Name="Status">
<DataField>Status</DataField>
<rd:TypeName>RenovationWorkDataModels.Status</rd:TypeName>
<DataField>OrderStatus</DataField>
<rd:TypeName>RenovationWorkDataModels.OrderStatus</rd:TypeName>
</Field>
</Fields>
<rd:DataSetInfo>
@ -428,7 +428,7 @@
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Status">
<Textbox Name="OrderStatus">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
@ -442,7 +442,7 @@
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Status</rd:DefaultName>
<rd:DefaultName>OrderStatus</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>

2
RenovationWork/RenovationWorkBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
View File

@ -25,7 +25,7 @@ namespace RenovationWorkBusinessLogic.OfficePackage
CreateRow(new PdfRowParameters
{
Texts = new List<string> { "Номер", "Дата заказа", "Ремонт", "Статус", "Сумма" },
Texts = new List<string> { "Номер", "Дата заказа", "Ремонт", "Сумма", "Статус" },
Style = "NormalTitle",
ParagraphAlignment = PdfParagraphAlignmentType.Center
});