Переименование проекта

This commit is contained in:
Pyro 2024-12-13 00:11:52 +04:00
parent 3912a9cfd3
commit 952f00497d
69 changed files with 119 additions and 119 deletions

View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.11.35222.181
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectConfectionaryFactory", "ProjectConfectionaryFactory\ProjectConfectionaryFactory.csproj", "{B7790CDB-40A9-4462-AA15-04C10DCFCF7B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectConfectioneryFactory", "ProjectConfectioneryFactory\ProjectConfectioneryFactory.csproj", "{B7790CDB-40A9-4462-AA15-04C10DCFCF7B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Entities;
namespace ProjectConfectioneryFactory.Entities;
public class Client
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Entities;
namespace ProjectConfectioneryFactory.Entities;
public class Component
{

View File

@ -1,7 +1,7 @@
namespace ProjectConfectionaryFactory.Entities.Enums;
namespace ProjectConfectioneryFactory.Entities.Enums;
[Flags]
public enum ConfectionaryType
public enum ConfectioneryType
{
None = 0,
Cake = 1,

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Entities;
namespace ProjectConfectioneryFactory.Entities;
public class Order
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Entities;
namespace ProjectConfectioneryFactory.Entities;
public class OrderProduct
{

View File

@ -1,21 +1,21 @@
using ProjectConfectionaryFactory.Entities.Enums;
using ProjectConfectioneryFactory.Entities.Enums;
namespace ProjectConfectionaryFactory.Entities;
namespace ProjectConfectioneryFactory.Entities;
public class Product
{
public int Id { get; private set; }
public ConfectionaryType ConfectionaryType { get; private set; }
public ConfectioneryType ConfectioneryType { get; private set; }
public string Name { get; private set; } = string.Empty;
public double Price { get; private set; }
public IEnumerable<ProductComponent> ProductComponents { get; private set; } = [];
public static Product CreateEntity(int id, ConfectionaryType сonfectionaryType, string name, double price, IEnumerable<ProductComponent> productComponents)
public static Product CreateEntity(int id, ConfectioneryType сonfectionaryType, string name, double price, IEnumerable<ProductComponent> productComponents)
{
return new Product
{
Id = id,
ConfectionaryType = сonfectionaryType,
ConfectioneryType = сonfectionaryType,
Name = name ?? string.Empty,
Price = price,
ProductComponents = productComponents

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Entities;
namespace ProjectConfectioneryFactory.Entities;
public class ProductComponent
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Entities;
namespace ProjectConfectioneryFactory.Entities;
public class Supplier
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Entities;
namespace ProjectConfectioneryFactory.Entities;
public class Supply
{

View File

@ -1,6 +1,6 @@
namespace ProjectConfectionaryFactory
namespace ProjectConfectioneryFactory
{
partial class FormConfectionaryFactory
partial class FormConfectioneryFactory
{
/// <summary>
/// Required designer variable.
@ -112,7 +112,7 @@
отчётыToolStripMenuItem.Size = new Size(60, 20);
отчётыToolStripMenuItem.Text = "Отчёты";
//
// FormConfectionaryFactory
// FormConfectioneryFactory
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
@ -121,7 +121,7 @@
ClientSize = new Size(784, 411);
Controls.Add(menuStrip1);
MainMenuStrip = menuStrip1;
Name = "FormConfectionaryFactory";
Name = "FormConfectioneryFactory";
StartPosition = FormStartPosition.CenterScreen;
Text = "Кондитерская фабрика";
menuStrip1.ResumeLayout(false);

View File

@ -1,13 +1,13 @@
using ProjectConfectionaryFactory.Forms;
using ProjectConfectioneryFactory.Forms;
using Unity;
namespace ProjectConfectionaryFactory
namespace ProjectConfectioneryFactory
{
public partial class FormConfectionaryFactory : Form
public partial class FormConfectioneryFactory : Form
{
private readonly IUnityContainer _container;
public FormConfectionaryFactory(IUnityContainer container)
public FormConfectioneryFactory(IUnityContainer container)
{
InitializeComponent();
_container = container ?? throw new ArgumentNullException(nameof(container));

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormClient
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Entities;
using ProjectConfectioneryFactory.Repositories;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormClient : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormClients
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories;
using Unity;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormClients : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormComponent
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Entities;
using ProjectConfectioneryFactory.Repositories;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormComponent : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormComponents
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories;
using Unity;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormComponents : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormOrder
{

View File

@ -1,8 +1,8 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectionaryFactory.Repositories.Implementations;
using ProjectConfectioneryFactory.Entities;
using ProjectConfectioneryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories.Implementations;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormOrder : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormOrders
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories;
using Unity;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormOrders : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormProduct
{
@ -35,7 +35,7 @@
label3 = new Label();
buttonCancel = new Button();
buttonSave = new Button();
checkedListBoxConfectionaryType = new CheckedListBox();
checkedListBoxConfectioneryType = new CheckedListBox();
groupBox1 = new GroupBox();
dataGridViewComponents = new DataGridView();
ColumnComponent = new DataGridViewComboBoxColumn();
@ -111,13 +111,13 @@
buttonSave.UseVisualStyleBackColor = true;
buttonSave.Click += ButtonSave_Click;
//
// checkedListBoxConfectionaryType
// checkedListBoxConfectioneryType
//
checkedListBoxConfectionaryType.FormattingEnabled = true;
checkedListBoxConfectionaryType.Location = new Point(150, 31);
checkedListBoxConfectionaryType.Name = "checkedListBoxConfectionaryType";
checkedListBoxConfectionaryType.Size = new Size(207, 112);
checkedListBoxConfectionaryType.TabIndex = 12;
checkedListBoxConfectioneryType.FormattingEnabled = true;
checkedListBoxConfectioneryType.Location = new Point(150, 31);
checkedListBoxConfectioneryType.Name = "checkedListBoxConfectioneryType";
checkedListBoxConfectioneryType.Size = new Size(207, 112);
checkedListBoxConfectioneryType.TabIndex = 12;
//
// groupBox1
//
@ -163,7 +163,7 @@
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(384, 579);
Controls.Add(groupBox1);
Controls.Add(checkedListBoxConfectionaryType);
Controls.Add(checkedListBoxConfectioneryType);
Controls.Add(buttonCancel);
Controls.Add(buttonSave);
Controls.Add(label3);
@ -189,7 +189,7 @@
private Label label3;
private Button buttonCancel;
private Button buttonSave;
private CheckedListBox checkedListBoxConfectionaryType;
private CheckedListBox checkedListBoxConfectioneryType;
private GroupBox groupBox1;
private DataGridView dataGridViewComponents;
private DataGridViewComboBoxColumn ColumnComponent;

View File

@ -1,10 +1,10 @@
using Microsoft.VisualBasic.FileIO;
using ProjectConfectionaryFactory.Entities;
using ProjectConfectionaryFactory.Entities.Enums;
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectionaryFactory.Repositories.Implementations;
using ProjectConfectioneryFactory.Entities;
using ProjectConfectioneryFactory.Entities.Enums;
using ProjectConfectioneryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories.Implementations;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormProduct : Form
{
@ -23,11 +23,11 @@ namespace ProjectConfectionaryFactory.Forms
{
throw new InvalidDataException(nameof(product));
}
foreach (ConfectionaryType elem in Enum.GetValues(typeof(ConfectionaryType)))
foreach (ConfectioneryType elem in Enum.GetValues(typeof(ConfectioneryType)))
{
if ((elem & product.ConfectionaryType) != 0)
if ((elem & product.ConfectioneryType) != 0)
{
checkedListBoxConfectionaryType.SetItemChecked(checkedListBoxConfectionaryType.Items.IndexOf(elem), true);
checkedListBoxConfectioneryType.SetItemChecked(checkedListBoxConfectioneryType.Items.IndexOf(elem), true);
}
}
textBoxProductName.Text = product.Name;
@ -47,9 +47,9 @@ namespace ProjectConfectionaryFactory.Forms
InitializeComponent();
_productRepository = productRepository ?? throw new ArgumentNullException(nameof(productRepository));
foreach (var elem in Enum.GetValues(typeof(ConfectionaryType)))
foreach (var elem in Enum.GetValues(typeof(ConfectioneryType)))
{
checkedListBoxConfectionaryType.Items.Add(elem);
checkedListBoxConfectioneryType.Items.Add(elem);
}
ColumnComponent.DataSource = componentRepository.ReadComponents();
@ -61,7 +61,7 @@ namespace ProjectConfectionaryFactory.Forms
{
try
{
if (checkedListBoxConfectionaryType.CheckedItems.Count == 0 || string.IsNullOrWhiteSpace(textBoxProductName.Text) || dataGridViewComponents.RowCount < 1)
if (checkedListBoxConfectioneryType.CheckedItems.Count == 0 || string.IsNullOrWhiteSpace(textBoxProductName.Text) || dataGridViewComponents.RowCount < 1)
{
throw new Exception("Имеются незаполненные поля");
}
@ -102,14 +102,14 @@ namespace ProjectConfectionaryFactory.Forms
private Product CreateProduct(int id)
{
ConfectionaryType confectionaryType = ConfectionaryType.None;
foreach (var elem in checkedListBoxConfectionaryType.CheckedItems)
ConfectioneryType confectioneryType = ConfectioneryType.None;
foreach (var elem in checkedListBoxConfectioneryType.CheckedItems)
{
confectionaryType |= (ConfectionaryType)elem;
confectioneryType |= (ConfectioneryType)elem;
}
return Product.CreateEntity(
id,
confectionaryType,
confectioneryType,
textBoxProductName.Text,
(double)numericUpDownPrice.Value,
CreateListProductComponentFromDataGrid());

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormProducts
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories;
using Unity;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormProducts : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormSupplier
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Entities;
using ProjectConfectioneryFactory.Repositories;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormSupplier : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormSuppliers
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories;
using Unity;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormSuppliers : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormSupply
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Entities;
using ProjectConfectioneryFactory.Repositories;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormSupply : Form
{

View File

@ -1,4 +1,4 @@
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
partial class FormSupplys
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories;
using Unity;
namespace ProjectConfectionaryFactory.Forms
namespace ProjectConfectioneryFactory.Forms
{
public partial class FormSupplys : Form
{

View File

@ -1,9 +1,9 @@
using Unity.Lifetime;
using Unity;
using ProjectConfectionaryFactory.Repositories;
using ProjectConfectionaryFactory.Repositories.Implementations;
using ProjectConfectioneryFactory.Repositories;
using ProjectConfectioneryFactory.Repositories.Implementations;
namespace ProjectConfectionaryFactory
namespace ProjectConfectioneryFactory
{
internal static class Program
{
@ -16,7 +16,7 @@ namespace ProjectConfectionaryFactory
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
Application.Run(CreateContainer().Resolve<FormConfectionaryFactory>());
Application.Run(CreateContainer().Resolve<FormConfectioneryFactory>());
}
private static IUnityContainer CreateContainer()

View File

@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace ProjectConfectionaryFactory.Properties {
namespace ProjectConfectioneryFactory.Properties {
using System;
@ -39,7 +39,7 @@ namespace ProjectConfectionaryFactory.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectConfectionaryFactory.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectConfectioneryFactory.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories;
namespace ProjectConfectioneryFactory.Repositories;
public interface IClientRepository
{

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories;
namespace ProjectConfectioneryFactory.Repositories;
public interface IComponentRepository
{

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories;
namespace ProjectConfectioneryFactory.Repositories;
public interface IOrderRepository
{

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories;
namespace ProjectConfectioneryFactory.Repositories;
public interface IProductRepository
{

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories;
namespace ProjectConfectioneryFactory.Repositories;
public interface ISupplierRepository
{

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories;
namespace ProjectConfectioneryFactory.Repositories;
public interface ISupplyRepository
{
IEnumerable<Supply> ReadSupplys();

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories.Implementations;
namespace ProjectConfectioneryFactory.Repositories.Implementations;
public class ClientRepository : IClientRepository
{

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories.Implementations;
namespace ProjectConfectioneryFactory.Repositories.Implementations;
public class ComponentRepository : IComponentRepository
{

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories.Implementations;
namespace ProjectConfectioneryFactory.Repositories.Implementations;
public class OrderRepository : IOrderRepository
{

View File

@ -1,7 +1,7 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectionaryFactory.Entities.Enums;
using ProjectConfectioneryFactory.Entities;
using ProjectConfectioneryFactory.Entities.Enums;
namespace ProjectConfectionaryFactory.Repositories.Implementations;
namespace ProjectConfectioneryFactory.Repositories.Implementations;
public class ProductRepository : IProductRepository
{
@ -15,7 +15,7 @@ public class ProductRepository : IProductRepository
public Product ReadProductById(int id)
{
return Product.CreateEntity(0, ConfectionaryType.None, string.Empty, 0, null);
return Product.CreateEntity(0, ConfectioneryType.None, string.Empty, 0, null);
}
public IEnumerable<Product> ReadProducts()

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories.Implementations;
namespace ProjectConfectioneryFactory.Repositories.Implementations;
public class SupplierRepository : ISupplierRepository
{

View File

@ -1,6 +1,6 @@
using ProjectConfectionaryFactory.Entities;
using ProjectConfectioneryFactory.Entities;
namespace ProjectConfectionaryFactory.Repositories.Implementations;
namespace ProjectConfectioneryFactory.Repositories.Implementations;
public class SupplyRepository : ISupplyRepository
{