Zakharov_Rostislav/PIbd-23_ZakharovR.A._BlacksmithWorkshop
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lab-4 some minor fixes

Browse Source
This commit is contained in:
Zakharov_Rostislav 2024-03-27 16:48:48 +04:00
parent 8298a2b88d
commit 863ad4a50d
4 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs generated
View File

@ -86,21 +86,21 @@
// ComponentsListToolStripMenuItem
//
ComponentsListToolStripMenuItem.Name = "ComponentsListToolStripMenuItem";
ComponentsListToolStripMenuItem.Size = new Size(218, 22);
ComponentsListToolStripMenuItem.Text = "Список компонентов";
ComponentsListToolStripMenuItem.Size = new Size(225, 22);
ComponentsListToolStripMenuItem.Text = "Список кузнечных изделий";
ComponentsListToolStripMenuItem.Click += ComponentsListToolStripMenuItem_Click;
//
// ManufacturesListToolStripMenuItem
//
ManufacturesListToolStripMenuItem.Name = "ManufacturesListToolStripMenuItem";
ManufacturesListToolStripMenuItem.Size = new Size(218, 22);
ManufacturesListToolStripMenuItem.Size = new Size(225, 22);
ManufacturesListToolStripMenuItem.Text = "Компоненты по изделиям";
ManufacturesListToolStripMenuItem.Click += ManufacturesListToolStripMenuItem_Click;
//
// OrdersListToolStripMenuItem
//
OrdersListToolStripMenuItem.Name = "OrdersListToolStripMenuItem";
OrdersListToolStripMenuItem.Size = new Size(218, 22);
OrdersListToolStripMenuItem.Size = new Size(225, 22);
OrdersListToolStripMenuItem.Text = "Список заказов";
OrdersListToolStripMenuItem.Click += OrdersListToolStripMenuItem_Click;
//

3
BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
View File

@ -165,7 +165,6 @@ namespace BlacksmithWorkshop
{
LoadData();
}
private void ComponentsListToolStripMenuItem_Click(object sender, EventArgs e)
{
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
@ -179,7 +178,6 @@ namespace BlacksmithWorkshop
MessageBoxIcon.Information);
}
}
private void ManufacturesListToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportManufactureComponents));
@ -188,7 +186,6 @@ namespace BlacksmithWorkshop
form.ShowDialog();
}
}
private void OrdersListToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));

77
BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc
View File

@ -90,7 +90,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></Value>
<Value>Список заказов</Value>
<Style>
<FontSize>16pt</FontSize>
<FontWeight>Bold</FontWeight>
@ -148,7 +148,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></Value>
<Value>Номер</Value>
<Style>
<FontWeight>Bold</FontWeight>
</Style>
@ -180,7 +180,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></Value>
<Value>Дата заказа</Value>
<Style>
<FontWeight>Bold</FontWeight>
</Style>
@ -212,7 +212,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></Value>
<Value>Изделие</Value>
<Style>
<FontWeight>Bold</FontWeight>
</Style>
@ -244,7 +244,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></Value>
<Value>Сумма</Value>
<Style>
<FontWeight>Bold</FontWeight>
</Style>
@ -276,7 +276,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></Value>
<Value>Статус</Value>
<Style>
<FontWeight>Bold</FontWeight>
</Style>
@ -396,6 +396,36 @@
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Sum1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Sum.Value</Value>
<Style />
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Sum1</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>
<TablixCell>
<CellContents>
<Textbox Name="OrderStatus">
@ -424,36 +454,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Sum">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Sum.Value</Value>
<Style />
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Sum</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>
@ -475,7 +476,7 @@
<KeepWithGroup>After</KeepWithGroup>
</TablixMember>
<TablixMember>
<Group Name="<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" />
<Group Name="Подробности" />
</TablixMember>
</TablixMembers>
</TablixRowHierarchy>
@ -498,7 +499,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:</Value>
<Value>Итого:</Value>
<Style>
<FontWeight>Bold</FontWeight>
</Style>

4
BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -90,7 +90,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
_saveToWord.CreateDoc(new WordInfo
{
FileName = model.FileName,
Title = "Список компонент",
Title = "Список кузнечных изделий",
Manufactures = _ManufactureStorage.GetFullList()
});
}
@ -103,7 +103,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
_saveToExcel.CreateReport(new ExcelInfo
{
FileName = model.FileName,
Title = "Список компонент",
Title = "Список кузнечных изделий",
ManufactureComponents = GetManufactureComponent()
});
}