Belnik/PIbd-21_Belianin_N.N._FurnitureAssembly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Belianin N.N. LabWork06_Hard #12

Closed
Belnik wants to merge 12 commits from LabWork06_Hard into LabWork05_Hard
pull from: LabWork06_Hard
merge into: Belnik:LabWork05_Hard
Conversation 1 Commits 12 Files Changed 199 +34 -28
9 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1345e2705 - Show all commits

10
FurnitureAssembly/FurnitureAssemblyContracts/ViewModels/OrderViewModel.cs
View File

@ -15,11 +15,6 @@ namespace FurnitureAssemblyContracts.ViewModels
[DisplayName("Номер")]
public int Id { get; set; }
public int FurnitureId { get; set; }
[DisplayName("Изделие")]
public string FurnitureName { get; set; } = string.Empty;
public int ClientId { get; set; }
[DisplayName("ФИО клиента")]
@ -30,6 +25,11 @@ namespace FurnitureAssemblyContracts.ViewModels
[DisplayName("ФИО исполнителя")]
public string ImplementerFIO { get; set; } = string.Empty;
public int FurnitureId { get; set; }
[DisplayName("Изделие")]
public string FurnitureName { get; set; } = string.Empty;
[DisplayName("Количество")]
public int Count { get; set; }

8
FurnitureAssembly/FurnitureAssemblyView/FormFurnitureWorkPiece.cs
View File

@ -25,14 +25,14 @@ namespace FurnitureAssemblyView
{
get
{
if(_list == null)
if (_list == null)
{
return null;
}
foreach(var elem in _list)
foreach (var elem in _list)
{
if(elem.Id == Id)
if (elem.Id == Id)
{
return elem;
}
@ -51,7 +51,7 @@ namespace FurnitureAssemblyView
_list = logic.ReadList(null);
if(_list != null)
if (_list != null)
{
comboBoxWorkPiece.DisplayMember = "WorkPieceName";
comboBoxWorkPiece.ValueMember = "Id";

6
FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.Designer.cs generated
View File

@ -66,15 +66,15 @@
buttonDelete.UseVisualStyleBackColor = true;
buttonDelete.Click += ButtonDelete_Click;
//
// buttonRef
// buttonRefresh
//
buttonRef.Location = new Point(640, 245);
buttonRef.Name = "buttonRef";
buttonRef.Name = "buttonRefresh";
buttonRef.Size = new Size(116, 50);
buttonRef.TabIndex = 3;
buttonRef.Text = "Обновить";
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += ButtonRef_Click;
buttonRef.Click += ButtonRefresh_Click;
//
// dataGridView
//

2
FurnitureAssembly/FurnitureAssemblyView/FormFurnitures.cs
View File

@ -118,7 +118,7 @@ namespace FurnitureAssemblyView
}
}
private void ButtonRef_Click(object sender, EventArgs e)
private void ButtonRefresh_Click(object sender, EventArgs e)
{
LoadData();
}

4
FurnitureAssembly/FurnitureAssemblyView/FormMain.cs
View File

@ -51,7 +51,7 @@ namespace FurnitureAssemblyView
{
dataGridView.DataSource = list;
dataGridView.Columns["FurnitureId"].Visible = false;
dataGridView.Columns["ClientId"].Visible = false;
dataGridView.Columns["ClientId"].Visible = false;
dataGridView.Columns["ImplementerId"].Visible = false;
dataGridView.Columns["FurnitureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
@ -115,7 +115,7 @@ namespace FurnitureAssemblyView
if (!operationResult)
{
throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
throw new Exception("Заказ не в статусе готовности. Дополнительная информация в логах.");
}
_logger.LogInformation("Заказ №{id} выдан", id);

18
FurnitureAssembly/FurnitureAssemblyView/FormReportOrders.cs
View File

@ -35,7 +35,7 @@ namespace FurnitureAssemblyView
Dock = DockStyle.Fill
};
reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\NikBe\\source\\repos\\TP\\Hard\\Lab4\\FurnitureAssembly\\FurnitureAssemblyView\\ReportOrders.rdlc", FileMode.Open));
reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open));
Controls.Clear();
Controls.Add(reportViewer);
@ -46,7 +46,7 @@ namespace FurnitureAssemblyView
{
if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
{
MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
try
@ -62,14 +62,14 @@ namespace FurnitureAssemblyView
reportViewer.LocalReport.DataSources.Clear();
reportViewer.LocalReport.DataSources.Add(source);
var parameters = new[] { new ReportParameter("ReportParameterPeriod",
var parameters = new[] { new ReportParameter("ReportParameterPeriod",
$"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") };
reportViewer.LocalReport.SetParameters(parameters);
reportViewer.RefreshReport();
_logger.LogInformation("Загрузка списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
_logger.LogInformation("Загрузка списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
}
catch (Exception ex)
{
@ -83,11 +83,11 @@ namespace FurnitureAssemblyView
if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
{
MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
return;
}
using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
if (dialog.ShowDialog() == DialogResult.OK)
{
@ -100,13 +100,13 @@ namespace FurnitureAssemblyView
DateTo = dateTimePickerTo.Value
});
_logger.LogInformation("Сохранение списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
_logger.LogInformation("Сохранение списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка сохранения списка заказов на период");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}

2
FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.Designer.cs generated
View File

@ -78,7 +78,7 @@
buttonRef.TabIndex = 3;
buttonRef.Text = "Обновить";
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += ButtonRef_Click;
buttonRef.Click += ButtonRefresh_Click;
//
// dataGridView
//

6
FurnitureAssembly/FurnitureAssemblyView/FormWorkPieces.cs
View File

@ -40,7 +40,7 @@ namespace FurnitureAssemblyView
var list = _logic.ReadList(null);
// Растягиваем колонку Название на всю ширину, колонку Id скрываем
if(list != null)
if (list != null)
{
dataGridView.DataSource = list;
dataGridView.Columns["Id"].Visible = false;
@ -49,7 +49,7 @@ namespace FurnitureAssemblyView
_logger.LogInformation("Загрузка заготовок");
}
catch(Exception ex)
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка загрузки заготовок");
@ -120,7 +120,7 @@ namespace FurnitureAssemblyView
}
}
private void ButtonRef_Click(object sender, EventArgs e)
private void ButtonRefresh_Click(object sender, EventArgs e)
{
LoadData();
}

6
FurnitureAssembly/FurnitureAssemblyView/FurnitureAssemblyView.csproj
View File

@ -30,4 +30,10 @@
<ProjectReference Include="..\FurnitureAssemblyListImplement\FurnitureAssemblyListImplement.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="FormReportOrders.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
</ItemGroup>
</Project>