From f695dd282eb50156c6b90ed967e46a4563faeb15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?= Date: Mon, 22 Oct 2018 15:35:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20Companies=20->=20Company,=20addTextT?= =?UTF-8?q?oBlock=20->=20updateCompanyGrid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db-creation.sql | 6 +++--- eCompanies/App.xaml.cs | 12 ++++++------ eCompanies/Companies.cs | 4 ++-- eCompanies/CompaniesDBContext.cs | 6 +++--- eCompanies/Contract.cs | 4 ++-- eCompanies/MainWindow.xaml.cs | 6 +++--- eCompanies/Users.cs | 7 ++----- eCompanies/UsersWindow.xaml.cs | 12 ++---------- 8 files changed, 23 insertions(+), 34 deletions(-) diff --git a/db-creation.sql b/db-creation.sql index 8b63896..b60d351 100644 --- a/db-creation.sql +++ b/db-creation.sql @@ -4,7 +4,7 @@ GO USE [CompaniesDB]; GO -CREATE TABLE [Companies] ( +CREATE TABLE [Company] ( [CompanyId] int NOT NULL IDENTITY, [Name] nvarchar(max) NOT NULL, [ContractStatus] int NOT NULL CHECK ([ContractStatus] IN(0, 1, 2)), @@ -19,11 +19,11 @@ CREATE TABLE [Users] ( [Login] nvarchar(max) NOT NULL, [Password] nvarchar(max) NOT NULL, CONSTRAINT [PK_UserId] PRIMARY KEY ([UserId]), - CONSTRAINT [FK_Users_Companies] FOREIGN KEY (CompanyID) REFERENCES [Companies] (CompanyId) ON DELETE CASCADE + CONSTRAINT [FK_Users_Company] FOREIGN KEY (CompanyID) REFERENCES [Company] (CompanyId) ON DELETE CASCADE ); GO -INSERT INTO [Companies] (Name, ContractStatus) VALUES +INSERT INTO [Company] (Name, ContractStatus) VALUES ('Defend Studio', '0'), ('Yandex Music', '1') GO \ No newline at end of file diff --git a/eCompanies/App.xaml.cs b/eCompanies/App.xaml.cs index 69b3350..fa4af0d 100644 --- a/eCompanies/App.xaml.cs +++ b/eCompanies/App.xaml.cs @@ -11,19 +11,19 @@ namespace eCompanies /// public partial class App : Application { - private void addCompany(Companies c) + private void addCompany(Company c) { using (var db = new CompaniesDBContext()) { - db.Companies.Add(c); + db.Company.Add(c); var count = db.SaveChanges(); } } - public static ObservableCollection getCompanies() + public static ObservableCollection getCompanies() { using (var db = new CompaniesDBContext()) - return new ObservableCollection(db.Companies.AsEnumerable()); + return new ObservableCollection(db.Company.AsEnumerable()); } public static HashSet getUsers(int id) @@ -32,11 +32,11 @@ namespace eCompanies return new HashSet(db.Users.Where(b => b.CompanyId.Equals(id))); } - public static void updateCompany(Companies c) + public static void updateCompany(Company c) { using (var db = new CompaniesDBContext()) { - db.Companies.Update(c); + db.Company.Update(c); db.SaveChanges(); } } diff --git a/eCompanies/Companies.cs b/eCompanies/Companies.cs index 623aa53..e030f60 100644 --- a/eCompanies/Companies.cs +++ b/eCompanies/Companies.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; namespace eCompanies { - public partial class Companies + public partial class Company { - public Companies() + public Company() { Users = new HashSet(); contract = new Contract(this); diff --git a/eCompanies/CompaniesDBContext.cs b/eCompanies/CompaniesDBContext.cs index 21b11e7..b133db6 100644 --- a/eCompanies/CompaniesDBContext.cs +++ b/eCompanies/CompaniesDBContext.cs @@ -15,7 +15,7 @@ namespace eCompanies { } - public virtual DbSet Companies { get; set; } + public virtual DbSet Company { get; set; } public virtual DbSet Users { get; set; } protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) @@ -28,7 +28,7 @@ namespace eCompanies protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity(entity => + modelBuilder.Entity(entity => { entity.HasKey(e => e.CompanyId); @@ -55,7 +55,7 @@ namespace eCompanies entity.HasOne(d => d.Company) .WithMany(p => p.Users) .HasForeignKey(d => d.CompanyId) - .HasConstraintName("FK_Users_Companies"); + .HasConstraintName("FK_Users_Company"); }); } } diff --git a/eCompanies/Contract.cs b/eCompanies/Contract.cs index 8840d5f..e8d5b20 100644 --- a/eCompanies/Contract.cs +++ b/eCompanies/Contract.cs @@ -15,8 +15,8 @@ namespace eCompanies public class Contract { - private Companies c; - public Contract (Companies c) + private Company c; + public Contract (Company c) { this.c = c; } diff --git a/eCompanies/MainWindow.xaml.cs b/eCompanies/MainWindow.xaml.cs index 0b0dac1..4bafa0c 100644 --- a/eCompanies/MainWindow.xaml.cs +++ b/eCompanies/MainWindow.xaml.cs @@ -25,10 +25,10 @@ namespace eCompanies public MainWindow() { InitializeComponent(); - addTextToBlock(); + updateCompanyGrid(); } - private void addTextToBlock() + private void updateCompanyGrid() { companyGrid.DataContext = App.getCompanies(); } @@ -37,7 +37,7 @@ namespace eCompanies { try { - Companies company = (Companies)companyGrid.CurrentItem; + Company company = (Company)companyGrid.CurrentItem; if (usersWindowInstance != null) usersWindowInstance.Close(); usersWindowInstance = new UsersWindow(company); usersWindowInstance.Show(); diff --git a/eCompanies/Users.cs b/eCompanies/Users.cs index 118a12c..e25a273 100644 --- a/eCompanies/Users.cs +++ b/eCompanies/Users.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; - -namespace eCompanies +namespace eCompanies { public partial class Users { @@ -11,6 +8,6 @@ namespace eCompanies public string Login { get; set; } public string Password { get; set; } - public Companies Company { get; set; } + public Company Company { get; set; } } } diff --git a/eCompanies/UsersWindow.xaml.cs b/eCompanies/UsersWindow.xaml.cs index 7a06861..8c4d519 100644 --- a/eCompanies/UsersWindow.xaml.cs +++ b/eCompanies/UsersWindow.xaml.cs @@ -1,17 +1,9 @@ using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace eCompanies { @@ -20,8 +12,8 @@ namespace eCompanies /// public partial class UsersWindow : Window { - Companies currentCompany; - public UsersWindow(Companies c) + Company currentCompany; + public UsersWindow(Company c) { InitializeComponent(); currentCompany = c;