diff --git a/Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs b/Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs
index b5a69f4..8ea6c7f 100644
--- a/Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs
+++ b/Confectionery/ConfectioneryDatabaseImplement/ConfectioneryDatabase.cs
@@ -15,7 +15,7 @@ namespace ConfectioneryDatabaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
- optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ConfectioneryDatabase7New;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+ optionsBuilder.UseSqlServer(@"Data Source=localhost\SQLEXPRESS;Initial Catalog=ConfectioneryDatabase77;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
}
base.OnConfiguring(optionsBuilder);
}
diff --git a/Confectionery/ConfectioneryDatabaseImplement/Migrations/20240603205141_InitialMail.Designer.cs b/Confectionery/ConfectioneryDatabaseImplement/Migrations/20240603205141_InitialMail.Designer.cs
new file mode 100644
index 0000000..d286144
--- /dev/null
+++ b/Confectionery/ConfectioneryDatabaseImplement/Migrations/20240603205141_InitialMail.Designer.cs
@@ -0,0 +1,298 @@
+//
+using System;
+using ConfectioneryDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace ConfectioneryDatabaseImplement.Migrations
+{
+ [DbContext(typeof(ConfectioneryDatabase))]
+ [Migration("20240603205141_InitialMail")]
+ partial class InitialMail
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "7.0.17")
+ .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+ SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ClientFIO")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Email")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Password")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("Id");
+
+ b.ToTable("Clients");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ComponentName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Cost")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.ToTable("Components");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Implementer", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ImplementerFIO")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Password")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Qualification")
+ .HasColumnType("int");
+
+ b.Property("WorkExperience")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.ToTable("Implementers");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.MessageInfo", b =>
+ {
+ b.Property("MessageId")
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("Body")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ClientId")
+ .HasColumnType("int");
+
+ b.Property("DateDelivery")
+ .HasColumnType("datetime2");
+
+ b.Property("SenderName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Subject")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("MessageId");
+
+ b.HasIndex("ClientId");
+
+ b.ToTable("MessageInfos");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ClientId")
+ .HasColumnType("int");
+
+ b.Property("Count")
+ .HasColumnType("int");
+
+ b.Property("DateCreate")
+ .HasColumnType("datetime2");
+
+ b.Property("DateImplement")
+ .HasColumnType("datetime2");
+
+ b.Property("ImplementerId")
+ .HasColumnType("int");
+
+ b.Property("PastryId")
+ .HasColumnType("int");
+
+ b.Property("Status")
+ .HasColumnType("int");
+
+ b.Property("Sum")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ClientId");
+
+ b.HasIndex("ImplementerId");
+
+ b.HasIndex("PastryId");
+
+ b.ToTable("Orders");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("PastryName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Price")
+ .HasColumnType("float");
+
+ b.HasKey("Id");
+
+ b.ToTable("Pastrys");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("ComponentId")
+ .HasColumnType("int");
+
+ b.Property("Count")
+ .HasColumnType("int");
+
+ b.Property("PastryId")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ComponentId");
+
+ b.HasIndex("PastryId");
+
+ b.ToTable("PastryComponents");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.MessageInfo", b =>
+ {
+ b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
+ .WithMany("ClientMessages")
+ .HasForeignKey("ClientId");
+
+ b.Navigation("Client");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
+ {
+ b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
+ .WithMany("ClientOrders")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("ConfectioneryDatabaseImplement.Models.Implementer", "Implementer")
+ .WithMany("Order")
+ .HasForeignKey("ImplementerId");
+
+ b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
+ .WithMany("Orders")
+ .HasForeignKey("PastryId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Client");
+
+ b.Navigation("Implementer");
+
+ b.Navigation("Pastry");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.PastryComponent", b =>
+ {
+ b.HasOne("ConfectioneryDatabaseImplement.Models.Component", "Component")
+ .WithMany("PastryComponents")
+ .HasForeignKey("ComponentId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("ConfectioneryDatabaseImplement.Models.Pastry", "Pastry")
+ .WithMany("Components")
+ .HasForeignKey("PastryId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("Component");
+
+ b.Navigation("Pastry");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
+ {
+ b.Navigation("ClientMessages");
+
+ b.Navigation("ClientOrders");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
+ {
+ b.Navigation("PastryComponents");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Implementer", b =>
+ {
+ b.Navigation("Order");
+ });
+
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Pastry", b =>
+ {
+ b.Navigation("Components");
+
+ b.Navigation("Orders");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/Confectionery/ConfectioneryDatabaseImplement/Migrations/20240603205141_InitialMail.cs b/Confectionery/ConfectioneryDatabaseImplement/Migrations/20240603205141_InitialMail.cs
new file mode 100644
index 0000000..2b76485
--- /dev/null
+++ b/Confectionery/ConfectioneryDatabaseImplement/Migrations/20240603205141_InitialMail.cs
@@ -0,0 +1,48 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ConfectioneryDatabaseImplement.Migrations
+{
+ ///
+ public partial class InitialMail : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.CreateTable(
+ name: "MessageInfos",
+ columns: table => new
+ {
+ MessageId = table.Column(type: "nvarchar(450)", nullable: false),
+ ClientId = table.Column(type: "int", nullable: true),
+ SenderName = table.Column(type: "nvarchar(max)", nullable: false),
+ DateDelivery = table.Column(type: "datetime2", nullable: false),
+ Subject = table.Column(type: "nvarchar(max)", nullable: false),
+ Body = table.Column(type: "nvarchar(max)", nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_MessageInfos", x => x.MessageId);
+ table.ForeignKey(
+ name: "FK_MessageInfos_Clients_ClientId",
+ column: x => x.ClientId,
+ principalTable: "Clients",
+ principalColumn: "Id");
+ });
+
+ migrationBuilder.CreateIndex(
+ name: "IX_MessageInfos_ClientId",
+ table: "MessageInfos",
+ column: "ClientId");
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropTable(
+ name: "MessageInfos");
+ }
+ }
+}
diff --git a/Confectionery/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs b/Confectionery/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs
index 605726a..bbf5663 100644
--- a/Confectionery/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs
+++ b/Confectionery/ConfectioneryDatabaseImplement/Migrations/ConfectioneryDatabaseModelSnapshot.cs
@@ -94,6 +94,36 @@ namespace ConfectioneryDatabaseImplement.Migrations
b.ToTable("Implementers");
});
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.MessageInfo", b =>
+ {
+ b.Property("MessageId")
+ .HasColumnType("nvarchar(450)");
+
+ b.Property("Body")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ClientId")
+ .HasColumnType("int");
+
+ b.Property("DateDelivery")
+ .HasColumnType("datetime2");
+
+ b.Property("SenderName")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Subject")
+ .IsRequired()
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("MessageId");
+
+ b.HasIndex("ClientId");
+
+ b.ToTable("MessageInfos");
+ });
+
modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
{
b.Property("Id")
@@ -183,10 +213,19 @@ namespace ConfectioneryDatabaseImplement.Migrations
b.ToTable("PastryComponents");
});
+ modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.MessageInfo", b =>
+ {
+ b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
+ .WithMany("ClientMessages")
+ .HasForeignKey("ClientId");
+
+ b.Navigation("Client");
+ });
+
modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Order", b =>
{
b.HasOne("ConfectioneryDatabaseImplement.Models.Client", "Client")
- .WithMany("Orders")
+ .WithMany("ClientOrders")
.HasForeignKey("ClientId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@@ -229,7 +268,9 @@ namespace ConfectioneryDatabaseImplement.Migrations
modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Client", b =>
{
- b.Navigation("Orders");
+ b.Navigation("ClientMessages");
+
+ b.Navigation("ClientOrders");
});
modelBuilder.Entity("ConfectioneryDatabaseImplement.Models.Component", b =>
diff --git a/Confectionery/ConfectioneryView/FormMail.Designer.cs b/Confectionery/ConfectioneryView/FormMail.Designer.cs
new file mode 100644
index 0000000..de33a3b
--- /dev/null
+++ b/Confectionery/ConfectioneryView/FormMail.Designer.cs
@@ -0,0 +1,61 @@
+namespace ConfectioneryView
+{
+ partial class FormMail
+ {
+ ///
+ /// 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, 12);
+ dataGridView.Name = "dataGridView";
+ dataGridView.RowHeadersWidth = 62;
+ dataGridView.Size = new Size(953, 465);
+ dataGridView.TabIndex = 0;
+ //
+ // FormMail
+ //
+ AutoScaleDimensions = new SizeF(10F, 25F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(977, 489);
+ Controls.Add(dataGridView);
+ Name = "FormMail";
+ Text = "Письма";
+ Load += FormMail_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private DataGridView dataGridView;
+ }
+}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryView/FormMail.cs b/Confectionery/ConfectioneryView/FormMail.cs
new file mode 100644
index 0000000..3def25c
--- /dev/null
+++ b/Confectionery/ConfectioneryView/FormMail.cs
@@ -0,0 +1,54 @@
+using ConfectioneryContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+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 ConfectioneryView
+{
+ public partial class FormMail : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IMessageInfoLogic _logic;
+
+ public FormMail(ILogger logger, IMessageInfoLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+
+ private void LoadData()
+ {
+ try
+ {
+ var list = _logic.ReadList(null);
+ if (list != null)
+ {
+ dataGridView.DataSource = list;
+ dataGridView.Columns["MessageId"].Visible = false;
+ dataGridView.Columns["ClientId"].Visible = false;
+ dataGridView.Columns["Body"].AutoSizeMode =
+ DataGridViewAutoSizeColumnMode.Fill;
+ }
+ _logger.LogInformation("Загрузка почтовых собщений");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки почтовых сообщений");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+
+ private void FormMail_Load(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+ }
+}
diff --git a/Confectionery/ConfectioneryView/FormMail.resx b/Confectionery/ConfectioneryView/FormMail.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/Confectionery/ConfectioneryView/FormMail.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
diff --git a/Confectionery/ConfectioneryView/FormMain.Designer.cs b/Confectionery/ConfectioneryView/FormMain.Designer.cs
index d049394..7803f70 100644
--- a/Confectionery/ConfectioneryView/FormMain.Designer.cs
+++ b/Confectionery/ConfectioneryView/FormMain.Designer.cs
@@ -34,6 +34,7 @@
componentsToolStripMenuItem = new ToolStripMenuItem();
pastryToolStripMenuItem = new ToolStripMenuItem();
clientsToolStripMenuItem = new ToolStripMenuItem();
+ implementersToolStripMenuItem = new ToolStripMenuItem();
отчетыToolStripMenuItem = new ToolStripMenuItem();
pastrysListToolStripMenuItem = new ToolStripMenuItem();
componentPastryToolStripMenuItem = new ToolStripMenuItem();
@@ -44,7 +45,7 @@
buttonOrderReady = new Button();
buttonIssuedOrder = new Button();
buttonRef = new Button();
- implementersToolStripMenuItem = new ToolStripMenuItem();
+ mailToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
menuStrip.SuspendLayout();
SuspendLayout();
@@ -62,7 +63,7 @@
// menuStrip
//
menuStrip.ImageScalingSize = new Size(24, 24);
- menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem, startWorkToolStripMenuItem });
+ menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem, startWorkToolStripMenuItem, mailToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1666, 33);
@@ -97,6 +98,13 @@
clientsToolStripMenuItem.Text = "Клиенты";
clientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click;
//
+ // implementersToolStripMenuItem
+ //
+ implementersToolStripMenuItem.Name = "implementersToolStripMenuItem";
+ implementersToolStripMenuItem.Size = new Size(298, 34);
+ implementersToolStripMenuItem.Text = "Исполнители";
+ implementersToolStripMenuItem.Click += implementersToolStripMenuItem_Click;
+ //
// отчетыToolStripMenuItem
//
отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { pastrysListToolStripMenuItem, componentPastryToolStripMenuItem, ordersListToolStripMenuItem });
@@ -187,12 +195,12 @@
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += buttonRef_Click;
//
- // implementersToolStripMenuItem
+ // mailToolStripMenuItem
//
- implementersToolStripMenuItem.Name = "implementersToolStripMenuItem";
- implementersToolStripMenuItem.Size = new Size(298, 34);
- implementersToolStripMenuItem.Text = "Исполнители";
- implementersToolStripMenuItem.Click += implementersToolStripMenuItem_Click_1;
+ mailToolStripMenuItem.Name = "mailToolStripMenuItem";
+ mailToolStripMenuItem.Size = new Size(90, 29);
+ mailToolStripMenuItem.Text = "Письма";
+ mailToolStripMenuItem.Click += mailToolStripMenuItem_Click;
//
// FormMain
//
@@ -236,5 +244,6 @@
private ToolStripMenuItem clientsToolStripMenuItem;
private ToolStripMenuItem startWorkToolStripMenuItem;
private ToolStripMenuItem implementersToolStripMenuItem;
+ private ToolStripMenuItem mailToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/Confectionery/ConfectioneryView/FormMain.cs b/Confectionery/ConfectioneryView/FormMain.cs
index 37bc800..03aa49d 100644
--- a/Confectionery/ConfectioneryView/FormMain.cs
+++ b/Confectionery/ConfectioneryView/FormMain.cs
@@ -43,6 +43,7 @@ namespace ConfectioneryView
dataGridView.DataSource = list;
dataGridView.Columns["PastryId"].Visible = false;
dataGridView.Columns["ClientId"].Visible = false;
+ dataGridView.Columns["ClientEmail"].Visible = false;
dataGridView.Columns["ImplementerId"].Visible = false;
dataGridView.Columns["PastryName"].AutoSizeMode =
DataGridViewAutoSizeColumnMode.Fill;
@@ -207,13 +208,7 @@ namespace ConfectioneryView
}
}
- private void startWorkToolStripMenuItem_Click(object sender, EventArgs e)
- {
- _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
- MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
- }
-
- private void implementersToolStripMenuItem_Click_1(object sender, EventArgs e)
+ private void implementersToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
if (service is FormImplementers form)
@@ -221,5 +216,20 @@ namespace ConfectioneryView
form.ShowDialog();
}
}
+
+ private void startWorkToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
+ MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+
+ private void mailToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormMail));
+ if (service is FormMail form)
+ {
+ form.ShowDialog();
+ }
+ }
}
}
diff --git a/Confectionery/ConfectioneryView/Program.cs b/Confectionery/ConfectioneryView/Program.cs
index ac928bb..0ce7e90 100644
--- a/Confectionery/ConfectioneryView/Program.cs
+++ b/Confectionery/ConfectioneryView/Program.cs
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
using ConfectioneryBusinessLogic.BusinessLogics;
using Microsoft.EntityFrameworkCore.Design;
+using ConfectioneryContracts.BindingModels;
namespace ConfectioneryView
{
@@ -27,6 +28,26 @@ namespace ConfectioneryView
var services = new ServiceCollection();
ConfigureServices(services);
_serviceProvider = services.BuildServiceProvider();
+ try
+ {
+ var mailSender = _serviceProvider.GetService();
+ mailSender?.MailConfig(new MailConfigBindingModel
+ {
+ MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
+ MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
+ SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty,
+ SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]),
+ PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty,
+ PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"])
+ });
+
+ var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
+ }
+ catch (Exception ex)
+ {
+ var logger = _serviceProvider.GetService();
+ logger?.LogError(ex, "Mails Problem");
+ }
Application.Run(_serviceProvider.GetRequiredService());
}
private static void ConfigureServices(ServiceCollection services)
@@ -39,18 +60,24 @@ namespace ConfectioneryView
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
+
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
+
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddSingleton();
+
services.AddTransient();
services.AddTransient();
services.AddTransient();
@@ -63,7 +90,10 @@ namespace ConfectioneryView
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
+
services.AddTransient();
}
+ private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck();
}
}
\ No newline at end of file