From c6d1ff86fcc3353a2ed81a08b0d9681af4506a73 Mon Sep 17 00:00:00 2001 From: Tonb73 Date: Mon, 2 Dec 2024 11:47:54 +0300 Subject: [PATCH] =?UTF-8?q?DocReport=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=B5=D1=82.=20=D0=A2=D0=BE=20=D0=B5=D1=81=D1=82=D1=8C?= =?UTF-8?q?=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=20=D1=81=20=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=D0=B0=D0=BC=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=8E=20=D0=B3?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B2!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormTourAgency.Designer.cs | 36 +++++++++++++------ project/ProjectTourAgency/FormTourAgency.cs | 12 +++++++ project/ProjectTourAgency/FormTourAgency.resx | 4 +-- .../Forms/FormDirectoryReport.Designer.cs | 4 +-- .../ProjectTourAgency/Reports/DocReport.cs | 4 +-- 5 files changed, 43 insertions(+), 17 deletions(-) diff --git a/project/ProjectTourAgency/FormTourAgency.Designer.cs b/project/ProjectTourAgency/FormTourAgency.Designer.cs index 5c20f90..38bbaec 100644 --- a/project/ProjectTourAgency/FormTourAgency.Designer.cs +++ b/project/ProjectTourAgency/FormTourAgency.Designer.cs @@ -37,15 +37,18 @@ пополнитьБалансПользователяToolStripMenuItem = new ToolStripMenuItem(); турToolStripMenuItem = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem(); + DirectoryReportToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // // menuStrip1 // + menuStrip1.ImageScalingSize = new Size(24, 24); menuStrip1.Items.AddRange(new ToolStripItem[] { MenuToolStripMenuItem, OperationsToolStripMenuItem, отчетыToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(784, 24); + menuStrip1.Padding = new Padding(9, 3, 0, 3); + menuStrip1.Size = new Size(1120, 35); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip1"; // @@ -53,27 +56,27 @@ // MenuToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ClientsToolStripMenuItem, RotesToolStripMenuItem, EmployeesToolStripMenuItem }); MenuToolStripMenuItem.Name = "MenuToolStripMenuItem"; - MenuToolStripMenuItem.Size = new Size(94, 20); + MenuToolStripMenuItem.Size = new Size(139, 29); MenuToolStripMenuItem.Text = "Справочники"; // // ClientsToolStripMenuItem // ClientsToolStripMenuItem.Name = "ClientsToolStripMenuItem"; - ClientsToolStripMenuItem.Size = new Size(140, 22); + ClientsToolStripMenuItem.Size = new Size(212, 34); ClientsToolStripMenuItem.Text = "Клиенты"; ClientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click; // // RotesToolStripMenuItem // RotesToolStripMenuItem.Name = "RotesToolStripMenuItem"; - RotesToolStripMenuItem.Size = new Size(140, 22); + RotesToolStripMenuItem.Size = new Size(212, 34); RotesToolStripMenuItem.Text = "маршруты"; RotesToolStripMenuItem.Click += RotesToolStripMenuItem_Click; // // EmployeesToolStripMenuItem // EmployeesToolStripMenuItem.Name = "EmployeesToolStripMenuItem"; - EmployeesToolStripMenuItem.Size = new Size(140, 22); + EmployeesToolStripMenuItem.Size = new Size(212, 34); EmployeesToolStripMenuItem.Text = "Сотрудники"; EmployeesToolStripMenuItem.Click += EmployeesToolStripMenuItem_Click; // @@ -81,39 +84,49 @@ // OperationsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { пополнитьБалансПользователяToolStripMenuItem, турToolStripMenuItem }); OperationsToolStripMenuItem.Name = "OperationsToolStripMenuItem"; - OperationsToolStripMenuItem.Size = new Size(75, 20); + OperationsToolStripMenuItem.Size = new Size(112, 29); OperationsToolStripMenuItem.Text = "Операции"; // // пополнитьБалансПользователяToolStripMenuItem // пополнитьБалансПользователяToolStripMenuItem.Name = "пополнитьБалансПользователяToolStripMenuItem"; - пополнитьБалансПользователяToolStripMenuItem.Size = new Size(256, 22); + пополнитьБалансПользователяToolStripMenuItem.Size = new Size(380, 34); пополнитьБалансПользователяToolStripMenuItem.Text = "Пополнить баланс пользователя"; пополнитьБалансПользователяToolStripMenuItem.Click += AddMoneyToolStripMenuItem_Click; // // турToolStripMenuItem // турToolStripMenuItem.Name = "турToolStripMenuItem"; - турToolStripMenuItem.Size = new Size(256, 22); + турToolStripMenuItem.Size = new Size(380, 34); турToolStripMenuItem.Text = "Тур"; турToolStripMenuItem.Click += ToursToolStripMenuItem_Click; // // отчетыToolStripMenuItem // + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(60, 20); + отчетыToolStripMenuItem.Size = new Size(88, 29); отчетыToolStripMenuItem.Text = "Отчеты"; // + // DirectoryReportToolStripMenuItem + // + DirectoryReportToolStripMenuItem.Name = "DirectoryReportToolStripMenuItem"; + DirectoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W; + DirectoryReportToolStripMenuItem.Size = new Size(434, 34); + DirectoryReportToolStripMenuItem.Text = "Документы со справочниками"; + DirectoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click; + // // FormTourAgency // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(10F, 25F); AutoScaleMode = AutoScaleMode.Font; BackgroundImage = Properties.Resources.Снимок_экрана_2024_11_08_2139261; BackgroundImageLayout = ImageLayout.Stretch; - ClientSize = new Size(784, 411); + ClientSize = new Size(1120, 685); Controls.Add(menuStrip1); DoubleBuffered = true; MainMenuStrip = menuStrip1; + Margin = new Padding(4, 5, 4, 5); Name = "FormTourAgency"; StartPosition = FormStartPosition.CenterScreen; Text = "Тур Агенство"; @@ -134,5 +147,6 @@ private ToolStripMenuItem EmployeesToolStripMenuItem; private ToolStripMenuItem пополнитьБалансПользователяToolStripMenuItem; private ToolStripMenuItem турToolStripMenuItem; + private ToolStripMenuItem DirectoryReportToolStripMenuItem; } } diff --git a/project/ProjectTourAgency/FormTourAgency.cs b/project/ProjectTourAgency/FormTourAgency.cs index aca7679..d916d09 100644 --- a/project/ProjectTourAgency/FormTourAgency.cs +++ b/project/ProjectTourAgency/FormTourAgency.cs @@ -73,4 +73,16 @@ public partial class FormTourAgency : Form MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + private void DirectoryReportToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } diff --git a/project/ProjectTourAgency/FormTourAgency.resx b/project/ProjectTourAgency/FormTourAgency.resx index a0623c8..b48baf1 100644 --- a/project/ProjectTourAgency/FormTourAgency.resx +++ b/project/ProjectTourAgency/FormTourAgency.resx @@ -1,7 +1,7 @@