Все готово
This commit is contained in:
parent
607a58a752
commit
643cb4b963
152
Shipyard/Shipyard/FormMail.Designer.cs
generated
Normal file
152
Shipyard/Shipyard/FormMail.Designer.cs
generated
Normal file
@ -0,0 +1,152 @@
|
||||
namespace ShipyardView
|
||||
{
|
||||
partial class FormMail
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Windows Form Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.textBoxSender = new System.Windows.Forms.TextBox();
|
||||
this.textBoxSubject = new System.Windows.Forms.TextBox();
|
||||
this.textBoxBody = new System.Windows.Forms.TextBox();
|
||||
this.labelSenderName = new System.Windows.Forms.Label();
|
||||
this.labelSubject = new System.Windows.Forms.Label();
|
||||
this.labelBody = new System.Windows.Forms.Label();
|
||||
this.textBoxAnswer = new System.Windows.Forms.TextBox();
|
||||
this.labelAnswer = new System.Windows.Forms.Label();
|
||||
this.buttonSend = new System.Windows.Forms.Button();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// textBoxSender
|
||||
//
|
||||
this.textBoxSender.Location = new System.Drawing.Point(12, 36);
|
||||
this.textBoxSender.Name = "textBoxSender";
|
||||
this.textBoxSender.Size = new System.Drawing.Size(193, 27);
|
||||
this.textBoxSender.TabIndex = 0;
|
||||
//
|
||||
// textBoxSubject
|
||||
//
|
||||
this.textBoxSubject.Location = new System.Drawing.Point(12, 88);
|
||||
this.textBoxSubject.Name = "textBoxSubject";
|
||||
this.textBoxSubject.Size = new System.Drawing.Size(193, 27);
|
||||
this.textBoxSubject.TabIndex = 1;
|
||||
//
|
||||
// textBoxBody
|
||||
//
|
||||
this.textBoxBody.Location = new System.Drawing.Point(12, 141);
|
||||
this.textBoxBody.Multiline = true;
|
||||
this.textBoxBody.Name = "textBoxBody";
|
||||
this.textBoxBody.Size = new System.Drawing.Size(193, 104);
|
||||
this.textBoxBody.TabIndex = 2;
|
||||
//
|
||||
// labelSenderName
|
||||
//
|
||||
this.labelSenderName.AutoSize = true;
|
||||
this.labelSenderName.Location = new System.Drawing.Point(12, 9);
|
||||
this.labelSenderName.Name = "labelSenderName";
|
||||
this.labelSenderName.Size = new System.Drawing.Size(99, 20);
|
||||
this.labelSenderName.TabIndex = 3;
|
||||
this.labelSenderName.Text = "Отправитель";
|
||||
//
|
||||
// labelSubject
|
||||
//
|
||||
this.labelSubject.AutoSize = true;
|
||||
this.labelSubject.Location = new System.Drawing.Point(12, 66);
|
||||
this.labelSubject.Name = "labelSubject";
|
||||
this.labelSubject.Size = new System.Drawing.Size(81, 20);
|
||||
this.labelSubject.TabIndex = 4;
|
||||
this.labelSubject.Text = "Заголовок";
|
||||
//
|
||||
// labelBody
|
||||
//
|
||||
this.labelBody.AutoSize = true;
|
||||
this.labelBody.Location = new System.Drawing.Point(12, 118);
|
||||
this.labelBody.Name = "labelBody";
|
||||
this.labelBody.Size = new System.Drawing.Size(100, 20);
|
||||
this.labelBody.TabIndex = 5;
|
||||
this.labelBody.Text = "Содержимое";
|
||||
//
|
||||
// textBoxAnswer
|
||||
//
|
||||
this.textBoxAnswer.Location = new System.Drawing.Point(367, 36);
|
||||
this.textBoxAnswer.Multiline = true;
|
||||
this.textBoxAnswer.Name = "textBoxAnswer";
|
||||
this.textBoxAnswer.Size = new System.Drawing.Size(273, 79);
|
||||
this.textBoxAnswer.TabIndex = 6;
|
||||
//
|
||||
// labelAnswer
|
||||
//
|
||||
this.labelAnswer.AutoSize = true;
|
||||
this.labelAnswer.Location = new System.Drawing.Point(367, 9);
|
||||
this.labelAnswer.Name = "labelAnswer";
|
||||
this.labelAnswer.Size = new System.Drawing.Size(48, 20);
|
||||
this.labelAnswer.TabIndex = 7;
|
||||
this.labelAnswer.Text = "Ответ";
|
||||
//
|
||||
// buttonSend
|
||||
//
|
||||
this.buttonSend.Location = new System.Drawing.Point(367, 140);
|
||||
this.buttonSend.Name = "buttonSend";
|
||||
this.buttonSend.Size = new System.Drawing.Size(273, 29);
|
||||
this.buttonSend.TabIndex = 8;
|
||||
this.buttonSend.Text = "Отослать";
|
||||
this.buttonSend.UseVisualStyleBackColor = true;
|
||||
this.buttonSend.Click += new System.EventHandler(this.ButtonSend_Click);
|
||||
//
|
||||
// FormMail
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(655, 274);
|
||||
this.Controls.Add(this.buttonSend);
|
||||
this.Controls.Add(this.labelAnswer);
|
||||
this.Controls.Add(this.textBoxAnswer);
|
||||
this.Controls.Add(this.labelBody);
|
||||
this.Controls.Add(this.labelSubject);
|
||||
this.Controls.Add(this.labelSenderName);
|
||||
this.Controls.Add(this.textBoxBody);
|
||||
this.Controls.Add(this.textBoxSubject);
|
||||
this.Controls.Add(this.textBoxSender);
|
||||
this.Name = "FormMail";
|
||||
this.Text = "Письмо";
|
||||
this.Load += new System.EventHandler(this.FormMail_Load);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private TextBox textBoxSender;
|
||||
private TextBox textBoxSubject;
|
||||
private TextBox textBoxBody;
|
||||
private Label labelSenderName;
|
||||
private Label labelSubject;
|
||||
private Label labelBody;
|
||||
private TextBox textBoxAnswer;
|
||||
private Label labelAnswer;
|
||||
private Button buttonSend;
|
||||
}
|
||||
}
|
112
Shipyard/Shipyard/FormMail.cs
Normal file
112
Shipyard/Shipyard/FormMail.cs
Normal file
@ -0,0 +1,112 @@
|
||||
using Microsoft.Extensions.Logging;
|
||||
using ShipyardBusinessLogic.MailWorker;
|
||||
using ShipyardContracts.BusinessLogicsContracts;
|
||||
using ShipyardContracts.SearchModels;
|
||||
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 FormMail : Form
|
||||
{
|
||||
private readonly ILogger _logger;
|
||||
private readonly IMessageInfoLogic _logic;
|
||||
private readonly AbstractMailWorker _mailWorker;
|
||||
private readonly IClientLogic _clientLogic;
|
||||
private string? _id;
|
||||
public string Id { set { _id = value; } }
|
||||
public FormMail(ILogger<FormMail> logger,IMessageInfoLogic messageInfoLogic,AbstractMailWorker abstractMailWorker,IClientLogic clientLogic)
|
||||
{
|
||||
InitializeComponent();
|
||||
_logger= logger;
|
||||
_logic= messageInfoLogic;
|
||||
_clientLogic= clientLogic;
|
||||
_mailWorker= abstractMailWorker;
|
||||
}
|
||||
private void ButtonSend_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (string.IsNullOrEmpty(textBoxBody.Text))
|
||||
{
|
||||
MessageBox.Show("Заполните содержимое письма", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
return;
|
||||
}
|
||||
_logger.LogInformation("Отправка ответа");
|
||||
try
|
||||
{
|
||||
var view = _logic.ReadElement(new() { MessageId = _id });
|
||||
if (view != null)
|
||||
{
|
||||
var operationResult = _logic.Update(new()
|
||||
{
|
||||
MessageId = view.MessageId,
|
||||
IsRead = view.IsRead,
|
||||
AnswerText = textBoxAnswer.Text
|
||||
});
|
||||
if (!operationResult)
|
||||
{
|
||||
throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
|
||||
}
|
||||
_mailWorker.MailSendAsync(new()
|
||||
{
|
||||
MailAddress = _clientLogic.ReadElement(new ClientSearchModel { Id = view.ClientId })!.Email,
|
||||
Subject = textBoxSubject.Text,
|
||||
Text = textBoxAnswer.Text,
|
||||
});
|
||||
MessageBox.Show("Сохранение и отправление прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
DialogResult = DialogResult.OK;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Ошибка сохранения исполнителя");
|
||||
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
private void FormMail_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(_id))
|
||||
{
|
||||
try
|
||||
{
|
||||
_logger.LogInformation("Получение письма");
|
||||
var view = _logic.ReadElement(new MessageInfoSearchModel
|
||||
{
|
||||
MessageId= _id
|
||||
});
|
||||
if (view != null)
|
||||
{
|
||||
textBoxSender.Text = view.SenderName;
|
||||
textBoxSubject.Text = view.Subject;
|
||||
textBoxBody.Text = view.Body;
|
||||
}
|
||||
if (!view.IsRead)
|
||||
{
|
||||
var updateResult = _logic.Update(new()
|
||||
{
|
||||
MessageId = _id,
|
||||
AnswerText=view.AnswerText,
|
||||
IsRead = true,
|
||||
});
|
||||
if (!updateResult)
|
||||
{
|
||||
throw new Exception("Ошибка при обновлении");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Ошибка получения письма");
|
||||
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
|
||||
MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
60
Shipyard/Shipyard/FormMail.resx
Normal file
60
Shipyard/Shipyard/FormMail.resx
Normal file
@ -0,0 +1,60 @@
|
||||
<root>
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
1
Shipyard/Shipyard/FormMails.Designer.cs
generated
1
Shipyard/Shipyard/FormMails.Designer.cs
generated
@ -74,6 +74,7 @@
|
||||
this.buttonOpen.TabIndex = 3;
|
||||
this.buttonOpen.Text = "Открыть";
|
||||
this.buttonOpen.UseVisualStyleBackColor = true;
|
||||
this.buttonOpen.Click += new System.EventHandler(this.ButtonOpen_Click);
|
||||
//
|
||||
// FormMails
|
||||
//
|
||||
|
@ -36,7 +36,6 @@ namespace ShipyardView
|
||||
dataGridView.DataSource = list;
|
||||
dataGridView.Columns["MessageId"].Visible = false;
|
||||
dataGridView.Columns["ClientId"].Visible = false;
|
||||
dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
||||
}
|
||||
_logger.LogInformation("Загрузка писем");
|
||||
}
|
||||
@ -66,7 +65,18 @@ namespace ShipyardView
|
||||
|
||||
private void ButtonOpen_Click(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
if (dataGridView.SelectedRows.Count == 1)
|
||||
{
|
||||
var service = Program.ServiceProvider?.GetService(typeof(FormMail));
|
||||
if (service is FormMail form)
|
||||
{
|
||||
form.Id = dataGridView.SelectedRows[0].Cells["MessageId"].Value.ToString();
|
||||
if (form.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
LoadData(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -96,6 +96,7 @@ namespace ShipyardView
|
||||
services.AddTransient<FormReportShipDetails>();
|
||||
services.AddTransient<FormReportOrders>();
|
||||
services.AddTransient<FormMails>();
|
||||
services.AddTransient<FormMail>();
|
||||
services.AddTransient<FormShop>();
|
||||
services.AddTransient<FormShops>();
|
||||
services.AddTransient<FormAddShip>();
|
||||
|
@ -31,6 +31,23 @@ namespace ShipyardBusinessLogic.BusinessLogics
|
||||
return true;
|
||||
}
|
||||
|
||||
public MessageInfoViewModel? ReadElement(MessageInfoSearchModel? model)
|
||||
{
|
||||
if (model == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(model));
|
||||
}
|
||||
_logger.LogInformation("ReadElement. MessageId:{MessageId}", model.MessageId);
|
||||
var element = _messageInfoStorage.GetElement(model);
|
||||
if (element == null)
|
||||
{
|
||||
_logger.LogWarning("ReadElement element not found");
|
||||
return null;
|
||||
}
|
||||
_logger.LogInformation("ReadElement find. MessageId:{Id}", element.MessageId);
|
||||
return element;
|
||||
}
|
||||
|
||||
public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
|
||||
{
|
||||
_logger.LogInformation("ReadList. ClientId:{ClientId}. MessageId:{MessageId}", model?.ClientId, model?.MessageId);
|
||||
@ -43,5 +60,15 @@ namespace ShipyardBusinessLogic.BusinessLogics
|
||||
_logger.LogInformation("ReadList. Count:{Count}", list.Count);
|
||||
return list;
|
||||
}
|
||||
|
||||
public bool Update(MessageInfoBindingModel model)
|
||||
{
|
||||
if (_messageInfoStorage.Update(model) == null)
|
||||
{
|
||||
_logger.LogWarning("Update operation failed");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ namespace ShipyardContracts.BindingModels
|
||||
public string Body { get; set; } = string.Empty;
|
||||
|
||||
public DateTime DateDelivery { get; set; }
|
||||
public bool IsRead { get; private set; } = false;
|
||||
public string? AnswerText { get; private set; }
|
||||
public bool IsRead { get; set; } = false;
|
||||
public string? AnswerText { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -14,5 +14,8 @@ namespace ShipyardContracts.BusinessLogicsContracts
|
||||
List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
|
||||
|
||||
bool Create(MessageInfoBindingModel model);
|
||||
|
||||
MessageInfoViewModel? ReadElement(MessageInfoSearchModel? model);
|
||||
bool Update(MessageInfoBindingModel model);
|
||||
}
|
||||
}
|
||||
|
383
Shipyard/ShipyardDataBaseImplement/Migrations/20230430162924_MessageFix.Designer.cs
generated
Normal file
383
Shipyard/ShipyardDataBaseImplement/Migrations/20230430162924_MessageFix.Designer.cs
generated
Normal file
@ -0,0 +1,383 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using ShipyardDataBaseImplement;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace ShipyardDataBaseImplement.Migrations
|
||||
{
|
||||
[DbContext(typeof(ShipyardDataBase))]
|
||||
[Migration("20230430162924_MessageFix")]
|
||||
partial class MessageFix
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "7.0.3")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 128);
|
||||
|
||||
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Client", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<string>("ClientFIO")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("Email")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("Password")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Clients");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Detail", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<double>("Cost")
|
||||
.HasColumnType("float");
|
||||
|
||||
b.Property<string>("DetailName")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Details");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Implementer", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<string>("ImplementerFIO")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("Password")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<int>("Qualification")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("WorkExperience")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Implementers");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Message", b =>
|
||||
{
|
||||
b.Property<string>("MessageId")
|
||||
.HasColumnType("nvarchar(450)");
|
||||
|
||||
b.Property<string>("AnswerText")
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("Body")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<int?>("ClientId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<DateTime>("DateDelivery")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<bool>("IsRead")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<string>("SenderName")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("Subject")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("MessageId");
|
||||
|
||||
b.HasIndex("ClientId");
|
||||
|
||||
b.ToTable("Messages");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Order", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<int>("ClientId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("Count")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<DateTime>("DateCreate")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<DateTime?>("DateImplement")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<int?>("ImplementerId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("ShipId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("Status")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<double>("Sum")
|
||||
.HasColumnType("float");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ClientId");
|
||||
|
||||
b.HasIndex("ImplementerId");
|
||||
|
||||
b.HasIndex("ShipId");
|
||||
|
||||
b.ToTable("Orders");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Ship", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<double>("Price")
|
||||
.HasColumnType("float");
|
||||
|
||||
b.Property<string>("ShipName")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Ships");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.ShipDetail", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<int>("Count")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("DetailId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("ShipId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("DetailId");
|
||||
|
||||
b.HasIndex("ShipId");
|
||||
|
||||
b.ToTable("ShipDetails");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Shop", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<string>("Address")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<int>("Capacity")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<DateTime>("DateOpen")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<string>("ShopName")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Shops");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.ShopShip", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<int>("Count")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("ShipId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<int>("ShopId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ShipId");
|
||||
|
||||
b.HasIndex("ShopId");
|
||||
|
||||
b.ToTable("ShopShips");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Message", b =>
|
||||
{
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Client", "Client")
|
||||
.WithMany("Messages")
|
||||
.HasForeignKey("ClientId");
|
||||
|
||||
b.Navigation("Client");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Order", b =>
|
||||
{
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Client", "Client")
|
||||
.WithMany("Orders")
|
||||
.HasForeignKey("ClientId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Implementer", "Implementer")
|
||||
.WithMany("Orders")
|
||||
.HasForeignKey("ImplementerId");
|
||||
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Ship", "Ship")
|
||||
.WithMany("Orders")
|
||||
.HasForeignKey("ShipId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Client");
|
||||
|
||||
b.Navigation("Implementer");
|
||||
|
||||
b.Navigation("Ship");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.ShipDetail", b =>
|
||||
{
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Detail", "Detail")
|
||||
.WithMany("ShipDetails")
|
||||
.HasForeignKey("DetailId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Ship", "Ship")
|
||||
.WithMany("Details")
|
||||
.HasForeignKey("ShipId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Detail");
|
||||
|
||||
b.Navigation("Ship");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.ShopShip", b =>
|
||||
{
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Ship", "Ship")
|
||||
.WithMany("Shops")
|
||||
.HasForeignKey("ShipId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Shop", "Shop")
|
||||
.WithMany("Ships")
|
||||
.HasForeignKey("ShopId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Ship");
|
||||
|
||||
b.Navigation("Shop");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Client", b =>
|
||||
{
|
||||
b.Navigation("Messages");
|
||||
|
||||
b.Navigation("Orders");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Detail", b =>
|
||||
{
|
||||
b.Navigation("ShipDetails");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Implementer", b =>
|
||||
{
|
||||
b.Navigation("Orders");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Ship", b =>
|
||||
{
|
||||
b.Navigation("Details");
|
||||
|
||||
b.Navigation("Orders");
|
||||
|
||||
b.Navigation("Shops");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Shop", b =>
|
||||
{
|
||||
b.Navigation("Ships");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,39 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace ShipyardDataBaseImplement.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class MessageFix : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "AnswerText",
|
||||
table: "Messages",
|
||||
type: "nvarchar(max)",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "IsRead",
|
||||
table: "Messages",
|
||||
type: "bit",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "AnswerText",
|
||||
table: "Messages");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "IsRead",
|
||||
table: "Messages");
|
||||
}
|
||||
}
|
||||
}
|
@ -99,6 +99,9 @@ namespace ShipyardDataBaseImplement.Migrations
|
||||
b.Property<string>("MessageId")
|
||||
.HasColumnType("nvarchar(450)");
|
||||
|
||||
b.Property<string>("AnswerText")
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("Body")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
@ -109,6 +112,9 @@ namespace ShipyardDataBaseImplement.Migrations
|
||||
b.Property<DateTime>("DateDelivery")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<bool>("IsRead")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<string>("SenderName")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
@ -213,15 +219,6 @@ namespace ShipyardDataBaseImplement.Migrations
|
||||
b.ToTable("ShipDetails");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Message", b =>
|
||||
{
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Client", "Client")
|
||||
.WithMany("Messages")
|
||||
.HasForeignKey("ClientId");
|
||||
|
||||
b.Navigation("Client");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Shop", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
@ -275,6 +272,15 @@ namespace ShipyardDataBaseImplement.Migrations
|
||||
b.ToTable("ShopShips");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Message", b =>
|
||||
{
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Client", "Client")
|
||||
.WithMany("Messages")
|
||||
.HasForeignKey("ClientId");
|
||||
|
||||
b.Navigation("Client");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("ShipyardDataBaseImplement.Models.Order", b =>
|
||||
{
|
||||
b.HasOne("ShipyardDataBaseImplement.Models.Client", "Client")
|
||||
|
Loading…
x
Reference in New Issue
Block a user