mallafeev/PIbd-21_Malafeev_L.S._JewelryStore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Починил

Browse Source
This commit is contained in:
Леонид Малафеев 2024-05-20 18:04:17 +04:00
parent 86a61a24be
commit 67e0b360fa
8 changed files with 25 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,6 +10,7 @@
*.user
*.userosscache
*.sln.docstates
ImplementationExtensions
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

2
JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj
View File

@ -27,7 +27,7 @@
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;D:\SecondSemRPP\JewelryStore\ImplementationExtensions&quot;" />
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
</Target>
</Project>

2
JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj
View File

@ -19,7 +19,7 @@
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;D:\SecondSemRPP\JewelryStore\ImplementationExtensions&quot;" />
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
</Target>
</Project>

2
JewelryStore/JewerlyStoreFileImplement/JewerlyStoreFileImplement.csproj
View File

@ -19,7 +19,7 @@
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;D:\SecondSemRPP\JewelryStore\ImplementationExtensions&quot;" />
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
</Target>
</Project>

21
JewelryStore/JewerlyStoreView/FormImplementers.cs
View File

@ -1,5 +1,6 @@
using JewelryStoreContracts.BindingModels;
using JewelryStoreContracts.BusinessLogicsContracts;
using JewelryStoreContracts.DI;
using JewelryStoreView;
using Microsoft.Extensions.Logging;
using System;
@ -55,13 +56,10 @@ namespace JewerlyStoreView
/// <param name="e"></param>
private void buttonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
if (service is FormImplementer form)
var form = DependencyManager.Instance.Resolve<FormImplementer>();
if (form.ShowDialog() == DialogResult.OK)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
@ -74,14 +72,11 @@ namespace JewerlyStoreView
{
if (dataGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
if (service is FormImplementer form)
var form = DependencyManager.Instance.Resolve<FormImplementer>();
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();
}
}
}

21
JewelryStore/JewerlyStoreView/FormJewel.cs
View File

@ -101,26 +101,7 @@ namespace JewelryStoreView
private void ButtonRefresh_Click(object sender, EventArgs e)
{
if (dataGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormJewelComponent));
if (service is FormJewelComponent form)
{
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
form.Id = id;
form.Count = _JewelComponents[id].Item2;
if (form.ShowDialog() == DialogResult.OK)
{
if (form.ComponentModel == null)
{
return;
}
_logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
_JewelComponents[form.Id] = (form.ComponentModel, form.Count);
LoadData();
}
}
}
LoadData(); // зачем
}
private void ButtonDelete_Click(object sender, EventArgs e)

25
JewelryStore/JewerlyStoreView/FormJewels.cs
View File

@ -1,5 +1,6 @@
using JewelryStoreContracts.BindingModels;
using JewelryStoreContracts.BusinessLogicsContracts;
using JewelryStoreContracts.DI;
using JewerlyStoreView;
using Microsoft.Extensions.Logging;
using System;
@ -42,28 +43,22 @@ namespace JewelryStoreView
private void ButtonAdd_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormJewel));
if (service is FormJewel form)
var form = DependencyManager.Instance.Resolve<FormJewel>();
if (form.ShowDialog() == DialogResult.OK)
{
if (form.ShowDialog() == DialogResult.OK)
{
LoadData();
}
LoadData();
}
}
private void ButtonRefresh_Click(object sender, EventArgs e)
private void ButtonUpdate_Click(object sender, EventArgs e)
{
if (dataGridView.SelectedRows.Count == 1)
{
var service = Program.ServiceProvider?.GetService(typeof(FormJewel));
if (service is FormJewel form)
var form = DependencyManager.Instance.Resolve<FormJewel>();
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();
}
}
}
@ -96,7 +91,7 @@ namespace JewelryStoreView
}
}
private void ButtonUpdate_Click(object sender, EventArgs e)
private void ButtonRefresh_Click(object sender, EventArgs e)
{
LoadData();
}

6
JewelryStore/JewerlyStoreView/Program.cs
View File

@ -17,8 +17,6 @@ namespace JewelryStoreView
{
internal static class Program
{
private static ServiceProvider? _serviceProvider;
public static ServiceProvider? ServiceProvider => _serviceProvider;
/// <summary>
/// The main entry point for the application.
/// </summary>
@ -93,6 +91,6 @@ namespace JewelryStoreView
DependencyManager.Instance.RegisterType<FormMails>();
}
private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
}
private static void MailCheck(object obj) => DependencyManager.Instance?.Resolve<AbstractMailWorker>()?.MailCheck();
}
}