From 8ff6da0fe13a7008979cc26608d8abe41fc98035 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Mon, 9 Dec 2024 01:11:04 -0800 Subject: [PATCH] set fullname instead of id, set not visible id and fullname --- PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs | 4 ++-- .../Forms/FormContractReport.cs | 2 +- PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContracts.cs | 6 +++++- .../Forms/FormCustomerExecutorReview.cs | 4 ++-- .../Forms/FormCustomerExecutorReviews.cs | 6 +++++- PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomers.cs | 7 ++++++- PIbd-23_Gutorov_I.A._IT-Company/Forms/FormExecutors.cs | 7 ++++++- PIbd-23_Gutorov_I.A._IT-Company/Forms/FormServices.cs | 6 +++++- 8 files changed, 32 insertions(+), 10 deletions(-) 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 2cf5d43..b44ed73 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContract.cs @@ -15,11 +15,11 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms _contractRepository = contractRepository ?? throw new ArgumentNullException(nameof(contractRepository)); comboBoxContractCustomerId.DataSource = customerRepository.ReadCustomers(); - comboBoxContractCustomerId.DisplayMember = "Name"; + comboBoxContractCustomerId.DisplayMember = "FullName"; comboBoxContractCustomerId.ValueMember = "Id"; comboBoxContractExecutorId.DataSource = executorRepository.ReadExecutors(); - comboBoxContractExecutorId.DisplayMember = "Name"; + comboBoxContractExecutorId.DisplayMember = "FullName"; comboBoxContractExecutorId.ValueMember = "Id"; ColumnServiceDescription.DataSource = serviceRepository.ReadServices(); diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContractReport.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContractReport.cs index c45c1d4..fb99dbe 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContractReport.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContractReport.cs @@ -14,7 +14,7 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms _container = container ?? throw new ArgumentNullException(nameof(container)); comboBoxCutomerId.DataSource = customerRepository.ReadCustomers(); - comboBoxCutomerId.DisplayMember = "Name"; + comboBoxCutomerId.DisplayMember = "FullName"; comboBoxCutomerId.ValueMember = "Id"; } diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContracts.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContracts.cs index abce63a..8bf9ffe 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContracts.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormContracts.cs @@ -60,7 +60,11 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms } } - private void LoadList() => dataGridViewData.DataSource = _contractRepository.ReadContracts(); + private void LoadList() + { + dataGridViewData.DataSource = _contractRepository.ReadContracts(); + dataGridViewData.Columns["Id"].Visible = false; + } private bool TryGetIdentifierFromSelectedRow(out int id) { diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomerExecutorReview.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomerExecutorReview.cs index a12334a..0b29a67 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomerExecutorReview.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomerExecutorReview.cs @@ -15,11 +15,11 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms throw new ArgumentNullException(nameof(customerExecutorReviewRepository)); comboBoxCustomerExecutorReviewCustomerId.DataSource = customerRepository.ReadCustomers(); - comboBoxCustomerExecutorReviewCustomerId.DisplayMember = "Name"; + comboBoxCustomerExecutorReviewCustomerId.DisplayMember = "FullName"; comboBoxCustomerExecutorReviewCustomerId.ValueMember = "Id"; comboBoxCustomerExecutorReviewExecutorId.DataSource = executorRepository.ReadExecutors(); - comboBoxCustomerExecutorReviewExecutorId.DisplayMember = "Name"; + comboBoxCustomerExecutorReviewExecutorId.DisplayMember = "FullName"; comboBoxCustomerExecutorReviewExecutorId.ValueMember = "Id"; } diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomerExecutorReviews.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomerExecutorReviews.cs index 27d60c1..141ecbb 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomerExecutorReviews.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomerExecutorReviews.cs @@ -41,6 +41,10 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms } } - private void LoadList() => dataGridViewData.DataSource = _customerExecutorReviewRepository.ReadCustomerExecutorReviews(); + private void LoadList() + { + dataGridViewData.DataSource = _customerExecutorReviewRepository.ReadCustomerExecutorReviews(); + dataGridViewData.Columns["Id"].Visible = false; + } } } diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomers.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomers.cs index ebceb67..c72b9ab 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomers.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormCustomers.cs @@ -78,7 +78,12 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms } } - private void LoadList() => dataGridViewData.DataSource = _customerRepository.ReadCustomers(); + private void LoadList() + { + dataGridViewData.DataSource = _customerRepository.ReadCustomers(); + dataGridViewData.Columns["Id"].Visible = false; + dataGridViewData.Columns["FullName"].Visible = false; + } private bool TryGetIdentifierFromSelectedRow(out int id) { diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormExecutors.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormExecutors.cs index f4b93ba..361e943 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormExecutors.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormExecutors.cs @@ -78,7 +78,12 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms } } - private void LoadList() => dataGridViewData.DataSource = _executorRepository.ReadExecutors(); + private void LoadList() + { + dataGridViewData.DataSource = _executorRepository.ReadExecutors(); + dataGridViewData.Columns["Id"].Visible = false; + dataGridViewData.Columns["FullName"].Visible = false; + } private bool TryGetIdentifierFromSelectedRow(out int id) { diff --git a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormServices.cs b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormServices.cs index 60f8f62..c473165 100644 --- a/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormServices.cs +++ b/PIbd-23_Gutorov_I.A._IT-Company/Forms/FormServices.cs @@ -78,7 +78,11 @@ namespace PIbd_23_Gutorov_I.A._IT_Company.Forms } } - private void LoadList() => dataGridViewData.DataSource = _serviceRepository.ReadServices(); + private void LoadList() + { + dataGridViewData.DataSource = _serviceRepository.ReadServices(); + dataGridViewData.Columns["Id"].Visible = false; + } private bool TryGetIdentifierFromSelectedRow(out int id) {