From 89b3fd799c93975b0a0ba9206d9e849d3d169bca Mon Sep 17 00:00:00 2001 From: Ivan Gutorov Date: Sat, 30 Nov 2024 16:15:44 +0400 Subject: [PATCH 1/2] clear code, rename russian names --- .../FormItCompany.Designer.cs | 14 +++++++------- .../Forms/FormContract.cs | 2 +- .../Forms/FormService.cs | 2 +- .../Repositories/IServiceRepository.cs | 4 ++-- .../Implementations/ServiceRepository.cs | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/PIbd-23_Gutorov_I.A._IT-Company/FormItCompany.Designer.cs b/PIbd-23_Gutorov_I.A._IT-Company/FormItCompany.Designer.cs index ada79b9..c809b25 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/FormItCompany.Designer.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/FormItCompany.Designer.cs @@ -36,13 +36,13 @@ операцииToolStripMenuItem = new ToolStripMenuItem(); CustomerContractReviewsToolStripMenuItem = new ToolStripMenuItem(); контрактыToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); + reportsToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); SuspendLayout(); // // menuStrip // - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчетыToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, reportsToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(734, 24); @@ -98,11 +98,11 @@ контрактыToolStripMenuItem.Text = "Контракты"; контрактыToolStripMenuItem.Click += ContractsToolStripMenuItem_Click; // - // отчетыToolStripMenuItem + // reportsToolStripMenuItem // - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(60, 20); - отчетыToolStripMenuItem.Text = "Отчеты"; + reportsToolStripMenuItem.Name = "reportsToolStripMenuItem"; + reportsToolStripMenuItem.Size = new Size(60, 20); + reportsToolStripMenuItem.Text = "Отчеты"; // // FormItCompany // @@ -129,7 +129,7 @@ private ToolStripMenuItem CustomersToolStripMenuItem; private ToolStripMenuItem ExecutorsToolStripMenuItem; private ToolStripMenuItem операцииToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; + private ToolStripMenuItem reportsToolStripMenuItem; private ToolStripMenuItem CustomerContractReviewsToolStripMenuItem; private ToolStripMenuItem контрактыToolStripMenuItem; private ToolStripMenuItem ServicesToolStripMenuItem; diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs index 6271a08..4275593 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs @@ -20,7 +20,7 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms comboBoxContractExecutorId.DataSource = executorRepository.ReadExecutors(); comboBoxContractExecutorId.DisplayMember = "Name"; - comboBoxContractExecutorId.ValueMember= "Id"; + comboBoxContractExecutorId.ValueMember = "Id"; ColumnServiceDescription.DataSource = serviceRepository.ReadServices(); ColumnServiceDescription.DisplayMember = "Description"; diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormService.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormService.cs index 6831fd9..c11301c 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormService.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormService.cs @@ -41,7 +41,7 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms { if (string.IsNullOrEmpty(richTextBoxServiceDescription.Text)) throw new Exception("Имеются незаполненные поля"); - + _serviceRepository.CreateService(Service.CreateEntity(0, richTextBoxServiceDescription.Text)); diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Repositories/IServiceRepository.cs b/PIbd-23_Gutorov_I.A._IT-Company/Repositories/IServiceRepository.cs index aa261c0..99d3a4f 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Repositories/IServiceRepository.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Repositories/IServiceRepository.cs @@ -8,9 +8,9 @@ public interface IServiceRepository Service ReadServiceById(int id); - void CreateService(Service Service); + void CreateService(Service service); - void UpdateService(Service Service); + void UpdateService(Service service); void DeleteService(int id); } \ No newline at end of file diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Repositories/Implementations/ServiceRepository.cs b/PIbd-23_Gutorov_I.A._IT-Company/Repositories/Implementations/ServiceRepository.cs index 922a9fc..11f9679 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Repositories/Implementations/ServiceRepository.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Repositories/Implementations/ServiceRepository.cs @@ -4,7 +4,7 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Repositories.Implementations; internal class ServiceRepository : IServiceRepository { - public void CreateService(Service Service) + public void CreateService(Service service) { } @@ -22,7 +22,7 @@ internal class ServiceRepository : IServiceRepository return []; } - public void UpdateService(Service Service) + public void UpdateService(Service service) { } } \ No newline at end of file From ad6d1d1bcba8e21c178e0032daa8262a06d6d0a6 Mon Sep 17 00:00:00 2001 From: Ivan Gutorov Date: Sat, 30 Nov 2024 16:15:44 +0400 Subject: [PATCH 2/2] clear code, rename russian names --- .../FormItCompany.Designer.cs | 56 +++++++++---------- .../Forms/FormContract.cs | 2 +- .../Forms/FormService.cs | 2 +- .../Repositories/IServiceRepository.cs | 4 +- .../Implementations/ServiceRepository.cs | 4 +- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/PIbd-23_Gutorov_I.A._IT-Company/FormItCompany.Designer.cs b/PIbd-23_Gutorov_I.A._IT-Company/FormItCompany.Designer.cs index ada79b9..b70d236 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/FormItCompany.Designer.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/FormItCompany.Designer.cs @@ -29,32 +29,32 @@ private void InitializeComponent() { menuStrip = new MenuStrip(); - справочникиToolStripMenuItem = new ToolStripMenuItem(); + EntitiesToolStripMenuItem = new ToolStripMenuItem(); CustomersToolStripMenuItem = new ToolStripMenuItem(); ExecutorsToolStripMenuItem = new ToolStripMenuItem(); ServicesToolStripMenuItem = new ToolStripMenuItem(); - операцииToolStripMenuItem = new ToolStripMenuItem(); + OperationsToolStripMenuItem = new ToolStripMenuItem(); CustomerContractReviewsToolStripMenuItem = new ToolStripMenuItem(); - контрактыToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); + ContractsToolStripMenuItem = new ToolStripMenuItem(); + ReportsToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); SuspendLayout(); // // menuStrip // - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчетыToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { EntitiesToolStripMenuItem, OperationsToolStripMenuItem, ReportsToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(734, 24); menuStrip.TabIndex = 0; menuStrip.Text = "menuStrip1"; // - // справочникиToolStripMenuItem + // EntitiesToolStripMenuItem // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { CustomersToolStripMenuItem, ExecutorsToolStripMenuItem, ServicesToolStripMenuItem }); - справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - справочникиToolStripMenuItem.Size = new Size(94, 20); - справочникиToolStripMenuItem.Text = "Справочники"; + EntitiesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { CustomersToolStripMenuItem, ExecutorsToolStripMenuItem, ServicesToolStripMenuItem }); + EntitiesToolStripMenuItem.Name = "EntitiesToolStripMenuItem"; + EntitiesToolStripMenuItem.Size = new Size(94, 20); + EntitiesToolStripMenuItem.Text = "Справочники"; // // CustomersToolStripMenuItem // @@ -77,12 +77,12 @@ ServicesToolStripMenuItem.Text = "Услуги"; ServicesToolStripMenuItem.Click += ServicesToolStripMenuItem_Click; // - // операцииToolStripMenuItem + // OperationsToolStripMenuItem // - операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { CustomerContractReviewsToolStripMenuItem, контрактыToolStripMenuItem }); - операцииToolStripMenuItem.Name = "операцииToolStripMenuItem"; - операцииToolStripMenuItem.Size = new Size(75, 20); - операцииToolStripMenuItem.Text = "Операции"; + OperationsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { CustomerContractReviewsToolStripMenuItem, ContractsToolStripMenuItem }); + OperationsToolStripMenuItem.Name = "OperationsToolStripMenuItem"; + OperationsToolStripMenuItem.Size = new Size(75, 20); + OperationsToolStripMenuItem.Text = "Операции"; // // CustomerContractReviewsToolStripMenuItem // @@ -91,18 +91,18 @@ CustomerContractReviewsToolStripMenuItem.Text = "Отзывы заказчиков"; CustomerContractReviewsToolStripMenuItem.Click += CustomerContractReviewsToolStripMenuItem_Click; // - // контрактыToolStripMenuItem + // ContractsToolStripMenuItem // - контрактыToolStripMenuItem.Name = "контрактыToolStripMenuItem"; - контрактыToolStripMenuItem.Size = new Size(181, 22); - контрактыToolStripMenuItem.Text = "Контракты"; - контрактыToolStripMenuItem.Click += ContractsToolStripMenuItem_Click; + ContractsToolStripMenuItem.Name = "ContractsToolStripMenuItem"; + ContractsToolStripMenuItem.Size = new Size(181, 22); + ContractsToolStripMenuItem.Text = "Контракты"; + ContractsToolStripMenuItem.Click += ContractsToolStripMenuItem_Click; // - // отчетыToolStripMenuItem + // ReportsToolStripMenuItem // - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(60, 20); - отчетыToolStripMenuItem.Text = "Отчеты"; + ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem"; + ReportsToolStripMenuItem.Size = new Size(60, 20); + ReportsToolStripMenuItem.Text = "Отчеты"; // // FormItCompany // @@ -125,13 +125,13 @@ #endregion private MenuStrip menuStrip; - private ToolStripMenuItem справочникиToolStripMenuItem; + private ToolStripMenuItem EntitiesToolStripMenuItem; private ToolStripMenuItem CustomersToolStripMenuItem; private ToolStripMenuItem ExecutorsToolStripMenuItem; - private ToolStripMenuItem операцииToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; + private ToolStripMenuItem OperationsToolStripMenuItem; + private ToolStripMenuItem ReportsToolStripMenuItem; private ToolStripMenuItem CustomerContractReviewsToolStripMenuItem; - private ToolStripMenuItem контрактыToolStripMenuItem; + private ToolStripMenuItem ContractsToolStripMenuItem; private ToolStripMenuItem ServicesToolStripMenuItem; } } diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs index 6271a08..4275593 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs @@ -20,7 +20,7 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms comboBoxContractExecutorId.DataSource = executorRepository.ReadExecutors(); comboBoxContractExecutorId.DisplayMember = "Name"; - comboBoxContractExecutorId.ValueMember= "Id"; + comboBoxContractExecutorId.ValueMember = "Id"; ColumnServiceDescription.DataSource = serviceRepository.ReadServices(); ColumnServiceDescription.DisplayMember = "Description"; diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormService.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormService.cs index 6831fd9..c11301c 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormService.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormService.cs @@ -41,7 +41,7 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms { if (string.IsNullOrEmpty(richTextBoxServiceDescription.Text)) throw new Exception("Имеются незаполненные поля"); - + _serviceRepository.CreateService(Service.CreateEntity(0, richTextBoxServiceDescription.Text)); diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Repositories/IServiceRepository.cs b/PIbd-23_Gutorov_I.A._IT-Company/Repositories/IServiceRepository.cs index aa261c0..99d3a4f 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Repositories/IServiceRepository.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Repositories/IServiceRepository.cs @@ -8,9 +8,9 @@ public interface IServiceRepository Service ReadServiceById(int id); - void CreateService(Service Service); + void CreateService(Service service); - void UpdateService(Service Service); + void UpdateService(Service service); void DeleteService(int id); } \ No newline at end of file diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Repositories/Implementations/ServiceRepository.cs b/PIbd-23_Gutorov_I.A._IT-Company/Repositories/Implementations/ServiceRepository.cs index 922a9fc..11f9679 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Repositories/Implementations/ServiceRepository.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Repositories/Implementations/ServiceRepository.cs @@ -4,7 +4,7 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Repositories.Implementations; internal class ServiceRepository : IServiceRepository { - public void CreateService(Service Service) + public void CreateService(Service service) { } @@ -22,7 +22,7 @@ internal class ServiceRepository : IServiceRepository return []; } - public void UpdateService(Service Service) + public void UpdateService(Service service) { } } \ No newline at end of file