1yuee/PIbd-23-Lisov-N.A-SewingDresses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Program file has been changed and forms as well.

Browse Source
This commit is contained in:
Yuee Shiness 2023-04-23 21:35:18 +04:00
parent 4c2f39a144
commit 526a5aa80a
6 changed files with 148 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
SewingDresses/FormDress.cs
View File

@ -1,5 +1,6 @@
using DressAtelierContracts.BindingModels;
using DressAtelierContracts.BusinessLogicContracts;
using DressAtelierContracts.DI;
using DressAtelierContracts.SearchModels;
using DressAtelierDataModels.Models;
using Microsoft.Extensions.Logging;
@ -89,53 +90,51 @@ namespace SewingDresses
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormDressMaterial));
if (service is FormDressMaterial form)
var form = DependencyManager.Instance.Resolve<FormDressMaterial>();
if (form.ShowDialog() == DialogResult.OK)
{
if (form.ShowDialog() == DialogResult.OK)
if (form.MaterialModel == null)
{
if (form.MaterialModel == null)
{
return;
}
_logger.LogInformation("Adding new material: { ComponentName}- { Count}", form.MaterialModel.ComponentName, form.Count);
if (_dressComponents.ContainsKey(form.ID))
{
_dressComponents[form.ID] = (form.MaterialModel, form.Count);
}
else
{
_dressComponents.Add(form.ID, (form.MaterialModel, form.Count));
}
LoadData();
return;
}
_logger.LogInformation("Adding new material: { ComponentName}- { Count}", form.MaterialModel.ComponentName, form.Count);
if (_dressComponents.ContainsKey(form.ID))
{
_dressComponents[form.ID] = (form.MaterialModel, form.Count);
}
else
{
_dressComponents.Add(form.ID, (form.MaterialModel, form.Count));
}
LoadData();
}
}
private void ButtonUpdate_Click(object sender, EventArgs e)
{
if (dressGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormDressMaterial));
if (service is FormDressMaterial form)
var form = DependencyManager.Instance.Resolve<FormDressMaterial>();
int id = Convert.ToInt32(dressGridView.SelectedRows[0].Cells[0].Value);
form.ID = id;
form.Count = _dressComponents[id].Item2;
if (form.ShowDialog() == DialogResult.OK)
{
int id = Convert.ToInt32(dressGridView.SelectedRows[0].Cells[0].Value);
form.ID = id;
form.Count = _dressComponents[id].Item2;
if (form.ShowDialog() == DialogResult.OK)
if (form.MaterialModel == null)
{
if (form.MaterialModel == null)
{
return;
}
_logger.LogInformation("Changing material:{ ComponentName}- { Count}", form.MaterialModel.ComponentName, form.Count);
_dressComponents[form.ID] = (form.MaterialModel,form.Count);
LoadData();
return;
}
_logger.LogInformation("Changing material:{ ComponentName}- { Count}", form.MaterialModel.ComponentName, form.Count);
_dressComponents[form.ID] = (form.MaterialModel,form.Count);
LoadData();
}
}
}

25
SewingDresses/FormDresses.cs
View File

@ -1,5 +1,6 @@
using DressAtelierContracts.BindingModels;
using DressAtelierContracts.BusinessLogicContracts;
using DressAtelierContracts.DI;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
@ -46,29 +47,25 @@ namespace SewingDresses
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormDress));
if (service is FormDress form)
var form = DependencyManager.Instance.Resolve<FormDress>();
if (form.ShowDialog() == DialogResult.OK)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
private void ButtonUpdate_Click(object sender, EventArgs e)
{
if (dressGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormDress));
if (service is FormDress form)
var form = DependencyManager.Instance.Resolve<FormDress>();
form.ID = Convert.ToInt32(dressGridView.SelectedRows[0].Cells["ID"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
form.ID = Convert.ToInt32(dressGridView.SelectedRows[0].Cells["ID"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
}

25
SewingDresses/FormEmployees.cs
View File

@ -1,4 +1,5 @@
using DressAtelierContracts.BusinessLogicContracts;
using DressAtelierContracts.DI;
using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.Extensions.Logging;
using System;
@ -32,29 +33,27 @@ namespace SewingDresses
private void buttonAddEmployee_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormEmployee));
if (service is FormEmployee form)
var form = DependencyManager.Instance.Resolve<FormEmployee>();
if (form.ShowDialog() == DialogResult.OK)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
private void buttonChangeEmployee_Click(object sender, EventArgs e)
{
if (employeeGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormEmployee));
if (service is FormEmployee form)
var form = DependencyManager.Instance.Resolve<FormEmployee>();
form.ID = Convert.ToInt32(employeeGridView.SelectedRows[0].Cells["ID"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
form.ID = Convert.ToInt32(employeeGridView.SelectedRows[0].Cells["ID"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
}

75
SewingDresses/FormMain.cs
View File

@ -1,6 +1,7 @@
using DressAtelierBusinessLogic.BusinessLogic;
using DressAtelierContracts.BindingModels;
using DressAtelierContracts.BusinessLogicContracts;
using DressAtelierContracts.DI;
using DressAtelierDataModels.Enums;
using Microsoft.Extensions.Logging;
using System;
@ -55,31 +56,26 @@ namespace SewingDresses
private void materialsToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormMaterials));
if (service is FormMaterials form)
{
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormMaterials>();
form.ShowDialog();
}
private void dressesToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormDresses));
if (service is FormDresses form)
{
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormDresses>();
form.ShowDialog();
}
private void ButtonCreateOrder_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormOrderCreation));
if (service is FormOrderCreation form)
{
form.ShowDialog();
LoadData();
}
var form = DependencyManager.Instance.Resolve<FormOrderCreation>();
form.ShowDialog();
LoadData();
}
private void ButtonIssuedOrder_Click(object sender, EventArgs e)
@ -133,53 +129,48 @@ namespace SewingDresses
private void materialsByDressesToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportDressMaterials));
if (service is FormReportDressMaterials form)
{
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormReportDressMaterials>();
form.ShowDialog();
}
private void ordersListToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
if (service is FormReportOrders form)
{
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormReportOrders>();
form.ShowDialog();
}
private void clientsToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormClients));
if (service is FormClients form)
{
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormClients>();
form.ShowDialog();
}
private void startWorkingToolStripMenuItem_Click(object sender, EventArgs e)
{
_workImitation.DoWork((Program.ServiceProvider?.GetService(typeof(IEmployeeLogic)) as IEmployeeLogic)!, _orderLogic);
_workImitation.DoWork(DependencyManager.Instance.Resolve<IEmployeeLogic>(), _orderLogic);
MessageBox.Show("Work process has started!", "Message", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
private void employeesToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormEmployees));
if (service is FormEmployees form)
{
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormEmployees>();
form.ShowDialog();
}
private void emailsToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormEmails));
if (service is FormEmails form)
{
form.ShowDialog();
}
var form = DependencyManager.Instance.Resolve<FormEmails>();
form.ShowDialog();
}
private void createBackupToolStripMenuItem_Click(object sender, EventArgs e)

27
SewingDresses/FormMaterials.cs
View File

@ -11,6 +11,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DressAtelierContracts.DI;
namespace SewingDresses
{
@ -47,30 +48,28 @@ namespace SewingDresses
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormMaterial));
if (service is FormMaterial form)
var form = DependencyManager.Instance.Resolve<FormMaterial>();
if (form.ShowDialog() == DialogResult.OK)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
private void ButtonUpdate_Click(object sender, EventArgs e)
{
if (materialGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormMaterial));
if (service is FormMaterial form)
var form = DependencyManager.Instance.Resolve<FormMaterial>();
form.ID = Convert.ToInt32(materialGridView.SelectedRows[0].Cells["ID"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
form.ID = Convert.ToInt32(materialGridView.SelectedRows[0].Cells["ID"].Value);
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
}

96
SewingDresses/Program.cs
View File

@ -4,9 +4,7 @@ using DressAtelierBusinessLogic.OfficePackage;
using DressAtelierBusinessLogic.OfficePackage.Implements;
using DressAtelierContracts.BindingModels;
using DressAtelierContracts.BusinessLogicContracts;
using DressAtelierContracts.StorageContracts;
using DressAtelierDatabaseImplement.Implements;
using DressAtelierDatabaseImplementation.Implements;
using DressAtelierContracts.DI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
@ -15,8 +13,6 @@ namespace SewingDresses
{
internal static class Program
{
private static ServiceProvider? _serviceProvider;
public static ServiceProvider? ServiceProvider => _serviceProvider;
/// <summary>
/// The main entry point for the application.
@ -28,12 +24,11 @@ namespace SewingDresses
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
var services = new ServiceCollection();
ConfigureServices(services);
_serviceProvider = services.BuildServiceProvider();
InitDependencies();
try
{
var mailSender = _serviceProvider.GetService<AbstractMailEmployee>();
var mailSender = DependencyManager.Instance.Resolve<AbstractMailEmployee>();
mailSender?.MailConfig(new MailConfigBindingModel
{
Login = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
@ -48,60 +43,63 @@ namespace SewingDresses
}
catch(Exception ex)
{
var logger = _serviceProvider.GetService<ILogger>();
var logger = DependencyManager.Instance.Resolve<ILogger>();
logger?.LogError(ex, "Working with email error");
}
Application.Run(_serviceProvider.GetRequiredService<FormMain>());
Application.Run(DependencyManager.Instance.Resolve<FormMain>());
}
private static void ConfigureServices(ServiceCollection services)
private static void InitDependencies()
{
services.AddLogging(option =>
{
option.SetMinimumLevel(LogLevel.Information);
option.AddNLog("nlog.config");
DependencyManager.InitDependency();
DependencyManager.Instance.AddLogging(option =>
{
option.SetMinimumLevel(LogLevel.Information);
option.AddNLog("nlog.config");
});
services.AddTransient<IMaterialStorage, MaterialStorage>();
services.AddTransient<IOrderStorage, OrderStorage>();
services.AddTransient<IDressStorage, DressStorage>();
services.AddTransient<IClientStorage, ClientStorage>();
services.AddTransient<IEmployeeStorage, EmployeeStorage>();
services.AddTransient<IMessageInfoStorage,MessageInfoStorage>();
services.AddTransient<IBackupInfo,BackupInfo>();
services.AddTransient<IMaterialLogic, MaterialLogic>();
services.AddTransient<IOrderLogic, OrderLogic>();
services.AddTransient<IDressLogic, DressLogic>();
services.AddTransient<IReportLogic, ReportLogic>();
services.AddTransient<IClientLogic, ClientLogic>();
services.AddTransient<IEmployeeLogic, EmployeeLogic>();
services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
services.AddTransient<IBackupLogic, BackupLogic>();
DependencyManager.Instance.RegisterType<IMaterialStorage, MaterialStorage>();
DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
DependencyManager.Instance.RegisterType<IDressStorage, DressStorage>();
DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
DependencyManager.Instance.RegisterType<IEmployeeStorage, EmployeeStorage>();
DependencyManager.Instance.RegisterType<IMessageInfoStorage,MessageInfoStorage>();
DependencyManager.Instance.RegisterType<IBackupInfo, BackupInfo>();
services.AddTransient<IWorkImitation, WorkImitation>();
services.AddSingleton<AbstractMailEmployee, MailKitEmployee>();
DependencyManager.Instance.RegisterType<IMaterialLogic, MaterialLogic>();
DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
DependencyManager.Instance.RegisterType<IDressLogic, DressLogic>();
DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
DependencyManager.Instance.RegisterType<IEmployeeLogic, EmployeeLogic>();
DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
DependencyManager.Instance.RegisterType<IBackupLogic, BackupLogic>();
services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
services.AddTransient<AbstractSaveToWord, SaveToWord>();
services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
DependencyManager.Instance.RegisterType<IWorkImitation, WorkImitation>();
DependencyManager.Instance.RegisterType<AbstractMailEmployee, MailKitEmployee>();
services.AddTransient<FormMain>();
services.AddTransient<FormMaterial>();
services.AddTransient<FormMaterials>();
services.AddTransient<FormOrderCreation>();
services.AddTransient<FormDress>();
services.AddTransient<FormDressMaterial>();
services.AddTransient<FormDresses>();
services.AddTransient<FormReportDressMaterials>();
services.AddTransient<FormReportOrders>();
services.AddTransient<FormClients>();
services.AddTransient<FormEmployees>();
services.AddTransient<FormEmployee>();
services.AddTransient<FormEmails>();
DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
DependencyManager.Instance.RegisterType<FormMain>();
DependencyManager.Instance.RegisterType<FormMaterial>();
DependencyManager.Instance.RegisterType<FormMaterials>();
DependencyManager.Instance.RegisterType<FormOrderCreation>();
DependencyManager.Instance.RegisterType<FormDress>();
DependencyManager.Instance.RegisterType<FormDressMaterial>();
DependencyManager.Instance.RegisterType<FormDresses>();
DependencyManager.Instance.RegisterType<FormReportDressMaterials>();
DependencyManager.Instance.RegisterType<FormReportOrders>();
DependencyManager.Instance.RegisterType<FormClients>();
DependencyManager.Instance.RegisterType<FormEmployees>();
DependencyManager.Instance.RegisterType<FormEmployee>();
DependencyManager.Instance.RegisterType<FormEmails>();
}
private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailEmployee>()?.MailCheck();
private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailEmployee>()?.MailCheck();
}
}