From 1d3bc3c6ba804d3617de8af10d9ac45c44a3a0c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?= Date: Sat, 27 Oct 2018 21:16:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eCompanies/MainWindow.xaml.cs | 9 --------- eCompanies/UsersWindow.xaml.cs | 11 +++-------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/eCompanies/MainWindow.xaml.cs b/eCompanies/MainWindow.xaml.cs index 2a2b5ef..2d4d2b9 100644 --- a/eCompanies/MainWindow.xaml.cs +++ b/eCompanies/MainWindow.xaml.cs @@ -79,16 +79,7 @@ namespace eCompanies case MessageBoxResult.No: return; case MessageBoxResult.Yes: e.Cancel = true; return; } - - //if (c.CompanyId == 0) - // App.addCompany(c); - //else if (c.needUpdate) - // App.updateCompany(c); } - //if (deletingCompanyList != null) - // App.removeCompany(deletingCompanyList); - //if (deletingUsersList != null) - // App.removeUser(deletingUsersList); // нужно здесь обновить всех редактированных юзеров // и добавить новых в базу данных // TODO: переписать все обновления БД для [dataGridRowStatus] diff --git a/eCompanies/UsersWindow.xaml.cs b/eCompanies/UsersWindow.xaml.cs index 0dcfce6..01b9bcd 100644 --- a/eCompanies/UsersWindow.xaml.cs +++ b/eCompanies/UsersWindow.xaml.cs @@ -47,15 +47,10 @@ namespace eCompanies case MessageBoxResult.No: return; case MessageBoxResult.Yes: e.Cancel = true; return; } - - if (u.UserId == 0) - { - u.CompanyId = currentCompany.CompanyId; - u.Company = currentCompany; - currentCompany.Users.Add(u); - } + u.CompanyId = currentCompany.CompanyId; + u.Company = currentCompany; + currentCompany.Users.Add(u); } - currentCompany.ContractStatus = contractStatusComboBox.SelectedIndex; currentCompany.Name = companyNameBox.Text; updateCompanyItem(currentCompany);