From def6f654b1fd1d4c759f27afd5ff5b3d5bc61bd8 Mon Sep 17 00:00:00 2001 From: Ivan_Starostin Date: Sun, 2 Jun 2024 18:36:00 +0400 Subject: [PATCH] Upload files to 'ShipyardView' --- ShipyardView/FormMain.Designer.cs | 13 ++- ShipyardView/FormMain.cs | 9 ++ ShipyardView/ViewMailForm.Designer.cs | 62 +++++++++++++ ShipyardView/ViewMailForm.cs | 50 +++++++++++ ShipyardView/ViewMailForm.resx | 120 ++++++++++++++++++++++++++ 5 files changed, 252 insertions(+), 2 deletions(-) create mode 100644 ShipyardView/ViewMailForm.Designer.cs create mode 100644 ShipyardView/ViewMailForm.cs create mode 100644 ShipyardView/ViewMailForm.resx diff --git a/ShipyardView/FormMain.Designer.cs b/ShipyardView/FormMain.Designer.cs index da81f74..cbaa404 100644 --- a/ShipyardView/FormMain.Designer.cs +++ b/ShipyardView/FormMain.Designer.cs @@ -44,6 +44,7 @@ ClientsToolStripMenuItem = new ToolStripMenuItem(); ImplementersToolStripMenuItem = new ToolStripMenuItem(); StartWorkingToolStripMenuItem = new ToolStripMenuItem(); + mailToolStripMenuItem = new ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); menuStrip1.SuspendLayout(); SuspendLayout(); @@ -76,7 +77,7 @@ // // ButtonCreateOrder // - ButtonCreateOrder.Location = new Point(1117, 179); + ButtonCreateOrder.Location = new Point(1117, 155); ButtonCreateOrder.Name = "ButtonCreateOrder"; ButtonCreateOrder.Size = new Size(146, 43); ButtonCreateOrder.TabIndex = 5; @@ -97,7 +98,7 @@ // menuStrip1 // menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { ReportstoolStrip, GuidesToolStripMenuItem, StartWorkingToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { ReportstoolStrip, GuidesToolStripMenuItem, StartWorkingToolStripMenuItem, mailToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(1285, 28); @@ -174,6 +175,13 @@ StartWorkingToolStripMenuItem.Text = "запуск работ"; StartWorkingToolStripMenuItem.Click += StartWorkingToolStripMenuItem_Click; // + // mailToolStripMenuItem + // + mailToolStripMenuItem.Name = "mailToolStripMenuItem"; + mailToolStripMenuItem.Size = new Size(75, 24); + mailToolStripMenuItem.Text = "письма"; + mailToolStripMenuItem.Click += mailToolStripMenuItem_Click; + // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -212,5 +220,6 @@ private ToolStripMenuItem ClientsToolStripMenuItem; private ToolStripMenuItem StartWorkingToolStripMenuItem; private ToolStripMenuItem ImplementersToolStripMenuItem; + private ToolStripMenuItem mailToolStripMenuItem; } } \ No newline at end of file diff --git a/ShipyardView/FormMain.cs b/ShipyardView/FormMain.cs index 819e063..0af5517 100644 --- a/ShipyardView/FormMain.cs +++ b/ShipyardView/FormMain.cs @@ -225,5 +225,14 @@ namespace ShipyardView form.ShowDialog(); } } + + private void mailToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(ViewMailForm)); + if (service is ViewMailForm form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/ShipyardView/ViewMailForm.Designer.cs b/ShipyardView/ViewMailForm.Designer.cs new file mode 100644 index 0000000..355434f --- /dev/null +++ b/ShipyardView/ViewMailForm.Designer.cs @@ -0,0 +1,62 @@ +namespace ShipyardView +{ + partial class ViewMailForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(12, 74); + dataGridView.Name = "dataGridView"; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 29; + dataGridView.Size = new Size(776, 188); + dataGridView.TabIndex = 0; + // + // ViewMailForm + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(dataGridView); + Name = "ViewMailForm"; + Text = "ViewMailForm"; + Load += ViewMailForm_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/ShipyardView/ViewMailForm.cs b/ShipyardView/ViewMailForm.cs new file mode 100644 index 0000000..cef8b29 --- /dev/null +++ b/ShipyardView/ViewMailForm.cs @@ -0,0 +1,50 @@ +using Microsoft.Extensions.Logging; +using ShipyardContracts.BusinessLogicContracts; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ShipyardView +{ + public partial class ViewMailForm : Form + { + private readonly ILogger _logger; + private readonly IMessageInfoLogic _logic; + public ViewMailForm(ILogger logger, IMessageInfoLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void ViewMailForm_Load(object sender, EventArgs e) + { + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["MessageId"].Visible = false; + dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка списка писем"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки писем"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + } +} diff --git a/ShipyardView/ViewMailForm.resx b/ShipyardView/ViewMailForm.resx new file mode 100644 index 0000000..0f362c9 --- /dev/null +++ b/ShipyardView/ViewMailForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file