diff --git a/WinFormUchetLab/PluginsApp/FormMain.cs b/WinFormUchetLab/PluginsApp/FormMain.cs index 5b8af73..110abf7 100644 --- a/WinFormUchetLab/PluginsApp/FormMain.cs +++ b/WinFormUchetLab/PluginsApp/FormMain.cs @@ -154,7 +154,7 @@ namespace PluginsApp } } - private void CreateSimpleDoc() + private void CreateChartDoc() { using var dialog = new SaveFileDialog { @@ -164,7 +164,33 @@ namespace PluginsApp { try { - if (_plugins[_selectedPlugin].CreateSimpleDocument(new PluginsConventionSaveDocument() { FileName = dialog.FileName })) + if (_plugins[_selectedPlugin].CreateSimpleDocument(new PluginsConventionSaveDocument() { FileName = dialog.FileName.ToString() })) + { + MessageBox.Show("Документ сохранен", "Создание документа", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Ошибка при создании документа", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + catch (Exception ex) + { + MessageBox.Show("Произошла ошибка: " + ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void CreateSimpleDoc() + { + using var dialog = new SaveFileDialog + { + Filter = "PDF Files|*.pdf" + }; + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + if (_plugins[_selectedPlugin].CreateTableDocument(new PluginsConventionSaveDocument() { FileName = dialog.FileName.ToString() })) { MessageBox.Show("Документ сохранен", "Создание документа", MessageBoxButtons.OK, MessageBoxIcon.Information); } @@ -181,32 +207,6 @@ namespace PluginsApp } private void CreateTableDoc() - { - using var dialog = new SaveFileDialog - { - Filter = "PDF Files|*.pdf" - }; - if (dialog.ShowDialog() == DialogResult.OK) - { - try - { - if (_plugins[_selectedPlugin].CreateTableDocument(new PluginsConventionSaveDocument() { FileName = dialog.FileName })) - { - MessageBox.Show("Документ сохранен", "Создание документа", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - else - { - MessageBox.Show("Ошибка при создании документа", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - catch (Exception ex) - { - MessageBox.Show("Произошла ошибка: " + ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - - private void CreateChartDoc() { using var dialog = new SaveFileDialog { @@ -216,7 +216,7 @@ namespace PluginsApp { try { - if (_plugins[_selectedPlugin].CreateChartDocument(new PluginsConventionSaveDocument() { FileName = dialog.FileName })) + if (_plugins[_selectedPlugin].CreateChartDocument(new PluginsConventionSaveDocument() { FileName = dialog.FileName.ToString() })) { MessageBox.Show("Документ сохранен", "Создание документа", MessageBoxButtons.OK, MessageBoxIcon.Information); } diff --git a/WinFormUchetLab/PluginsApp/PluginsApp.csproj b/WinFormUchetLab/PluginsApp/PluginsApp.csproj index 902ed04..9115f30 100644 --- a/WinFormUchetLab/PluginsApp/PluginsApp.csproj +++ b/WinFormUchetLab/PluginsApp/PluginsApp.csproj @@ -13,6 +13,7 @@ + diff --git a/WinFormUchetLab/PluginsApp/plugins/Microsoft.Data.SqlClient.dll b/WinFormUchetLab/PluginsApp/plugins/Microsoft.Data.SqlClient.dll deleted file mode 100644 index 087fa83..0000000 Binary files a/WinFormUchetLab/PluginsApp/plugins/Microsoft.Data.SqlClient.dll and /dev/null differ diff --git a/WinFormUchetLab/PluginsApp/plugins/PluginsConventionLibrary.dll b/WinFormUchetLab/PluginsApp/plugins/PluginsConventionLibrary.dll new file mode 100644 index 0000000..3bc244a Binary files /dev/null and b/WinFormUchetLab/PluginsApp/plugins/PluginsConventionLibrary.dll differ diff --git a/WinFormUchetLab/PluginsApp/plugins/UchetLabBusinessLogic.dll b/WinFormUchetLab/PluginsApp/plugins/UchetLabBusinessLogic.dll index 541d18d..21f336d 100644 Binary files a/WinFormUchetLab/PluginsApp/plugins/UchetLabBusinessLogic.dll and b/WinFormUchetLab/PluginsApp/plugins/UchetLabBusinessLogic.dll differ diff --git a/WinFormUchetLab/PluginsApp/plugins/UchetLabContracts.dll b/WinFormUchetLab/PluginsApp/plugins/UchetLabContracts.dll index f01a4b7..c02bf84 100644 Binary files a/WinFormUchetLab/PluginsApp/plugins/UchetLabContracts.dll and b/WinFormUchetLab/PluginsApp/plugins/UchetLabContracts.dll differ diff --git a/WinFormUchetLab/PluginsApp/plugins/UchetLabDataModels.dll b/WinFormUchetLab/PluginsApp/plugins/UchetLabDataModels.dll index 67a3e2c..41cf663 100644 Binary files a/WinFormUchetLab/PluginsApp/plugins/UchetLabDataModels.dll and b/WinFormUchetLab/PluginsApp/plugins/UchetLabDataModels.dll differ diff --git a/WinFormUchetLab/PluginsApp/plugins/UchetLabDatabaseImplement.dll b/WinFormUchetLab/PluginsApp/plugins/UchetLabDatabaseImplement.dll index 583e73a..a849c89 100644 Binary files a/WinFormUchetLab/PluginsApp/plugins/UchetLabDatabaseImplement.dll and b/WinFormUchetLab/PluginsApp/plugins/UchetLabDatabaseImplement.dll differ diff --git a/WinFormUchetLab/PluginsApp/plugins/WinFormUchetLab.dll b/WinFormUchetLab/PluginsApp/plugins/WinFormUchetLab.dll index 6f7e99a..cb95cfe 100644 Binary files a/WinFormUchetLab/PluginsApp/plugins/WinFormUchetLab.dll and b/WinFormUchetLab/PluginsApp/plugins/WinFormUchetLab.dll differ diff --git a/WinFormUchetLab/WinFormUchetLab/PluginsConvention.cs b/WinFormUchetLab/WinFormUchetLab/PluginsConvention.cs index 3cfecb2..3d7aacc 100644 --- a/WinFormUchetLab/WinFormUchetLab/PluginsConvention.cs +++ b/WinFormUchetLab/WinFormUchetLab/PluginsConvention.cs @@ -174,7 +174,7 @@ namespace WinFormUchetLab images.Add(item.TaskImage); } string[] imagesArray = images.ToArray(); - _pdfImage.CreatePdfDoc(new DataForImage(saveDocument.FileName, "Сканы чеков", imagesArray)); + _pdfImage.CreatePdfDoc(new DataForImage(saveDocument.FileName, "Картинки для лаб", imagesArray)); return true; } return false;