подкорректировала красоту вывода колонок, ну и заменила до конца использование сервис провайдера на менеджер зависимостей наш

This commit is contained in:
Елена Бакальская 2024-05-19 18:11:43 +04:00
parent 54854a1ac0
commit 4f4dad18c5
9 changed files with 47 additions and 55 deletions

View File

@ -135,7 +135,7 @@ namespace SushiBarView
private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e) private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
{ {
_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); _workProcess.DoWork((DependencyManager.Instance.Resolve<IImplementerLogic>() as IImplementerLogic)!, _orderLogic);
MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
} }

View File

@ -16,10 +16,6 @@ namespace SushiBar
{ {
internal static class Program internal static class Program
{ {
private static ServiceProvider? _serviceProvider;
public static ServiceProvider? ServiceProvider => _serviceProvider;
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.
/// </summary> /// </summary>

View File

@ -2,6 +2,7 @@
using SushiBar; using SushiBar;
using SushiBarContracts.BindingModel; using SushiBarContracts.BindingModel;
using SushiBarContracts.BusinessLogicsContracts; using SushiBarContracts.BusinessLogicsContracts;
using SushiBarContracts.DI;
using SushiBarContracts.SearchModel; using SushiBarContracts.SearchModel;
using SushiBarDataModels.Models; using SushiBarDataModels.Models;
@ -68,9 +69,8 @@ namespace SushiBarView
} }
private void ButtonAdd_Click(object sender, EventArgs e) private void ButtonAdd_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormSushiComponent)); var form = DependencyManager.Instance.Resolve<FormSushiComponent>();
if (service is FormSushiComponent form)
{
if (form.ShowDialog() == DialogResult.OK) if (form.ShowDialog() == DialogResult.OK)
{ {
if (form.ComponentModel == null) if (form.ComponentModel == null)
@ -90,14 +90,12 @@ namespace SushiBarView
LoadData(); LoadData();
} }
} }
}
private void ButtonUpd_Click(object sender, EventArgs e) private void ButtonUpd_Click(object sender, EventArgs e)
{ {
if (dataGridView.SelectedRows.Count == 1) if (dataGridView.SelectedRows.Count == 1)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormSushiComponent)); var form = DependencyManager.Instance.Resolve<FormSushiComponent>();
if (service is FormSushiComponent form)
{
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
form.Id = id; form.Id = id;
form.Count = _sushiComponents[id].Item2; form.Count = _sushiComponents[id].Item2;
@ -114,7 +112,6 @@ namespace SushiBarView
} }
} }
} }
}
private void ButtonDel_Click(object sender, EventArgs e) private void ButtonDel_Click(object sender, EventArgs e)
{ {
if (dataGridView.SelectedRows.Count == 1) if (dataGridView.SelectedRows.Count == 1)

View File

@ -14,13 +14,13 @@ namespace SushiBarContracts.ViewModels
[Column(visible: false)] [Column(visible: false)]
public int Id { get; set; } public int Id { get; set; }
[Column(title: "ФИО клиента", width: 200)] [Column(title: "ФИО клиента", width: 250)]
public string ClientFIO { get; set; } = string.Empty; public string ClientFIO { get; set; } = string.Empty;
[Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string Email { get; set; } = string.Empty; public string Email { get; set; } = string.Empty;
[Column(title: "Пароль", width: 50)] [Column(title: "Пароль", width: 100)]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
} }
} }

View File

@ -9,11 +9,11 @@ namespace SushiBarContracts.ViewModels
[Column(visible: false)] [Column(visible: false)]
public int Id { get; set; } public int Id { get; set; }
[Column(title: "Компонент", width: 50)] [Column(title: "Компонент", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string ComponentName { get; set; } = string.Empty; public string ComponentName { get; set; } = string.Empty;
[DisplayName("Цена")] [DisplayName("Цена")]
[Column(title: "Цена", width: 30)] [Column(title: "Цена", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public double Cost { get; set; } public double Cost { get; set; }
} }
} }

View File

@ -14,16 +14,16 @@ namespace SushiBarContracts.ViewModels
[Column(visible: false)] [Column(visible: false)]
public int Id { get; set; } public int Id { get; set; }
[Column(title: "Исполнитель ФИО", width: 150)] [Column(title: "Исполнитель ФИО", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string ImplementerFIO { get; set; } = string.Empty; public string ImplementerFIO { get; set; } = string.Empty;
[Column(title: "Пароль", width: 50)] [Column(title: "Пароль", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
[Column(title: "Опыт работы", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] [Column(title: "Опыт работы", width: 130)]
public int WorkExperience { get; set; } public int WorkExperience { get; set; }
[Column(title: "Квалификация", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] [Column(title: "Квалификация", width: 130)]
public int Qualification { get; set; } public int Qualification { get; set; }
} }
} }

View File

@ -6,7 +6,7 @@ namespace SushiBarContracts.ViewModels
public class MessageInfoViewModel : IMessageInfoModel public class MessageInfoViewModel : IMessageInfoModel
{ {
[Column(visible: false)] [Column(visible: false)]
public int Id => throw new NotImplementedException(); public int Id { get; set; }
[Column(visible: false)] [Column(visible: false)]
public string MessageId { get; set; } = string.Empty; public string MessageId { get; set; } = string.Empty;

View File

@ -8,7 +8,7 @@ namespace SushiBarContracts.ViewModels
{ {
public class OrderViewModel : IOrderModel public class OrderViewModel : IOrderModel
{ {
[Column(title: "Номер", width: 10)] [Column(title: "Номер", width: 30)]
public int Id { get; set; } public int Id { get; set; }
[Column(visible: false)] [Column(visible: false)]
@ -20,24 +20,23 @@ namespace SushiBarContracts.ViewModels
[Column(visible: false)] [Column(visible: false)]
public int? ImplementerId { get; set; } public int? ImplementerId { get; set; }
[Column(title: "Имя клиента", width: 150)] [Column(title: "Имя клиента", width: 250)]
public string ClientFIO { get; set; } = string.Empty; public string ClientFIO { get; set; } = string.Empty;
[Column(title: "Имя исполнителя", width: 150)] [Column(title: "Имя исполнителя", width: 150)]
public string? ImplementerFIO { get; set; } public string? ImplementerFIO { get; set; }
[Column(title: "Суши", width: 50)] [Column(title: "Суши", width: 100)]
public string SushiName { get; set; } = string.Empty; public string SushiName { get; set; } = string.Empty;
[Column(title: "Количество", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] [Column(title: "Количество", width: 60)]
public int Count { get; set; } public int Count { get; set; }
[Column(title: "Сумма", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] [Column(title: "Сумма", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public double Sum { get; set; } public double Sum { get; set; }
[Column(title: "Статус", width: 30)] [Column(title: "Статус", width: 80)]
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

View File

@ -9,7 +9,7 @@ namespace SushiBarContracts.ViewModels
[Column(visible: false)] [Column(visible: false)]
public int Id { get; set; } public int Id { get; set; }
[Column(title: "Название изделия", width: 50)] [Column(title: "Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string SushiName { get; set; } = string.Empty; public string SushiName { get; set; } = string.Empty;
[Column(title: "Цена", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] [Column(title: "Цена", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]