diff --git a/PlumbingRepair.sln b/PlumbingRepair.sln index b563296..db47ecd 100644 --- a/PlumbingRepair.sln +++ b/PlumbingRepair.sln @@ -15,11 +15,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairListImplement EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairFileImplement", "PlumpingRepairFileImplement\PlumbingRepairFileImplement.csproj", "{BA7E2CE6-7797-42C7-931C-40C48EA521C7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairDatabaseImplement", "PlumbingRepairDatabaseImplement\PlumbingRepairDatabaseImplement.csproj", "{1E4DDF78-14D2-498B-9A17-473F156DBE11}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairRestApi", "PlumbingRepairRestApi\PlumbingRepairRestApi.csproj", "{96133F01-9E2F-4767-8CD8-811D8806E930}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairRestApi", "PlumbingRepairRestApi\PlumbingRepairRestApi.csproj", "{96133F01-9E2F-4767-8CD8-811D8806E930}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairClientApp", "PlumbingRepairClientApp\PlumbingRepairClientApp.csproj", "{C8A5024D-9529-452F-AAF3-9EDEEFED6758}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlumbingRepairClientApp", "PlumbingRepairClientApp\PlumbingRepairClientApp.csproj", "{C8A5024D-9529-452F-AAF3-9EDEEFED6758}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlumbingRepairDatabaseImplement", "PlumbingRepairDatabaseImplement\PlumbingRepairDatabaseImplement.csproj", "{A7874FFC-162B-4B6E-92CD-EA265B9E35F1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -51,10 +51,6 @@ Global {BA7E2CE6-7797-42C7-931C-40C48EA521C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {BA7E2CE6-7797-42C7-931C-40C48EA521C7}.Release|Any CPU.ActiveCfg = Release|Any CPU {BA7E2CE6-7797-42C7-931C-40C48EA521C7}.Release|Any CPU.Build.0 = Release|Any CPU - {1E4DDF78-14D2-498B-9A17-473F156DBE11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E4DDF78-14D2-498B-9A17-473F156DBE11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E4DDF78-14D2-498B-9A17-473F156DBE11}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E4DDF78-14D2-498B-9A17-473F156DBE11}.Release|Any CPU.Build.0 = Release|Any CPU {96133F01-9E2F-4767-8CD8-811D8806E930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {96133F01-9E2F-4767-8CD8-811D8806E930}.Debug|Any CPU.Build.0 = Debug|Any CPU {96133F01-9E2F-4767-8CD8-811D8806E930}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -63,6 +59,10 @@ Global {C8A5024D-9529-452F-AAF3-9EDEEFED6758}.Debug|Any CPU.Build.0 = Debug|Any CPU {C8A5024D-9529-452F-AAF3-9EDEEFED6758}.Release|Any CPU.ActiveCfg = Release|Any CPU {C8A5024D-9529-452F-AAF3-9EDEEFED6758}.Release|Any CPU.Build.0 = Release|Any CPU + {A7874FFC-162B-4B6E-92CD-EA265B9E35F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A7874FFC-162B-4B6E-92CD-EA265B9E35F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A7874FFC-162B-4B6E-92CD-EA265B9E35F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A7874FFC-162B-4B6E-92CD-EA265B9E35F1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PlumbingRepair/App.config b/PlumbingRepair/App.config index 3666028..70a9fd5 100644 --- a/PlumbingRepair/App.config +++ b/PlumbingRepair/App.config @@ -5,7 +5,7 @@ - - + + \ No newline at end of file diff --git a/PlumbingRepair/DataGridViewExtension.cs b/PlumbingRepair/DataGridViewExtension.cs new file mode 100644 index 0000000..4adb482 --- /dev/null +++ b/PlumbingRepair/DataGridViewExtension.cs @@ -0,0 +1,53 @@ +using PlumbingRepairContracts.Attributes; + +namespace PlumbingRepair +{ + public static class DataGridViewExtension + { + public static void FillandConfigGrid(this DataGridView grid, List? data) + { + if (data == null) + { + return; + } + + grid.DataSource = data; + + var type = typeof(T); + var properties = type.GetProperties(); + + foreach (DataGridViewColumn column in grid.Columns) + { + var property = properties.FirstOrDefault(x => x.Name == column.Name); + + if (property == null) + { + throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}"); + } + + var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault(); + + if (attribute == null) + { + throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}"); + } + + // ищем нужный нам атрибут + if (attribute is ColumnAttribute columnAttr) + { + column.HeaderText = columnAttr.Title; + column.Visible = columnAttr.Visible; + + if (columnAttr.IsUseAutoSize) + { + column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString()); + } + else + { + column.Width = columnAttr.Width; + } + } + } + } + } +} diff --git a/PlumbingRepair/FormClients.cs b/PlumbingRepair/FormClients.cs index e1ce341..b733869 100644 --- a/PlumbingRepair/FormClients.cs +++ b/PlumbingRepair/FormClients.cs @@ -22,14 +22,8 @@ namespace PlumbingRepair { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка клиентов"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) { diff --git a/PlumbingRepair/FormComponents.cs b/PlumbingRepair/FormComponents.cs index 685ca8d..b592821 100644 --- a/PlumbingRepair/FormComponents.cs +++ b/PlumbingRepair/FormComponents.cs @@ -1,6 +1,8 @@ using Microsoft.Extensions.Logging; using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.DI; +using System.Windows.Forms; namespace PlumbingRepair { @@ -23,18 +25,10 @@ namespace PlumbingRepair private void LoadData() { - try + try { - var list = _logic.ReadList(null); - - if (list != null) - { - DataGridView.DataSource = list; - DataGridView.Columns["Id"].Visible = false; - DataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - - _logger.LogInformation("Загрузка компонентов"); + DataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) @@ -46,31 +40,24 @@ namespace PlumbingRepair private void AddButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + var form = DependencyManager.Instance.Resolve(); - if (service is FormComponent form) + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } private void ChangeButton_Click(object sender, EventArgs e) { if (DataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - - if (service is FormComponent form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); - - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } + } } private void DeleteButton_Click(object sender, EventArgs e) diff --git a/PlumbingRepair/FormCreateOrder.Designer.cs b/PlumbingRepair/FormCreateOrder.Designer.cs index 4da9736..0ed6a89 100644 --- a/PlumbingRepair/FormCreateOrder.Designer.cs +++ b/PlumbingRepair/FormCreateOrder.Designer.cs @@ -36,66 +36,68 @@ this.SumTextBox = new System.Windows.Forms.TextBox(); this.ButtonCancel = new System.Windows.Forms.Button(); this.SaveButton = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.comboBoxClient = new System.Windows.Forms.ComboBox(); this.SuspendLayout(); // // WorkNameLabel // this.WorkNameLabel.AutoSize = true; - this.WorkNameLabel.Location = new System.Drawing.Point(12, 9); + this.WorkNameLabel.Location = new System.Drawing.Point(14, 12); this.WorkNameLabel.Name = "WorkNameLabel"; - this.WorkNameLabel.Size = new System.Drawing.Size(51, 15); + this.WorkNameLabel.Size = new System.Drawing.Size(75, 20); this.WorkNameLabel.TabIndex = 0; - this.WorkNameLabel.Text = "Работа: "; + this.WorkNameLabel.Text = "Изделие: "; // // CountLabel // this.CountLabel.AutoSize = true; - this.CountLabel.Location = new System.Drawing.Point(12, 40); + this.CountLabel.Location = new System.Drawing.Point(14, 53); this.CountLabel.Name = "CountLabel"; - this.CountLabel.Size = new System.Drawing.Size(78, 15); + this.CountLabel.Size = new System.Drawing.Size(97, 20); this.CountLabel.TabIndex = 1; this.CountLabel.Text = "Количество: "; // // SumLabel // this.SumLabel.AutoSize = true; - this.SumLabel.Location = new System.Drawing.Point(12, 72); + this.SumLabel.Location = new System.Drawing.Point(14, 96); this.SumLabel.Name = "SumLabel"; - this.SumLabel.Size = new System.Drawing.Size(51, 15); + this.SumLabel.Size = new System.Drawing.Size(62, 20); this.SumLabel.TabIndex = 2; this.SumLabel.Text = "Сумма: "; // // WorkComboBox // this.WorkComboBox.FormattingEnabled = true; - this.WorkComboBox.Location = new System.Drawing.Point(93, 6); + this.WorkComboBox.Location = new System.Drawing.Point(106, 8); + this.WorkComboBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.WorkComboBox.Name = "WorkComboBox"; - this.WorkComboBox.Size = new System.Drawing.Size(201, 23); + this.WorkComboBox.Size = new System.Drawing.Size(229, 28); this.WorkComboBox.TabIndex = 3; this.WorkComboBox.SelectedIndexChanged += new System.EventHandler(this.WorkComboBox_SelectedIndexChanged); // // CountTextBox // - this.CountTextBox.Location = new System.Drawing.Point(93, 37); + this.CountTextBox.Location = new System.Drawing.Point(106, 49); + this.CountTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.CountTextBox.Name = "CountTextBox"; - this.CountTextBox.Size = new System.Drawing.Size(201, 23); + this.CountTextBox.Size = new System.Drawing.Size(229, 27); this.CountTextBox.TabIndex = 4; this.CountTextBox.TextChanged += new System.EventHandler(this.CountTextBox_TextChanged); // // SumTextBox // - this.SumTextBox.Location = new System.Drawing.Point(93, 69); + this.SumTextBox.Location = new System.Drawing.Point(106, 92); + this.SumTextBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.SumTextBox.Name = "SumTextBox"; - this.SumTextBox.Size = new System.Drawing.Size(201, 23); + this.SumTextBox.Size = new System.Drawing.Size(229, 27); this.SumTextBox.TabIndex = 5; // // ButtonCancel // - this.ButtonCancel.Location = new System.Drawing.Point(222, 191); + this.ButtonCancel.Location = new System.Drawing.Point(250, 151); + this.ButtonCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ButtonCancel.Name = "ButtonCancel"; - this.ButtonCancel.Size = new System.Drawing.Size(75, 23); + this.ButtonCancel.Size = new System.Drawing.Size(86, 31); this.ButtonCancel.TabIndex = 6; this.ButtonCancel.Text = "Отменить"; this.ButtonCancel.UseVisualStyleBackColor = true; @@ -103,38 +105,20 @@ // // SaveButton // - this.SaveButton.Location = new System.Drawing.Point(130, 191); + this.SaveButton.Location = new System.Drawing.Point(147, 151); + this.SaveButton.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.SaveButton.Name = "SaveButton"; - this.SaveButton.Size = new System.Drawing.Size(85, 23); + this.SaveButton.Size = new System.Drawing.Size(97, 31); this.SaveButton.TabIndex = 7; this.SaveButton.Text = "Сохранить"; this.SaveButton.UseVisualStyleBackColor = true; this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 106); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(49, 15); - this.label1.TabIndex = 8; - this.label1.Text = "Клиент:"; - // - // comboBoxClient - // - this.comboBoxClient.FormattingEnabled = true; - this.comboBoxClient.Location = new System.Drawing.Point(93, 106); - this.comboBoxClient.Name = "comboBoxClient"; - this.comboBoxClient.Size = new System.Drawing.Size(201, 23); - this.comboBoxClient.TabIndex = 9; - // // FormCreateOrder // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(309, 226); - this.Controls.Add(this.comboBoxClient); - this.Controls.Add(this.label1); + this.ClientSize = new System.Drawing.Size(353, 204); this.Controls.Add(this.SaveButton); this.Controls.Add(this.ButtonCancel); this.Controls.Add(this.SumTextBox); @@ -143,6 +127,7 @@ this.Controls.Add(this.SumLabel); this.Controls.Add(this.CountLabel); this.Controls.Add(this.WorkNameLabel); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FormCreateOrder"; this.Text = "Заказ"; this.ResumeLayout(false); @@ -160,7 +145,5 @@ private TextBox SumTextBox; private Button ButtonCancel; private Button SaveButton; - private Label label1; - private ComboBox comboBoxClient; } } \ No newline at end of file diff --git a/PlumbingRepair/FormCreateOrder.cs b/PlumbingRepair/FormCreateOrder.cs index f663e22..fb46c74 100644 --- a/PlumbingRepair/FormCreateOrder.cs +++ b/PlumbingRepair/FormCreateOrder.cs @@ -10,26 +10,23 @@ namespace PlumbingRepair private readonly ILogger _logger; private readonly IWorkLogic _logicW; private readonly IOrderLogic _logicO; - private readonly IClientLogic _logicC; - public FormCreateOrder(ILogger logger, IWorkLogic logicW, IOrderLogic logicO, IClientLogic logicC) + public FormCreateOrder(ILogger logger, IWorkLogic logicW, IOrderLogic logicO) { InitializeComponent(); _logger = logger; _logicW = logicW; _logicO = logicO; - _logicC = logicC; LoadData(); } private void LoadData() { - _logger.LogInformation("Загрузка Работ для заказа"); + _logger.LogInformation("Загрузка изделий для заказа"); try { var list = _logicW.ReadList(null); - var listClients = _logicC.ReadList(null); if (list != null) { WorkComboBox.DisplayMember = "WorkName"; @@ -37,18 +34,11 @@ namespace PlumbingRepair WorkComboBox.DataSource = list; WorkComboBox.SelectedItem = null; } - if(listClients != null) - { - comboBoxClient.DisplayMember = "ClientFIO"; - comboBoxClient.ValueMember = "Id"; - comboBoxClient.DataSource = listClients; - comboBoxClient.SelectedItem = null; - } } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки списка Работ"); + _logger.LogError(ex, "Ошибка загрузки списка изделий"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -103,12 +93,7 @@ namespace PlumbingRepair if (WorkComboBox.SelectedValue == null) { - MessageBox.Show("Выберите Работа", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - if (comboBoxClient.SelectedValue == null) - { - MessageBox.Show("Выберите заказчика", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } @@ -121,8 +106,7 @@ namespace PlumbingRepair WorkId = Convert.ToInt32(WorkComboBox.SelectedValue), WorkName = WorkComboBox.Text, Count = Convert.ToInt32(CountTextBox.Text), - Sum = Convert.ToDouble(SumTextBox.Text), - ClientId = Convert.ToInt32(comboBoxClient.SelectedValue) + Sum = Convert.ToDouble(SumTextBox.Text) }); if (!operationResult) diff --git a/PlumbingRepair/FormImplementers.cs b/PlumbingRepair/FormImplementers.cs index cd29385..b2c47a1 100644 --- a/PlumbingRepair/FormImplementers.cs +++ b/PlumbingRepair/FormImplementers.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.DI; using System; using System.Collections.Generic; using System.ComponentModel; @@ -26,14 +27,10 @@ namespace PlumbingRepair private void AddButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -41,14 +38,11 @@ namespace PlumbingRepair { if (DataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } @@ -98,14 +92,7 @@ namespace PlumbingRepair { try { - var list = _logic.ReadList(null); - - if (list != null) - { - DataGridView.DataSource = list; - DataGridView.Columns["Id"].Visible = false; - DataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + DataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка исполнителей"); } diff --git a/PlumbingRepair/FormMails.cs b/PlumbingRepair/FormMails.cs index cf60ca0..eb9fa9b 100644 --- a/PlumbingRepair/FormMails.cs +++ b/PlumbingRepair/FormMails.cs @@ -20,14 +20,7 @@ namespace PlumbingRepair { 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; - } + DataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка писем"); } catch (Exception ex) diff --git a/PlumbingRepair/FormMain.Designer.cs b/PlumbingRepair/FormMain.Designer.cs index aa2c69b..5c1eff6 100644 --- a/PlumbingRepair/FormMain.Designer.cs +++ b/PlumbingRepair/FormMain.Designer.cs @@ -30,7 +30,7 @@ { MenuStrip = new MenuStrip(); СправочникиToolStripMenuItem = new ToolStripMenuItem(); - РаботыToolStripMenuItem = new ToolStripMenuItem(); + ИзделияToolStripMenuItem = new ToolStripMenuItem(); КомпонентыToolStripMenuItem = new ToolStripMenuItem(); КлиентыToolStripMenuItem = new ToolStripMenuItem(); исполнителиToolStripMenuItem = new ToolStripMenuItem(); @@ -39,11 +39,12 @@ WorkComponentToolStripMenuItem = new ToolStripMenuItem(); OrdersToolStripMenuItem = new ToolStripMenuItem(); запускРаботToolStripMenuItem = new ToolStripMenuItem(); + письмаToolStripMenuItem = new ToolStripMenuItem(); + создатьБэкапToolStripMenuItem = new ToolStripMenuItem(); CreateOrderButton = new Button(); IssuedOrderButton = new Button(); UpdateListButton = new Button(); DataGridView = new DataGridView(); - почтаToolStripMenuItem = new ToolStripMenuItem(); MenuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); SuspendLayout(); @@ -51,45 +52,46 @@ // MenuStrip // MenuStrip.ImageScalingSize = new Size(20, 20); - MenuStrip.Items.AddRange(new ToolStripItem[] { СправочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, почтаToolStripMenuItem }); + MenuStrip.Items.AddRange(new ToolStripItem[] { СправочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, письмаToolStripMenuItem, создатьБэкапToolStripMenuItem }); MenuStrip.Location = new Point(0, 0); MenuStrip.Name = "MenuStrip"; - MenuStrip.Size = new Size(865, 24); + MenuStrip.Padding = new Padding(7, 3, 0, 3); + MenuStrip.Size = new Size(989, 30); MenuStrip.TabIndex = 0; MenuStrip.Text = "menuStrip1"; // // СправочникиToolStripMenuItem // - СправочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { РаботыToolStripMenuItem, КомпонентыToolStripMenuItem, КлиентыToolStripMenuItem, исполнителиToolStripMenuItem }); + СправочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ИзделияToolStripMenuItem, КомпонентыToolStripMenuItem, КлиентыToolStripMenuItem, исполнителиToolStripMenuItem }); СправочникиToolStripMenuItem.Name = "СправочникиToolStripMenuItem"; - СправочникиToolStripMenuItem.Size = new Size(94, 20); + СправочникиToolStripMenuItem.Size = new Size(117, 24); СправочникиToolStripMenuItem.Text = "Cправочники"; // - // РаботыToolStripMenuItem + // ИзделияToolStripMenuItem // - РаботыToolStripMenuItem.Name = "РаботыToolStripMenuItem"; - РаботыToolStripMenuItem.Size = new Size(149, 22); - РаботыToolStripMenuItem.Text = "Работы"; - РаботыToolStripMenuItem.Click += РаботыToolStripMenuItem_Click; + ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem"; + ИзделияToolStripMenuItem.Size = new Size(185, 26); + ИзделияToolStripMenuItem.Text = "Изделия"; + ИзделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // // КомпонентыToolStripMenuItem // КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; - КомпонентыToolStripMenuItem.Size = new Size(149, 22); + КомпонентыToolStripMenuItem.Size = new Size(185, 26); КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // КлиентыToolStripMenuItem // КлиентыToolStripMenuItem.Name = "КлиентыToolStripMenuItem"; - КлиентыToolStripMenuItem.Size = new Size(149, 22); + КлиентыToolStripMenuItem.Size = new Size(185, 26); КлиентыToolStripMenuItem.Text = "Клиенты"; КлиентыToolStripMenuItem.Click += КлиентыToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(149, 22); + исполнителиToolStripMenuItem.Size = new Size(185, 26); исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; // @@ -97,42 +99,57 @@ // отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { WorksToolStripMenuItem, WorkComponentToolStripMenuItem, OrdersToolStripMenuItem }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(60, 20); + отчетыToolStripMenuItem.Size = new Size(73, 24); отчетыToolStripMenuItem.Text = "Отчеты"; // // WorksToolStripMenuItem // WorksToolStripMenuItem.Name = "WorksToolStripMenuItem"; - WorksToolStripMenuItem.Size = new Size(211, 22); - WorksToolStripMenuItem.Text = "Список Работ"; + WorksToolStripMenuItem.Size = new Size(273, 26); + WorksToolStripMenuItem.Text = "Список изделий"; WorksToolStripMenuItem.Click += WorksToolStripMenuItem_Click; // // WorkComponentToolStripMenuItem // WorkComponentToolStripMenuItem.Name = "WorkComponentToolStripMenuItem"; - WorkComponentToolStripMenuItem.Size = new Size(211, 22); - WorkComponentToolStripMenuItem.Text = "Работы по компонентам"; + WorkComponentToolStripMenuItem.Size = new Size(273, 26); + WorkComponentToolStripMenuItem.Text = "Изделия по компонентам"; WorkComponentToolStripMenuItem.Click += WorkComponentToolStripMenuItem_Click; // // OrdersToolStripMenuItem // OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; - OrdersToolStripMenuItem.Size = new Size(211, 22); + OrdersToolStripMenuItem.Size = new Size(273, 26); OrdersToolStripMenuItem.Text = "Список заказов"; OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // // запускРаботToolStripMenuItem // запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem"; - запускРаботToolStripMenuItem.Size = new Size(92, 20); + запускРаботToolStripMenuItem.Size = new Size(114, 24); запускРаботToolStripMenuItem.Text = "Запуск работ"; запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; // + // письмаToolStripMenuItem + // + письмаToolStripMenuItem.Name = "письмаToolStripMenuItem"; + письмаToolStripMenuItem.Size = new Size(77, 24); + письмаToolStripMenuItem.Text = "Письма"; + письмаToolStripMenuItem.Click += письмаToolStripMenuItem_Click; + // + // создатьБэкапToolStripMenuItem + // + создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem"; + создатьБэкапToolStripMenuItem.Size = new Size(122, 24); + создатьБэкапToolStripMenuItem.Text = "Создать бэкап"; + создатьБэкапToolStripMenuItem.Click += создатьБэкапToolStripMenuItem_Click; + // // CreateOrderButton // - CreateOrderButton.Location = new Point(728, 28); + CreateOrderButton.Location = new Point(832, 37); + CreateOrderButton.Margin = new Padding(3, 4, 3, 4); CreateOrderButton.Name = "CreateOrderButton"; - CreateOrderButton.Size = new Size(125, 33); + CreateOrderButton.Size = new Size(143, 44); CreateOrderButton.TabIndex = 2; CreateOrderButton.Text = "Создать заказ"; CreateOrderButton.UseVisualStyleBackColor = true; @@ -140,9 +157,10 @@ // // IssuedOrderButton // - IssuedOrderButton.Location = new Point(727, 112); + IssuedOrderButton.Location = new Point(831, 149); + IssuedOrderButton.Margin = new Padding(3, 4, 3, 4); IssuedOrderButton.Name = "IssuedOrderButton"; - IssuedOrderButton.Size = new Size(125, 33); + IssuedOrderButton.Size = new Size(143, 44); IssuedOrderButton.TabIndex = 5; IssuedOrderButton.Text = "Заказ выдан"; IssuedOrderButton.UseVisualStyleBackColor = true; @@ -150,9 +168,10 @@ // // UpdateListButton // - UpdateListButton.Location = new Point(727, 202); + UpdateListButton.Location = new Point(831, 269); + UpdateListButton.Margin = new Padding(3, 4, 3, 4); UpdateListButton.Name = "UpdateListButton"; - UpdateListButton.Size = new Size(125, 33); + UpdateListButton.Size = new Size(143, 44); UpdateListButton.TabIndex = 6; UpdateListButton.Text = "Обновить список"; UpdateListButton.UseVisualStyleBackColor = true; @@ -161,31 +180,26 @@ // DataGridView // DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - DataGridView.Location = new Point(0, 27); + DataGridView.Location = new Point(0, 36); + DataGridView.Margin = new Padding(3, 4, 3, 4); DataGridView.Name = "DataGridView"; DataGridView.RowHeadersWidth = 51; DataGridView.RowTemplate.Height = 25; - DataGridView.Size = new Size(722, 421); + DataGridView.Size = new Size(825, 561); DataGridView.TabIndex = 1; // - // почтаToolStripMenuItem - // - почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; - почтаToolStripMenuItem.Size = new Size(53, 20); - почтаToolStripMenuItem.Text = "Почта"; - почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click; - // // FormMain // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(865, 450); + ClientSize = new Size(989, 600); Controls.Add(UpdateListButton); Controls.Add(IssuedOrderButton); Controls.Add(CreateOrderButton); Controls.Add(DataGridView); Controls.Add(MenuStrip); MainMenuStrip = MenuStrip; + Margin = new Padding(3, 4, 3, 4); Name = "FormMain"; Text = "Ремонт сантехники"; Load += FormMain_Load; @@ -200,7 +214,7 @@ private MenuStrip MenuStrip; private ToolStripMenuItem СправочникиToolStripMenuItem; - private ToolStripMenuItem РаботыToolStripMenuItem; + private ToolStripMenuItem ИзделияToolStripMenuItem; private ToolStripMenuItem КомпонентыToolStripMenuItem; private ToolStripMenuItem КлиентыToolStripMenuItem; private Button CreateOrderButton; @@ -213,6 +227,7 @@ private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; private DataGridView DataGridView; - private ToolStripMenuItem почтаToolStripMenuItem; + private ToolStripMenuItem письмаToolStripMenuItem; + private ToolStripMenuItem создатьБэкапToolStripMenuItem; } } \ No newline at end of file diff --git a/PlumbingRepair/FormMain.cs b/PlumbingRepair/FormMain.cs index 2c5ab1b..7d7dd4f 100644 --- a/PlumbingRepair/FormMain.cs +++ b/PlumbingRepair/FormMain.cs @@ -1,9 +1,7 @@ using Microsoft.Extensions.Logging; -using PlumbingRepairBusinessLogic.BusinessLogic; using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.BusinessLogicsContracts; -using PlumbingRepairDataModels.Enums; -using System.Windows.Forms; +using PlumbingRepairContracts.DI; namespace PlumbingRepair { @@ -14,13 +12,15 @@ namespace PlumbingRepair private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IWorkProcess workProcess, IOrderLogic orderLogic, IReportLogic reportLogic) + private readonly IBackUpLogic _backUpLogic; + public FormMain(ILogger logger, IBackUpLogic backUpLogic, IWorkProcess workProcess, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; _workProcess = workProcess; + _backUpLogic = backUpLogic; } private void FormMain_Load(object sender, EventArgs e) @@ -34,16 +34,7 @@ namespace PlumbingRepair try { - var list = _orderLogic.ReadList(null); - - if (list != null) - { - DataGridView.DataSource = list; - DataGridView.Columns["WorkId"].Visible = false; - DataGridView.Columns["ClientId"].Visible = false; - DataGridView.Columns["ImplementerId"].Visible = false; - } - + DataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) @@ -55,41 +46,26 @@ namespace PlumbingRepair private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - - if (service is FormComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } - private void РаботыToolStripMenuItem_Click(object sender, EventArgs e) + private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormWorks)); - - if (service is FormWorks form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void КлиентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void CreateOrderButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - - if (service is FormCreateOrder form) - { - form.ShowDialog(); - LoadData(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + LoadData(); } private void IssuedOrderButton_Click(object sender, EventArgs e) @@ -142,44 +118,55 @@ namespace PlumbingRepair private void WorkComponentToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportWorkComponents)); - if (service is FormReportWorkComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e) { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); + _workProcess.DoWork(DependencyManager.Instance.Resolve(), _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); - - if (service is FormImplementers form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } - private void почтаToolStripMenuItem_Click(object sender, EventArgs e) + private void письмаToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); - if (service is FormMails form) + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + + private void создатьБэкапToolStripMenuItem_Click(object sender, EventArgs e) + { + try { - form.ShowDialog(); + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBindingModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бекап создан", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } diff --git a/PlumbingRepair/FormMain.resx b/PlumbingRepair/FormMain.resx index cae68fc..a694815 100644 --- a/PlumbingRepair/FormMain.resx +++ b/PlumbingRepair/FormMain.resx @@ -1,64 +1,4 @@ - - - + diff --git a/PlumbingRepair/FormReportWorkComponents.Designer.cs b/PlumbingRepair/FormReportWorkComponents.Designer.cs index 69792b9..57df7e0 100644 --- a/PlumbingRepair/FormReportWorkComponents.Designer.cs +++ b/PlumbingRepair/FormReportWorkComponents.Designer.cs @@ -62,7 +62,7 @@ // work // this.work.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.work.HeaderText = "Работа"; + this.work.HeaderText = "Изделие"; this.work.Name = "work"; // // component @@ -83,7 +83,7 @@ this.Controls.Add(this.dataGridView); this.Controls.Add(this.ButtonSave); this.Name = "FormReportWorkComponents"; - this.Text = "Работы по компонентам"; + this.Text = "Изделия по компонентам"; this.Load += new System.EventHandler(this.FormReportWorkComponents_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); diff --git a/PlumbingRepair/FormReportWorkComponents.cs b/PlumbingRepair/FormReportWorkComponents.cs index 6557f22..f6ba407 100644 --- a/PlumbingRepair/FormReportWorkComponents.cs +++ b/PlumbingRepair/FormReportWorkComponents.cs @@ -32,13 +32,13 @@ namespace PlumbingRepair { FileName = dialog.FileName }); - _logger.LogInformation("Сохранение списка Работ по компонентам"); + _logger.LogInformation("Сохранение списка изделий по компонентам"); MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка сохранения списка Работ по компонентам"); + _logger.LogError(ex, "Ошибка сохранения списка изделий по компонентам"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -65,11 +65,11 @@ namespace PlumbingRepair dataGridView.Rows.Add(Array.Empty()); } } - _logger.LogInformation("Загрузки списка Работ по компонентам"); + _logger.LogInformation("Загрузки списка изделий по компонентам"); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки списка Работ по компонентам"); + _logger.LogError(ex, "Ошибка загрузки списка изделий по компонентам"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } diff --git a/PlumbingRepair/FormWork.Designer.cs b/PlumbingRepair/FormWork.Designer.cs index ed11d04..a6164e8 100644 --- a/PlumbingRepair/FormWork.Designer.cs +++ b/PlumbingRepair/FormWork.Designer.cs @@ -223,7 +223,7 @@ this.Controls.Add(this.PriceLabel); this.Controls.Add(this.WorkNameLabel); this.Name = "FormWork"; - this.Text = "Работа"; + this.Text = "Изделие"; this.ComponentsGroupBox.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit(); this.ResumeLayout(false); diff --git a/PlumbingRepair/FormWork.cs b/PlumbingRepair/FormWork.cs index d312c68..b0ef724 100644 --- a/PlumbingRepair/FormWork.cs +++ b/PlumbingRepair/FormWork.cs @@ -4,6 +4,7 @@ using PlumbingRepairContracts.SearchModels; using PlumbingRepairDataModels.Models; using Microsoft.Extensions.Logging; using System.Windows.Forms; +using PlumbingRepairContracts.DI; namespace PlumbingRepair { @@ -29,7 +30,7 @@ namespace PlumbingRepair { if (_id.HasValue) { - _logger.LogInformation("Загрузка Работы"); + _logger.LogInformation("Загрузка изделия"); try { @@ -48,14 +49,14 @@ namespace PlumbingRepair } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки Работы"); + _logger.LogError(ex, "Ошибка загрузки изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } private void LoadData() { - _logger.LogInformation("Загрузка компонент Работы"); + _logger.LogInformation("Загрузка компонент изделия"); try { @@ -71,37 +72,33 @@ namespace PlumbingRepair } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки компонент Работы"); + _logger.LogError(ex, "Ошибка загрузки компонент изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } private void AddButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormWorkComponent)); - - if (service is FormWorkComponent form) - { + var form = DependencyManager.Instance.Resolve(); if (form.ShowDialog() == DialogResult.OK) { - if (form.ComponentModel == null) - { - return; - } - - _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - - if (_workComponents.ContainsKey(form.Id)) - { - _workComponents[form.Id] = (form.ComponentModel, form.Count); - } - - else - { - _workComponents.Add(form.Id, (form.ComponentModel, form.Count)); - } - - LoadData(); + if (form.ComponentModel == null) + { + return; } + + _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + + if (_workComponents.ContainsKey(form.Id)) + { + _workComponents[form.Id] = (form.ComponentModel, form.Count); + } + + else + { + _workComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + + LoadData(); } } @@ -109,25 +106,21 @@ namespace PlumbingRepair { if (DataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormWorkComponent)); + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _workComponents[id].Item2; - if (service is FormWorkComponent form) + if (form.ShowDialog() == DialogResult.OK) { - int id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _workComponents[id].Item2; - - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - - _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - _workComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); + return; } + + _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + _workComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); } } } @@ -178,7 +171,7 @@ namespace PlumbingRepair return; } - _logger.LogInformation("Сохранение Работы"); + _logger.LogInformation("Сохранение изделия"); try { @@ -203,7 +196,7 @@ namespace PlumbingRepair } catch (Exception ex) { - _logger.LogError(ex, "Ошибка сохранения Работы"); + _logger.LogError(ex, "Ошибка сохранения изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/PlumbingRepair/FormWorkComponent.Designer.cs b/PlumbingRepair/FormWorkComponent.Designer.cs index 34bd1b0..b8c2e98 100644 --- a/PlumbingRepair/FormWorkComponent.Designer.cs +++ b/PlumbingRepair/FormWorkComponent.Designer.cs @@ -106,7 +106,7 @@ this.Controls.Add(this.ComponentSelectLabel); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FormWorkComponent"; - this.Text = "Компонент Работы"; + this.Text = "Компонент изделия"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/PlumbingRepair/FormWorks.Designer.cs b/PlumbingRepair/FormWorks.Designer.cs index 42a41a2..e966303 100644 --- a/PlumbingRepair/FormWorks.Designer.cs +++ b/PlumbingRepair/FormWorks.Designer.cs @@ -103,7 +103,7 @@ this.Controls.Add(this.DataGridView); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "FormWorks"; - this.Text = "Работы"; + this.Text = "Изделия"; this.Load += new System.EventHandler(this.FormComponents_Load); ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit(); this.ResumeLayout(false); diff --git a/PlumbingRepair/FormWorks.cs b/PlumbingRepair/FormWorks.cs index 275d5bd..7fe3a49 100644 --- a/PlumbingRepair/FormWorks.cs +++ b/PlumbingRepair/FormWorks.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.DI; namespace PlumbingRepair { @@ -25,52 +26,34 @@ namespace PlumbingRepair { try { - var list = _logic.ReadList(null); - - if (list != null) - { - DataGridView.DataSource = list; - DataGridView.Columns["Id"].Visible = false; - DataGridView.Columns["WorkName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - DataGridView.Columns["WorkComponents"].Visible = false; - } - - _logger.LogInformation("Загрузка Работ"); + DataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка изделий"); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки Работ"); + _logger.LogError(ex, "Ошибка загрузки изделий"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } private void AddButton_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormWork)); - - if (service is FormWork form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } private void ChangeButton_Click(object sender, EventArgs e) { if (DataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormWork)); - - if (service is FormWork form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); - - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } @@ -81,7 +64,7 @@ namespace PlumbingRepair if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { int id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Удаление Работы"); + _logger.LogInformation("Удаление изделия"); try { @@ -97,7 +80,7 @@ namespace PlumbingRepair } catch (Exception ex) { - _logger.LogError(ex, "Ошибка удаления Работы"); + _logger.LogError(ex, "Ошибка удаления изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/PlumbingRepair/PlumbingRepair.csproj b/PlumbingRepair/PlumbingRepair.csproj index 24f8e5d..eed5393 100644 --- a/PlumbingRepair/PlumbingRepair.csproj +++ b/PlumbingRepair/PlumbingRepair.csproj @@ -22,7 +22,6 @@ - diff --git a/PlumbingRepair/Program.cs b/PlumbingRepair/Program.cs index 1fcfff1..57338d8 100644 --- a/PlumbingRepair/Program.cs +++ b/PlumbingRepair/Program.cs @@ -1,7 +1,4 @@ using PlumbingRepairContracts.BusinessLogicsContracts; -using PlumbingRepairContracts.StoragesContracts; -using PlumbingRepairDatabaseImplement.Implements; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using PlumbingRepairBusinessLogic.BusinessLogic; @@ -9,28 +6,23 @@ using PlumbingRepairBusinessLogic.OfficePackage; using PlumbingRepairBusinessLogic.OfficePackage.Implements; using PlumbingRepairContracts.BindingModels; using PlumbingRepairBusinessLogic.MailWorker; +using PlumbingRepairContracts.DI; namespace PlumbingRepair { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; - /// - /// The main entry point for the application. - /// [STAThread] static void Main() { // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + InitDependency(); + try { - var mailSender = _serviceProvider.GetService(); + var mailSender = DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new MailConfigBindingModel { MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, @@ -45,51 +37,51 @@ namespace PlumbingRepair } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, "Error"); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void ConfigureServices(ServiceCollection services) - { - services.AddLogging(option => + private static void InitDependency() + { + DependencyManager.InitDependency(); + DependencyManager.Instance.AddLogging(option => { option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - 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(); - 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(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(true); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file diff --git a/PlumbingRepair/ReportOrders.rdlc b/PlumbingRepair/ReportOrders.rdlc index 6a23a7c..e376033 100644 --- a/PlumbingRepair/ReportOrders.rdlc +++ b/PlumbingRepair/ReportOrders.rdlc @@ -212,7 +212,7 @@ - Работа + Изделие diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/BackUpLogic.cs b/PlumbingRepairBusinessLogic/BusinessLogic/BackUpLogic.cs new file mode 100644 index 0000000..b2c440e --- /dev/null +++ b/PlumbingRepairBusinessLogic/BusinessLogic/BackUpLogic.cs @@ -0,0 +1,112 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairDataModels; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + +namespace PlumbingRepairBusinessLogic.BusinessLogic +{ + public class BackUpLogic : IBackUpLogic + { + private readonly ILogger _logger; + + private readonly IBackUpInfo _backUpInfo; + + public BackUpLogic(ILogger logger, IBackUpInfo backUpInfo) + { + _logger = logger; + _backUpInfo = backUpInfo; + } + + public void CreateBackUp(BackUpSaveBindingModel model) + { + if (_backUpInfo == null) + { + return; + } + + try + { + _logger.LogDebug("Clear folder"); + // зачистка папки и удаление старого архива + var dirInfo = new DirectoryInfo(model.FolderName); + + if (dirInfo.Exists) + { + foreach (var file in dirInfo.GetFiles()) + { + file.Delete(); + } + } + + _logger.LogDebug("Delete archive"); + string fileName = $"{model.FolderName}.zip"; + + if (File.Exists(fileName)) + { + File.Delete(fileName); + } + + // берем метод для сохранения + _logger.LogDebug("Get assembly"); + var typeIId = typeof(IId); + var assembly = typeIId.Assembly; + + if (assembly == null) + { + throw new ArgumentNullException("Сборка не найдена", nameof(assembly)); + } + + var types = assembly.GetTypes(); + var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance); + _logger.LogDebug("Find {count} types", types.Length); + + foreach (var type in types) + { + if (type.IsInterface && type.GetInterface(typeIId.Name) != null) + { + var modelType = _backUpInfo.GetTypeByModelInterface(type.Name); + + if (modelType == null) + { + throw new InvalidOperationException($"Не найден класс-модель для {type.Name}"); + } + + _logger.LogDebug("Call SaveToFile method for {name} type", type.Name); + + method?.MakeGenericMethod(modelType).Invoke(this, new object[] { model.FolderName }); + } + } + + _logger.LogDebug("Create zip and remove folder"); + + ZipFile.CreateFromDirectory(model.FolderName, fileName); + + dirInfo.Delete(true); + } + catch (Exception) + { + throw; + } + } + + private void SaveToFile(string folderName) where T : class, new() + { + var records = _backUpInfo.GetList(); + + if (records == null) + { + _logger.LogWarning("{type} type get null list", typeof(T).Name); + + return; + } + + var jsonFormatter = new DataContractJsonSerializer(typeof(List)); + using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate); + jsonFormatter.WriteObject(fs, records); + } + } +} diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs b/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs index 109c40c..fba4050 100644 --- a/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/PlumbingRepairBusinessLogic/BusinessLogic/OrderLogic.cs @@ -9,45 +9,45 @@ using PlumbingRepairBusinessLogic.MailWorker; namespace PlumbingRepairBusinessLogic.BusinessLogic { - public class OrderLogic : IOrderLogic - { - private readonly ILogger _logger; - private readonly IOrderStorage _orderStorage; + public class OrderLogic : IOrderLogic + { + private readonly ILogger _logger; + private readonly IOrderStorage _orderStorage; private readonly AbstractMailWorker _mailWorker; private readonly IClientLogic _clientLogic; public OrderLogic(ILogger logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic) - { - _logger = logger; - _orderStorage = orderStorage; + { + _logger = logger; + _orderStorage = orderStorage; _mailWorker = mailWorker; _clientLogic = clientLogic; } - public bool CreateOrder(OrderBindingModel model) - { - CheckModel(model); + public bool CreateOrder(OrderBindingModel model) + { + CheckModel(model); - if (model.Status != OrderStatus.Неизвестен) - { - _logger.LogWarning("Insert operation failed. Order status incorrect."); - return false; - } + if (model.Status != OrderStatus.Неизвестен) + { + _logger.LogWarning("Insert operation failed. Order status incorrect."); + return false; + } - model.Status = OrderStatus.Принят; + model.Status = OrderStatus.Принят; var result = _orderStorage.Insert(model); if (result == null) - { - model.Status = OrderStatus.Неизвестен; - _logger.LogWarning("Insert operation failed"); - return false; - } + { + model.Status = OrderStatus.Неизвестен; + _logger.LogWarning("Insert operation failed"); + return false; + } SendOrderMessage(result.ClientId, $"Ремонт сантехники, Заказ №{result.Id}", $"Заказ №{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят"); return true; - } + } public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) { var viewModel = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); @@ -108,65 +108,65 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic } public bool TakeOrderInWork(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Выполняется); - } + { + return StatusUpdate(model, OrderStatus.Выполняется); + } - public bool DeliveryOrder(OrderBindingModel model) - { + public bool DeliveryOrder(OrderBindingModel model) + { return StatusUpdate(model, OrderStatus.Выдан); } - public bool FinishOrder(OrderBindingModel model) - { + public bool FinishOrder(OrderBindingModel model) + { return StatusUpdate(model, OrderStatus.Готов); - } + } - public List? ReadList(OrderSearchModel? model) - { - _logger.LogInformation("Order. OrderId:{Id}", model?.Id); + public List? ReadList(OrderSearchModel? model) + { + _logger.LogInformation("Order. OrderId:{Id}", model?.Id); - var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); - if (list == null) - { - _logger.LogWarning("ReadList return null list"); - return null; - } + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } - _logger.LogInformation("ReadList. Count:{Count}", list.Count); - return list; - } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } - private void CheckModel(OrderBindingModel model, bool withParams = true) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } + private void CheckModel(OrderBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } - if (!withParams) - { - return; - } + if (!withParams) + { + return; + } - if (model.WorkId < 0) - { - throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.WorkId)); - } + if (model.WorkId < 0) + { + throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.WorkId)); + } - if (model.Count <= 0) - { - throw new ArgumentNullException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); - } + if (model.Count <= 0) + { + throw new ArgumentNullException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); + } - if (model.Sum <= 0) - { - throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); - } + if (model.Sum <= 0) + { + throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); + } - _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. WorkId: { WorkId}", model.Id, model.Sum, model.WorkId); - } + _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. WorkId: { WorkId}", model.Id, model.Sum, model.WorkId); + } public OrderViewModel? ReadElement(OrderSearchModel model) { @@ -185,4 +185,4 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic return element; } } -} \ No newline at end of file +} diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/ReportLogic.cs b/PlumbingRepairBusinessLogic/BusinessLogic/ReportLogic.cs index 2c5b232..d8412fd 100644 --- a/PlumbingRepairBusinessLogic/BusinessLogic/ReportLogic.cs +++ b/PlumbingRepairBusinessLogic/BusinessLogic/ReportLogic.cs @@ -76,7 +76,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic _saveToWord.CreateDoc(new WordInfo { FileName = model.FileName, - Title = "Список Работ", + Title = "Список изделий", Works = _workStorage.GetFullList() }); } @@ -85,7 +85,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic _saveToExcel.CreateReport(new ExcelInfo { FileName = model.FileName, - Title = "Список Работ", + Title = "Список изделий", Works = GetWork() }); } diff --git a/PlumbingRepairBusinessLogic/BusinessLogic/WorkLogic.cs b/PlumbingRepairBusinessLogic/BusinessLogic/WorkLogic.cs index b1f30af..5b68c25 100644 --- a/PlumbingRepairBusinessLogic/BusinessLogic/WorkLogic.cs +++ b/PlumbingRepairBusinessLogic/BusinessLogic/WorkLogic.cs @@ -113,12 +113,12 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic if (string.IsNullOrEmpty(model.WorkName)) { - throw new ArgumentNullException("Нет названия Работы", nameof(model.WorkName)); + throw new ArgumentNullException("Нет названия изделия", nameof(model.WorkName)); } if (model.Price <= 0) { - throw new ArgumentNullException("Цена Работы должна быть больше 0", nameof(model.Price)); + throw new ArgumentNullException("Цена изделия должна быть больше 0", nameof(model.Price)); } _logger.LogInformation("Work. WorkName:{WorkName}.Price:{ Cost}. Id: { Id}", model.WorkName, model.Price, model.Id); @@ -130,7 +130,7 @@ namespace PlumbingRepairBusinessLogic.BusinessLogic if (element != null && element.Id != model.Id) { - throw new InvalidOperationException("Работа с таким названием уже есть"); + throw new InvalidOperationException("Изделие с таким названием уже есть"); } } } diff --git a/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index edbce97..76c8250 100644 --- a/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -23,7 +23,7 @@ namespace PlumbingRepairBusinessLogic.OfficePackage CreateTable(new List { "2cm", "3cm", "6cm", "2cm", "3cm" }); CreateRow(new PdfRowParameters { - Texts = new List { "Номер", "Дата создания", "Работа", "Статус", "Стоимость" }, + Texts = new List { "Номер", "Дата создания", "Изделие", "Статус", "Стоимость" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); diff --git a/PlumbingRepairClientApp/PlumbingRepairClientApp.csproj b/PlumbingRepairClientApp/PlumbingRepairClientApp.csproj index 80ba56a..c7fbf90 100644 --- a/PlumbingRepairClientApp/PlumbingRepairClientApp.csproj +++ b/PlumbingRepairClientApp/PlumbingRepairClientApp.csproj @@ -10,6 +10,7 @@ + diff --git a/PlumbingRepairContracts/Attributes/ColumnAttribute.cs b/PlumbingRepairContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..7fd70c3 --- /dev/null +++ b/PlumbingRepairContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,20 @@ +namespace PlumbingRepairContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false) + { + Title = title; + Visible = visible; + Width = width; + GridViewAutoSize = gridViewAutoSize; + IsUseAutoSize = isUseAutoSize; + } + public string Title { get; private set; } + public bool Visible { get; private set; } + public int Width { get; private set; } + public GridViewAutoSize GridViewAutoSize { get; private set; } + public bool IsUseAutoSize { get; private set; } + } +} diff --git a/PlumbingRepairContracts/Attributes/GridViewAutoSize.cs b/PlumbingRepairContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..af2d10f --- /dev/null +++ b/PlumbingRepairContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,14 @@ +namespace PlumbingRepairContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/PlumbingRepairContracts/BindingModels/BackUpSaveBindingModel.cs b/PlumbingRepairContracts/BindingModels/BackUpSaveBindingModel.cs new file mode 100644 index 0000000..4bdb1a5 --- /dev/null +++ b/PlumbingRepairContracts/BindingModels/BackUpSaveBindingModel.cs @@ -0,0 +1,7 @@ +namespace PlumbingRepairContracts.BindingModels +{ + public class BackUpSaveBindingModel + { + public string FolderName { get; set; } = string.Empty; + } +} \ No newline at end of file diff --git a/PlumbingRepairContracts/BindingModels/MessageInfoBindingModel.cs b/PlumbingRepairContracts/BindingModels/MessageInfoBindingModel.cs index 43a3ae7..8eca939 100644 --- a/PlumbingRepairContracts/BindingModels/MessageInfoBindingModel.cs +++ b/PlumbingRepairContracts/BindingModels/MessageInfoBindingModel.cs @@ -10,5 +10,7 @@ namespace PlumbingRepairContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + + public int Id => throw new NotImplementedException(); } } diff --git a/PlumbingRepairContracts/BusinessLogicsContracts/IBackUpLogic.cs b/PlumbingRepairContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..c9d9730 --- /dev/null +++ b/PlumbingRepairContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using PlumbingRepairContracts.BindingModels; + +namespace PlumbingRepairContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBindingModel model); + } +} \ No newline at end of file diff --git a/PlumbingRepairContracts/DI/DependencyManager.cs b/PlumbingRepairContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..af33b3b --- /dev/null +++ b/PlumbingRepairContracts/DI/DependencyManager.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Logging; + +namespace PlumbingRepairContracts.DI +{ + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + private static DependencyManager? _manager; + private static readonly object _locjObject = new(); + + private DependencyManager() + { + _dependencyManager = new ServiceDependencyContainer(); + } + + public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } } + + public static void InitDependency() + { + var ext = ServiceProviderLoader.GetImplementationExtensions(); + if (ext == null) + { + throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); + } + + // регистрируем зависимости + ext.RegisterServices(); + } + + public void AddLogging(Action configure) => _dependencyManager.AddLogging(configure); + + public void RegisterType(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType(isSingle); + + public void RegisterType(bool isSingle = false) where T : class => _dependencyManager.RegisterType(isSingle); + + public T Resolve() => _dependencyManager.Resolve(); + } +} diff --git a/PlumbingRepairContracts/DI/IDependencyContainer.cs b/PlumbingRepairContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..dd41ab4 --- /dev/null +++ b/PlumbingRepairContracts/DI/IDependencyContainer.cs @@ -0,0 +1,12 @@ +using Microsoft.Extensions.Logging; + +namespace PlumbingRepairContracts.DI +{ + public interface IDependencyContainer + { + void AddLogging(Action configure); + void RegisterType(bool isSingle) where U : class, T where T : class; + void RegisterType(bool isSingle) where T : class; + T Resolve(); + } +} diff --git a/PlumbingRepairContracts/DI/IImplementationExtension.cs b/PlumbingRepairContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..5d1e472 --- /dev/null +++ b/PlumbingRepairContracts/DI/IImplementationExtension.cs @@ -0,0 +1,8 @@ +namespace PlumbingRepairContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + public void RegisterServices(); + } +} diff --git a/PlumbingRepairContracts/DI/ServiceDependencyContainer.cs b/PlumbingRepairContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..9585e2a --- /dev/null +++ b/PlumbingRepairContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,59 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace PlumbingRepairContracts.DI +{ + public class ServiceDependencyContainer : IDependencyContainer + { + private ServiceProvider? _serviceProvider; + private readonly ServiceCollection _serviceCollection; + + public ServiceDependencyContainer() + { + _serviceCollection = new ServiceCollection(); + } + + public void AddLogging(Action configure) + { + _serviceCollection.AddLogging(configure); + } + + public void RegisterType(bool isSingle) where U : class, T where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + + _serviceProvider = null; + } + + public void RegisterType(bool isSingle) where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + + _serviceProvider = null; + } + + public T Resolve() + { + if (_serviceProvider == null) + { + _serviceProvider = _serviceCollection.BuildServiceProvider(); + } + + return _serviceProvider.GetService()!; + } + } +} diff --git a/PlumbingRepairContracts/DI/ServiceProviderLoader.cs b/PlumbingRepairContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..5439e2e --- /dev/null +++ b/PlumbingRepairContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,52 @@ +using System.Reflection; + +namespace PlumbingRepairContracts.DI +{ + public class ServiceProviderLoader + { + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + + return source; + } + + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } +} \ No newline at end of file diff --git a/PlumbingRepairContracts/DI/UnityDependencyContainer.cs b/PlumbingRepairContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..4928909 --- /dev/null +++ b/PlumbingRepairContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Logging; +using Unity.Microsoft.Logging; +using Unity; + +namespace PlumbingRepairContracts.DI +{ + public class UnityDependencyContainer : IDependencyContainer + { + private readonly IUnityContainer _container; + + public UnityDependencyContainer() + { + _container = new UnityContainer(); + } + + public void AddLogging(Action configure) + { + var factory = LoggerFactory.Create(configure); + _container.AddExtension(new LoggingExtension(factory)); + } + + public void RegisterType(bool isSingle) where T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + + } + + public T Resolve() + { + return _container.Resolve(); + } + + void IDependencyContainer.RegisterType(bool isSingle) + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + } +} diff --git a/PlumbingRepairContracts/PlumbingRepairContracts.csproj b/PlumbingRepairContracts/PlumbingRepairContracts.csproj index 5c96a30..703f115 100644 --- a/PlumbingRepairContracts/PlumbingRepairContracts.csproj +++ b/PlumbingRepairContracts/PlumbingRepairContracts.csproj @@ -6,6 +6,12 @@ enable + + + + + + diff --git a/PlumbingRepairContracts/StoragesContracts/IBackUpInfo.cs b/PlumbingRepairContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..3067aa7 --- /dev/null +++ b/PlumbingRepairContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,8 @@ +namespace PlumbingRepairContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} \ No newline at end of file diff --git a/PlumbingRepairContracts/ViewModels/ClientViewModel.cs b/PlumbingRepairContracts/ViewModels/ClientViewModel.cs index 84ccc44..0b776c1 100644 --- a/PlumbingRepairContracts/ViewModels/ClientViewModel.cs +++ b/PlumbingRepairContracts/ViewModels/ClientViewModel.cs @@ -1,16 +1,18 @@ -using PlumbingRepairDataModels.Models; +using PlumbingRepairContracts.Attributes; +using PlumbingRepairDataModels.Models; using System.ComponentModel; namespace PlumbingRepairContracts.ViewModels { public class ClientViewModel : IClientModel { - public int Id { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] - public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column(visible: false)] + public int Id { get; set; } + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column("Логин (эл. почта)", width: 150)] + public string Email { get; set; } = string.Empty; + [Column("Пароль", width: 150)] + public string Password { get; set; } = string.Empty; } } diff --git a/PlumbingRepairContracts/ViewModels/ComponentViewModel.cs b/PlumbingRepairContracts/ViewModels/ComponentViewModel.cs index 611d741..c5acd64 100644 --- a/PlumbingRepairContracts/ViewModels/ComponentViewModel.cs +++ b/PlumbingRepairContracts/ViewModels/ComponentViewModel.cs @@ -1,14 +1,16 @@ -using PlumbingRepairDataModels.Models; +using PlumbingRepairContracts.Attributes; +using PlumbingRepairDataModels.Models; using System.ComponentModel; namespace PlumbingRepairContracts.ViewModels { public class ComponentViewModel : IComponentModel { - public int Id { get; set; } - [DisplayName("Название компонента")] - public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Cost { get; set; } + [Column(visible: false)] + public int Id { get; set; } + [Column("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column("Цена", width: 80)] + public double Cost { get; set; } } } diff --git a/PlumbingRepairContracts/ViewModels/ImplementerViewModel.cs b/PlumbingRepairContracts/ViewModels/ImplementerViewModel.cs index 9632d3a..e601339 100644 --- a/PlumbingRepairContracts/ViewModels/ImplementerViewModel.cs +++ b/PlumbingRepairContracts/ViewModels/ImplementerViewModel.cs @@ -1,22 +1,24 @@ -using PlumbingRepairDataModels.Models; +using PlumbingRepairContracts.Attributes; +using PlumbingRepairDataModels.Models; using System.ComponentModel; namespace PlumbingRepairContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Пароль", width: 150)] public string Password { get; set; } = string.Empty; - [DisplayName("Стаж работы")] + [Column("Стаж работы", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column("Квалификация", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Qualification { get; set; } } } diff --git a/PlumbingRepairContracts/ViewModels/MessageInfoViewModel.cs b/PlumbingRepairContracts/ViewModels/MessageInfoViewModel.cs index 2149c73..283fe5b 100644 --- a/PlumbingRepairContracts/ViewModels/MessageInfoViewModel.cs +++ b/PlumbingRepairContracts/ViewModels/MessageInfoViewModel.cs @@ -1,24 +1,28 @@ -using PlumbingRepairDataModels.Models; +using PlumbingRepairContracts.Attributes; +using PlumbingRepairDataModels.Models; using System.ComponentModel; namespace PlumbingRepairContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; - + [Column(visible: false)] public int? ClientId { get; set; } - [DisplayName("Имя отправителя")] + [Column("Имя отправителя", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата отправления")] + [Column("Дата отправления", width: 100)] public DateTime DateDelivery { get; set; } - [DisplayName("Тема")] + [Column("Тема", width: 150)] public string Subject { get; set; } = string.Empty; - [DisplayName("Содержание")] + [Column("Содержание", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + [Column(visible: false)] + public int Id => throw new NotImplementedException(); } } diff --git a/PlumbingRepairContracts/ViewModels/OrderViewModel.cs b/PlumbingRepairContracts/ViewModels/OrderViewModel.cs index 8aa9bc9..7e4b56a 100644 --- a/PlumbingRepairContracts/ViewModels/OrderViewModel.cs +++ b/PlumbingRepairContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using PlumbingRepairDataModels.Enums; +using PlumbingRepairContracts.Attributes; +using PlumbingRepairDataModels.Enums; using PlumbingRepairDataModels.Models; using System.ComponentModel; @@ -6,26 +7,29 @@ namespace PlumbingRepairContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int WorkId { get; set; } - [DisplayName("Название изделия")] - public string WorkName { get; set; } = string.Empty; - public int ClientId { get; set; } - [DisplayName("Клиент")] - public string ClientFIO { get; set; } = string.Empty; + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column(visible: false)] + public int WorkId { get; set; } + [Column("Название изделия", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string WorkName { get; set; } = string.Empty; + [Column(visible: false)] + public int ClientId { get; set; } + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Исполнитель")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } - [DisplayName("Сумма")] - public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } + [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Count { get; set; } + [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public double Sum { get; set; } + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column("Дата создания", width: 130)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column("Дата выполнения", width: 130)] + public DateTime? DateImplement { get; set; } } } diff --git a/PlumbingRepairContracts/ViewModels/WorkViewModel.cs b/PlumbingRepairContracts/ViewModels/WorkViewModel.cs index 10404e2..ca496c6 100644 --- a/PlumbingRepairContracts/ViewModels/WorkViewModel.cs +++ b/PlumbingRepairContracts/ViewModels/WorkViewModel.cs @@ -1,15 +1,18 @@ -using PlumbingRepairDataModels.Models; +using PlumbingRepairContracts.Attributes; +using PlumbingRepairDataModels.Models; using System.ComponentModel; namespace PlumbingRepairContracts.ViewModels { public class WorkViewModel : IWorkModel { - public int Id { get; set; } - [DisplayName("Название изделия")] - public string WorkName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary WorkComponents { get; set; } = new(); + [Column(visible: false)] + public int Id { get; set; } + [Column("Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string WorkName { get; set; } = string.Empty; + [Column("Цена", width: 100)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary WorkComponents { get; set; } = new(); } } diff --git a/PlumbingRepairRestApi/PlumbingRepairRestApi.csproj b/PlumbingRepairRestApi/PlumbingRepairRestApi.csproj index 3b3612a..0db897a 100644 --- a/PlumbingRepairRestApi/PlumbingRepairRestApi.csproj +++ b/PlumbingRepairRestApi/PlumbingRepairRestApi.csproj @@ -13,7 +13,6 @@ - diff --git a/PlumpingRepairFileImplement/DataFileSingleton.cs b/PlumpingRepairFileImplement/DataFileSingleton.cs index dbf8387..62aea04 100644 --- a/PlumpingRepairFileImplement/DataFileSingleton.cs +++ b/PlumpingRepairFileImplement/DataFileSingleton.cs @@ -12,12 +12,14 @@ namespace PlumbingRepairFileImplement private readonly string WorkFileName = "Work.xml"; private readonly string ClientFileName = "Client.xml"; private readonly string ImplementerFileName = "Implementer.xml"; + private readonly string MessageFileName = "Message.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Works { get; private set; } public List Clients { get; private set; } public List Implementers { get; private set; } + public List Messages { get; private set; } public static DataFileSingleton GetInstance() { @@ -33,6 +35,7 @@ namespace PlumbingRepairFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); + public void SaveMessages() => SaveData(Messages, MessageFileName, "Messages", x => x.GetXElement); private DataFileSingleton() { @@ -41,6 +44,7 @@ namespace PlumbingRepairFileImplement Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; + Messages = LoadData(MessageFileName, "Message", x => Message.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/PlumpingRepairFileImplement/FileImplementationExtension.cs b/PlumpingRepairFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..1edd43d --- /dev/null +++ b/PlumpingRepairFileImplement/FileImplementationExtension.cs @@ -0,0 +1,22 @@ +using PlumbingRepairContracts.DI; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairFileImplement.Implements; + +namespace PlumbingRepairFileImplement +{ + public class FileImplementationExtension : IImplementationExtension + { + public int Priority => 1; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/PlumpingRepairFileImplement/Implements/BackUpInfo.cs b/PlumpingRepairFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..bbc285a --- /dev/null +++ b/PlumpingRepairFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using PlumbingRepairContracts.StoragesContracts; + +namespace PlumbingRepairFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + var source = DataFileSingleton.GetInstance(); + + return (List?)source.GetType().GetProperties() + .FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == typeof(T)) + ?.GetValue(source); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + + foreach (var type in types) + { + if (type.IsClass && type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + + return null; + } + } +} diff --git a/PlumpingRepairFileImplement/Implements/MessageInfoStorage.cs b/PlumpingRepairFileImplement/Implements/MessageInfoStorage.cs new file mode 100644 index 0000000..69eaf45 --- /dev/null +++ b/PlumpingRepairFileImplement/Implements/MessageInfoStorage.cs @@ -0,0 +1,52 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairFileImplement.Models; + +namespace PlumbingRepairFileImplement.Implements +{ + public class MessageInfoStorage : IMessageInfoStorage + { + private readonly DataFileSingleton source; + public MessageInfoStorage() + { + source = DataFileSingleton.GetInstance(); + } + public MessageInfoViewModel? GetElement(MessageInfoSearchModel model) + { + if (model.MessageId == null) + return null; + return source.Messages.FirstOrDefault(x => x.MessageId == model.MessageId)?.GetViewModel; + } + + public List GetFilteredList(MessageInfoSearchModel model) + { + if (!model.ClientId.HasValue) + return new(); + return source.Messages + .Where(x => x.ClientId == model.ClientId) + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFullList() + { + return source.Messages + .Select(x => x.GetViewModel) + .ToList(); + } + + public MessageInfoViewModel? Insert(MessageInfoBindingModel model) + { + var newMessage = Message.Create(model); + if (newMessage == null) + { + return null; + } + source.Messages.Add(newMessage); + source.SaveMessages(); + return newMessage.GetViewModel; + } + } +} diff --git a/PlumpingRepairFileImplement/Models/Client.cs b/PlumpingRepairFileImplement/Models/Client.cs index 64c154c..5c7d51e 100644 --- a/PlumpingRepairFileImplement/Models/Client.cs +++ b/PlumpingRepairFileImplement/Models/Client.cs @@ -1,16 +1,22 @@ using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.ViewModels; using PlumbingRepairDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace PlumbingRepairFileImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } - public string ClientFIO { get; private set; } = string.Empty; - public string Email { get; private set; } = string.Empty; - public string Password { get; private set; } = string.Empty; + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; public static Client? Create(ClientBindingModel? model) { if (model == null) diff --git a/PlumpingRepairFileImplement/Models/Component.cs b/PlumpingRepairFileImplement/Models/Component.cs index a9b833e..244e793 100644 --- a/PlumpingRepairFileImplement/Models/Component.cs +++ b/PlumpingRepairFileImplement/Models/Component.cs @@ -1,15 +1,20 @@ using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.ViewModels; using PlumbingRepairDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace PlumbingRepairFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) { diff --git a/PlumpingRepairFileImplement/Models/Implementer.cs b/PlumpingRepairFileImplement/Models/Implementer.cs index 8644896..71f04ba 100644 --- a/PlumpingRepairFileImplement/Models/Implementer.cs +++ b/PlumpingRepairFileImplement/Models/Implementer.cs @@ -1,20 +1,23 @@ using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.ViewModels; using PlumbingRepairDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace PlumbingRepairFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public string ImplementerFIO { get; set; } = string.Empty; - + [DataMember] public string Password { get; set; } = string.Empty; - + [DataMember] public int WorkExperience { get; set; } - + [DataMember] public int Qualification { get; set; } - + [DataMember] public int Id { get; set; } public static Implementer? Create(ImplementerBindingModel? model) diff --git a/PlumpingRepairFileImplement/Models/Message.cs b/PlumpingRepairFileImplement/Models/Message.cs new file mode 100644 index 0000000..9388fc0 --- /dev/null +++ b/PlumpingRepairFileImplement/Models/Message.cs @@ -0,0 +1,80 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; +using System.Runtime.Serialization; +using System.Xml.Linq; + +namespace PlumbingRepairFileImplement.Models +{ + [DataContract] + public class Message : IMessageInfoModel + { + [DataMember] + public string MessageId { get; private set; } = string.Empty; + [DataMember] + public int? ClientId { get; private set; } + [DataMember] + public string SenderName { get; private set; } = string.Empty; + [DataMember] + public DateTime DateDelivery { get; private set; } = DateTime.Now; + [DataMember] + public string Subject { get; private set; } = string.Empty; + [DataMember] + public string Body { get; private set; } = string.Empty; + + public static Message? Create(MessageInfoBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Body = model.Body, + Subject = model.Subject, + DateDelivery = model.DateDelivery, + SenderName = model.SenderName, + ClientId = model.ClientId, + MessageId = model.MessageId + }; + } + + public static Message? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Body = element.Attribute("Body")!.Value, + Subject = element.Attribute("Subject")!.Value, + DateDelivery = Convert.ToDateTime(element.Attribute("DateDelivery")!.Value), + SenderName = element.Attribute("SenderName")!.Value, + ClientId = Convert.ToInt32(element.Attribute("ClientId")!.Value), + MessageId = element.Attribute("MessageId")!.Value, + }; + } + + public MessageInfoViewModel GetViewModel => new() + { + Body = Body, + Subject = Subject, + DateDelivery = DateDelivery, + SenderName = SenderName, + ClientId = ClientId, + MessageId = MessageId + }; + + public XElement GetXElement => new("MessageInfo", + new XAttribute("Subject", Subject), + new XAttribute("Body", Body), + new XAttribute("ClientId", ClientId.ToString()), + new XAttribute("MessageId", MessageId), + new XAttribute("SenderName", SenderName), + new XAttribute("DateDelivery", DateDelivery.ToString()) + ); + + public int Id => throw new NotImplementedException(); + } +} diff --git a/PlumpingRepairFileImplement/Models/Order.cs b/PlumpingRepairFileImplement/Models/Order.cs index 49e261f..ec330d1 100644 --- a/PlumpingRepairFileImplement/Models/Order.cs +++ b/PlumpingRepairFileImplement/Models/Order.cs @@ -2,22 +2,34 @@ using PlumbingRepairContracts.ViewModels; using PlumbingRepairDataModels.Enums; using PlumbingRepairDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace PlumbingRepairFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - public int WorkId { get; private set; } - public int ClientId { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public int WorkId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] public string WorkName { get; private set; } = string.Empty; - public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + [DataMember] + public int Count { get; private set; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel model) { @@ -47,7 +59,9 @@ namespace PlumbingRepairFileImplement.Models return null; } - var order = new Order() + DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl); + + var order = new Order() { Id = Convert.ToInt32(element.Attribute("Id")!.Value), WorkId = Convert.ToInt32(element.Element("WorkId")!.Value), @@ -56,12 +70,10 @@ namespace PlumbingRepairFileImplement.Models ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), - Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), - DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null) - }; - - DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl); - order.DateImplement = dateImpl; + Status = (OrderStatus)Convert.ToInt32(element.Element("Status")!.Value), + DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null), + DateImplement = dateImpl + }; return order; } diff --git a/PlumpingRepairFileImplement/Models/Work.cs b/PlumpingRepairFileImplement/Models/Work.cs index 8f24dd2..82c83ad 100644 --- a/PlumpingRepairFileImplement/Models/Work.cs +++ b/PlumpingRepairFileImplement/Models/Work.cs @@ -1,21 +1,26 @@ using PlumbingRepairContracts.BindingModels; using PlumbingRepairContracts.ViewModels; using PlumbingRepairDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace PlumbingRepairFileImplement.Models { - public class Work : IWorkModel + [DataContract] + public class Work : IWorkModel { - public int Id { get; private set; } - public string WorkName { get; private set; } = string.Empty; - public double Price { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string WorkName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); public Dictionary _workComponents = null; - - public Dictionary WorkComponents + [DataMember] + public Dictionary WorkComponents { get { diff --git a/PlumpingRepairFileImplement/PlumbingRepairFileImplement.csproj b/PlumpingRepairFileImplement/PlumbingRepairFileImplement.csproj index 05f8377..e4c7070 100644 --- a/PlumpingRepairFileImplement/PlumbingRepairFileImplement.csproj +++ b/PlumpingRepairFileImplement/PlumbingRepairFileImplement.csproj @@ -11,4 +11,8 @@ + + + +