diff --git a/ComponentProgramming/Forms/MainForm.cs b/ComponentProgramming/Forms/MainForm.cs index 75fc2d6..66517e4 100644 --- a/ComponentProgramming/Forms/MainForm.cs +++ b/ComponentProgramming/Forms/MainForm.cs @@ -111,6 +111,7 @@ namespace Forms strings.Add($"{item.Name} : {item.FurnitureType}"); } largeTextComponent.CreateDocument(path, $"Отчет за {DateTime.Now.Year}", strings); + MessageBox.Show("Отчет готов"); } } @@ -139,6 +140,7 @@ namespace Forms Data = list, }; componentDocumentWithTableMultiHeaderExcel.CreateDoc(conf); + MessageBox.Show("Отчет готов"); } private void createToolStripMenuItem_Click(object sender, EventArgs e) @@ -175,6 +177,7 @@ namespace Forms Data = chart, }; componentDocumentWithChartPieWord.CreateDoc(conf); + MessageBox.Show("Отчет готов"); } } } diff --git a/ComponentProgramming/Forms/ProviderForm.cs b/ComponentProgramming/Forms/ProviderForm.cs index 7bda872..1043d68 100644 --- a/ComponentProgramming/Forms/ProviderForm.cs +++ b/ComponentProgramming/Forms/ProviderForm.cs @@ -50,7 +50,13 @@ namespace Forms }); textBoxFurnitureType.Text = view.FurnitureType; textBoxName.Text = view.Name; - if (view.DateLastDelivery != "Поставок не было") controlInputNullableDate.Value = Convert.ToDateTime(view.DateLastDelivery); + if (view.DateLastDelivery != "Поставок не было") { + controlInputNullableDate.Value = Convert.ToDateTime(view.DateLastDelivery); + } + else + { + controlInputNullableDate.Value = null; + } controlSelectedComboBoxList.SelectedElement = view!.OrganisationType; isEdited = false; }