diff --git a/git/JurasicZoo/JurasicZoo/ClientPreserves.Designer.cs b/git/JurasicZoo/JurasicZoo/ClientPreserves.Designer.cs deleted file mode 100644 index 4d434d1..0000000 --- a/git/JurasicZoo/JurasicZoo/ClientPreserves.Designer.cs +++ /dev/null @@ -1,85 +0,0 @@ -namespace ZooView -{ - partial class ClientPreserves - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - dataGridView1 = new DataGridView(); - PreserveId = new DataGridViewTextBoxColumn(); - PreserveName = new DataGridViewTextBoxColumn(); - PreserveCost = new DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); - SuspendLayout(); - // - // dataGridView1 - // - dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Columns.AddRange(new DataGridViewColumn[] { PreserveId, PreserveName, PreserveCost }); - dataGridView1.Location = new Point(18, 12); - dataGridView1.Name = "dataGridView1"; - dataGridView1.RowTemplate.Height = 25; - dataGridView1.Size = new Size(240, 426); - dataGridView1.TabIndex = 1; - // - // PreserveId - // - PreserveId.HeaderText = "id"; - PreserveId.Name = "PreserveId"; - PreserveId.Visible = false; - // - // PreserveName - // - PreserveName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - PreserveName.HeaderText = "Название"; - PreserveName.Name = "PreserveName"; - // - // PreserveCost - // - PreserveCost.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - PreserveCost.HeaderText = "Стоимость"; - PreserveCost.Name = "PreserveCost"; - // - // ClientPreserves - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(277, 450); - Controls.Add(dataGridView1); - Name = "ClientPreserves"; - Text = "Заповедники"; - ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); - ResumeLayout(false); - } - - #endregion - - private DataGridView dataGridView1; - private DataGridViewTextBoxColumn PreserveId; - private DataGridViewTextBoxColumn PreserveName; - private DataGridViewTextBoxColumn PreserveCost; - } -} \ No newline at end of file diff --git a/git/JurasicZoo/JurasicZoo/ClientPreserves.cs b/git/JurasicZoo/JurasicZoo/ClientPreserves.cs deleted file mode 100644 index a160938..0000000 --- a/git/JurasicZoo/JurasicZoo/ClientPreserves.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ZooView -{ - public partial class ClientPreserves : Form - { - public ClientPreserves() - { - InitializeComponent(); - } - } -} diff --git a/git/JurasicZoo/JurasicZoo/ClientPreserves.resx b/git/JurasicZoo/JurasicZoo/ClientPreserves.resx deleted file mode 100644 index 4f08220..0000000 --- a/git/JurasicZoo/JurasicZoo/ClientPreserves.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - True - - - True - - \ No newline at end of file diff --git a/git/JurasicZoo/JurasicZoo/FormClientMain.Designer.cs b/git/JurasicZoo/JurasicZoo/FormClientMain.Designer.cs deleted file mode 100644 index b587fe7..0000000 --- a/git/JurasicZoo/JurasicZoo/FormClientMain.Designer.cs +++ /dev/null @@ -1,129 +0,0 @@ -namespace ZooView -{ - partial class FormClientMain - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - menuStrip1 = new MenuStrip(); - создатьМаршрутToolStripMenuItem = new ToolStripMenuItem(); - оплатитьМаршрутToolStripMenuItem = new ToolStripMenuItem(); - получитьОтчетToolStripMenuItem = new ToolStripMenuItem(); - вДокументToolStripMenuItem = new ToolStripMenuItem(); - наПочтуToolStripMenuItem = new ToolStripMenuItem(); - button1 = new Button(); - button2 = new Button(); - menuStrip1.SuspendLayout(); - SuspendLayout(); - // - // menuStrip1 - // - menuStrip1.Items.AddRange(new ToolStripItem[] { создатьМаршрутToolStripMenuItem, оплатитьМаршрутToolStripMenuItem, получитьОтчетToolStripMenuItem }); - menuStrip1.Location = new Point(0, 0); - menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(800, 24); - menuStrip1.TabIndex = 0; - menuStrip1.Text = "menuStrip1"; - // - // создатьМаршрутToolStripMenuItem - // - создатьМаршрутToolStripMenuItem.Name = "создатьМаршрутToolStripMenuItem"; - создатьМаршрутToolStripMenuItem.Size = new Size(116, 20); - создатьМаршрутToolStripMenuItem.Text = "Создать маршрут"; - создатьМаршрутToolStripMenuItem.Click += создатьМаршрутToolStripMenuItem_Click; - // - // оплатитьМаршрутToolStripMenuItem - // - оплатитьМаршрутToolStripMenuItem.Name = "оплатитьМаршрутToolStripMenuItem"; - оплатитьМаршрутToolStripMenuItem.Size = new Size(125, 20); - оплатитьМаршрутToolStripMenuItem.Text = "Оплатить маршрут"; - // - // получитьОтчетToolStripMenuItem - // - получитьОтчетToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { вДокументToolStripMenuItem, наПочтуToolStripMenuItem }); - получитьОтчетToolStripMenuItem.Name = "получитьОтчетToolStripMenuItem"; - получитьОтчетToolStripMenuItem.Size = new Size(106, 20); - получитьОтчетToolStripMenuItem.Text = "Получить отчет"; - // - // вДокументToolStripMenuItem - // - вДокументToolStripMenuItem.Name = "вДокументToolStripMenuItem"; - вДокументToolStripMenuItem.Size = new Size(136, 22); - вДокументToolStripMenuItem.Text = "В документ"; - // - // наПочтуToolStripMenuItem - // - наПочтуToolStripMenuItem.Name = "наПочтуToolStripMenuItem"; - наПочтуToolStripMenuItem.Size = new Size(136, 22); - наПочтуToolStripMenuItem.Text = "На почту"; - // - // button1 - // - button1.Location = new Point(156, 186); - button1.Name = "button1"; - button1.Size = new Size(75, 23); - button1.TabIndex = 1; - button1.Text = "button1"; - button1.UseVisualStyleBackColor = true; - // - // button2 - // - button2.Location = new Point(510, 192); - button2.Name = "button2"; - button2.Size = new Size(75, 23); - button2.TabIndex = 2; - button2.Text = "button2"; - button2.UseVisualStyleBackColor = true; - // - // FormClientMain - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); - Controls.Add(button2); - Controls.Add(button1); - Controls.Add(menuStrip1); - MainMenuStrip = menuStrip1; - Name = "FormClientMain"; - Text = "FormClientMain"; - menuStrip1.ResumeLayout(false); - menuStrip1.PerformLayout(); - ResumeLayout(false); - PerformLayout(); - } - - #endregion - - private MenuStrip menuStrip1; - private ToolStripMenuItem создатьМаршрутToolStripMenuItem; - private ToolStripMenuItem оплатитьМаршрутToolStripMenuItem; - private ToolStripMenuItem получитьОтчетToolStripMenuItem; - private ToolStripMenuItem вДокументToolStripMenuItem; - private ToolStripMenuItem наПочтуToolStripMenuItem; - private Button button1; - private Button button2; - } -} \ No newline at end of file diff --git a/git/JurasicZoo/JurasicZoo/FormClientMain.cs b/git/JurasicZoo/JurasicZoo/FormClientMain.cs deleted file mode 100644 index dc4b7b0..0000000 --- a/git/JurasicZoo/JurasicZoo/FormClientMain.cs +++ /dev/null @@ -1,30 +0,0 @@ -using ZooView; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ZooView -{ - public partial class FormClientMain : Form - { - public FormClientMain() - { - InitializeComponent(); - } - - private void создатьМаршрутToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormRoutes)); - if (service is FormRoutes form) - { - form.ShowDialog(); - } - } - } -} diff --git a/git/JurasicZoo/JurasicZoo/FormClientMain.resx b/git/JurasicZoo/JurasicZoo/FormClientMain.resx deleted file mode 100644 index a0623c8..0000000 --- a/git/JurasicZoo/JurasicZoo/FormClientMain.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/git/JurasicZoo/JurasicZoo/Preserve.Designer.cs b/git/JurasicZoo/JurasicZoo/Preserve.Designer.cs deleted file mode 100644 index f928026..0000000 --- a/git/JurasicZoo/JurasicZoo/Preserve.Designer.cs +++ /dev/null @@ -1,115 +0,0 @@ -namespace ZooView -{ - partial class Preserve - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - buttonAdd = new Button(); - buttonCancel = new Button(); - label1 = new Label(); - textBoxPreserve = new TextBox(); - textBox1 = new TextBox(); - label2 = new Label(); - SuspendLayout(); - // - // buttonAdd - // - buttonAdd.Location = new Point(215, 100); - buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(75, 23); - buttonAdd.TabIndex = 0; - buttonAdd.Text = "Добавить"; - buttonAdd.UseVisualStyleBackColor = true; - // - // buttonCancel - // - buttonCancel.Location = new Point(309, 100); - buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(75, 23); - buttonCancel.TabIndex = 1; - buttonCancel.Text = "Отмена"; - buttonCancel.UseVisualStyleBackColor = true; - // - // label1 - // - label1.AutoSize = true; - label1.Location = new Point(12, 20); - label1.Name = "label1"; - label1.Size = new Size(175, 15); - label1.TabIndex = 2; - label1.Text = "Введите название заповедника"; - // - // textBoxPreserve - // - textBoxPreserve.Location = new Point(193, 17); - textBoxPreserve.Name = "textBoxPreserve"; - textBoxPreserve.Size = new Size(202, 23); - textBoxPreserve.TabIndex = 3; - // - // textBox1 - // - textBox1.Location = new Point(193, 46); - textBox1.Name = "textBox1"; - textBox1.Size = new Size(110, 23); - textBox1.TabIndex = 4; - // - // label2 - // - label2.AutoSize = true; - label2.Location = new Point(12, 49); - label2.Name = "label2"; - label2.Size = new Size(180, 15); - label2.TabIndex = 5; - label2.Text = "Укажите стоимость посещения"; - // - // Preserve - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(407, 135); - Controls.Add(label2); - Controls.Add(textBox1); - Controls.Add(textBoxPreserve); - Controls.Add(label1); - Controls.Add(buttonCancel); - Controls.Add(buttonAdd); - Name = "Preserve"; - Text = "Создать заповедник"; - ResumeLayout(false); - PerformLayout(); - } - - #endregion - - private Button buttonAdd; - private Button buttonCancel; - private Label label1; - private TextBox textBoxPreserve; - private TextBox textBox1; - private Label label2; - } -} \ No newline at end of file diff --git a/git/JurasicZoo/JurasicZoo/Preserve.cs b/git/JurasicZoo/JurasicZoo/Preserve.cs deleted file mode 100644 index 433bd74..0000000 --- a/git/JurasicZoo/JurasicZoo/Preserve.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ZooView -{ - public partial class Preserve : Form - { - public Preserve() - { - InitializeComponent(); - } - } -} diff --git a/git/JurasicZoo/JurasicZoo/Preserve.resx b/git/JurasicZoo/JurasicZoo/Preserve.resx deleted file mode 100644 index af32865..0000000 --- a/git/JurasicZoo/JurasicZoo/Preserve.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/git/JurasicZoo/JurasicZoo/Preserves.Designer.cs b/git/JurasicZoo/JurasicZoo/Preserves.Designer.cs deleted file mode 100644 index fe36175..0000000 --- a/git/JurasicZoo/JurasicZoo/Preserves.Designer.cs +++ /dev/null @@ -1,133 +0,0 @@ -namespace ZooView -{ - partial class Preserves - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - dataGridView1 = new DataGridView(); - buttonAddPreserve = new Button(); - buttonUpdPreserves = new Button(); - buttonDelsPreserves = new Button(); - buttonRefPreserves = new Button(); - PreserveId = new DataGridViewTextBoxColumn(); - PreserveName = new DataGridViewTextBoxColumn(); - PreserveCost = new DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); - SuspendLayout(); - // - // dataGridView1 - // - dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Columns.AddRange(new DataGridViewColumn[] { PreserveId, PreserveName, PreserveCost }); - dataGridView1.Location = new Point(2, 2); - dataGridView1.Name = "dataGridView1"; - dataGridView1.RowTemplate.Height = 25; - dataGridView1.Size = new Size(240, 483); - dataGridView1.TabIndex = 0; - // - // buttonAddPreserve - // - buttonAddPreserve.Location = new Point(248, 29); - buttonAddPreserve.Name = "buttonAddPreserve"; - buttonAddPreserve.Size = new Size(129, 37); - buttonAddPreserve.TabIndex = 1; - buttonAddPreserve.Text = "Добавить"; - buttonAddPreserve.UseVisualStyleBackColor = true; - // - // buttonUpdPreserves - // - buttonUpdPreserves.Location = new Point(248, 82); - buttonUpdPreserves.Name = "buttonUpdPreserves"; - buttonUpdPreserves.Size = new Size(129, 37); - buttonUpdPreserves.TabIndex = 2; - buttonUpdPreserves.Text = "Изменить"; - buttonUpdPreserves.UseVisualStyleBackColor = true; - // - // buttonDelsPreserves - // - buttonDelsPreserves.Location = new Point(248, 136); - buttonDelsPreserves.Name = "buttonDelsPreserves"; - buttonDelsPreserves.Size = new Size(129, 37); - buttonDelsPreserves.TabIndex = 3; - buttonDelsPreserves.Text = "Удалить"; - buttonDelsPreserves.UseVisualStyleBackColor = true; - // - // buttonRefPreserves - // - buttonRefPreserves.Location = new Point(248, 191); - buttonRefPreserves.Name = "buttonRefPreserves"; - buttonRefPreserves.Size = new Size(129, 37); - buttonRefPreserves.TabIndex = 4; - buttonRefPreserves.Text = "Обновить"; - buttonRefPreserves.UseVisualStyleBackColor = true; - // - // PreserveId - // - PreserveId.HeaderText = "id"; - PreserveId.Name = "PreserveId"; - PreserveId.Visible = false; - // - // PreserveName - // - PreserveName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - PreserveName.HeaderText = "Название"; - PreserveName.Name = "PreserveName"; - // - // PreserveCost - // - PreserveCost.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - PreserveCost.HeaderText = "Стоимость"; - PreserveCost.Name = "PreserveCost"; - // - // Preserves - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(389, 490); - Controls.Add(buttonRefPreserves); - Controls.Add(buttonDelsPreserves); - Controls.Add(buttonUpdPreserves); - Controls.Add(buttonAddPreserve); - Controls.Add(dataGridView1); - Name = "Preserves"; - Text = "Заповедники"; - ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); - ResumeLayout(false); - } - - #endregion - - private DataGridView dataGridView1; - private Button buttonAddPreserve; - private Button buttonUpdPreserves; - private Button buttonDelsPreserves; - private Button buttonRefPreserves; - private DataGridViewTextBoxColumn PreserveId; - private DataGridViewTextBoxColumn PreserveName; - private DataGridViewTextBoxColumn PreserveCost; - } -} \ No newline at end of file diff --git a/git/JurasicZoo/JurasicZoo/Preserves.cs b/git/JurasicZoo/JurasicZoo/Preserves.cs deleted file mode 100644 index add5381..0000000 --- a/git/JurasicZoo/JurasicZoo/Preserves.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ZooView -{ - public partial class Preserves : Form - { - public Preserves() - { - InitializeComponent(); - } - } -} diff --git a/git/JurasicZoo/JurasicZoo/Preserves.resx b/git/JurasicZoo/JurasicZoo/Preserves.resx deleted file mode 100644 index fa1bde4..0000000 --- a/git/JurasicZoo/JurasicZoo/Preserves.resx +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - True - - - True - - - True - - - True - - - True - - \ No newline at end of file diff --git a/git/JurasicZoo/ZooDataBaseImplement/Migrations/20240530120856_InitialCreate.Designer.cs b/git/JurasicZoo/ZooDataBaseImplement/Migrations/20240530120856_InitialCreate.Designer.cs deleted file mode 100644 index f639dc1..0000000 --- a/git/JurasicZoo/ZooDataBaseImplement/Migrations/20240530120856_InitialCreate.Designer.cs +++ /dev/null @@ -1,219 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ZooDataBaseImplement; - -#nullable disable - -namespace ZooDataBaseImplement.Migrations -{ - [DbContext(typeof(ZooDatabase))] - [Migration("20240530120856_InitialCreate")] - partial class InitialCreate - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.18") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientFIO") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("EMail") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Password") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Clients"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Employee", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("EmployeeFIO") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Login") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Password") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Employees"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Preserve", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("EmployeeId") - .HasColumnType("int"); - - b.Property("PreserveName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("PreservePrice") - .HasColumnType("float"); - - b.HasKey("Id"); - - b.HasIndex("EmployeeId"); - - b.ToTable("Preserves"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Route", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientId") - .HasColumnType("int"); - - b.Property("DateFinish") - .HasColumnType("datetime2"); - - b.Property("DateStart") - .HasColumnType("datetime2"); - - b.Property("RouteName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("RoutePrice") - .HasColumnType("float"); - - b.Property("Status") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ClientId"); - - b.ToTable("Routes"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.RoutePreserve", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("PreserveID") - .HasColumnType("int"); - - b.Property("RouteID") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("PreserveID"); - - b.HasIndex("RouteID"); - - b.ToTable("RoutePreserves"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Preserve", b => - { - b.HasOne("ZooDataBaseImplement.Models.Employee", null) - .WithMany("Preserves") - .HasForeignKey("EmployeeId"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Route", b => - { - b.HasOne("ZooDataBaseImplement.Models.Client", "Client") - .WithMany("Routes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Client"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.RoutePreserve", b => - { - b.HasOne("ZooDataBaseImplement.Models.Preserve", "Preserve") - .WithMany("RoutePreserves") - .HasForeignKey("PreserveID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("ZooDataBaseImplement.Models.Route", "Route") - .WithMany("Preserves") - .HasForeignKey("RouteID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Preserve"); - - b.Navigation("Route"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Client", b => - { - b.Navigation("Routes"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Employee", b => - { - b.Navigation("Preserves"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Preserve", b => - { - b.Navigation("RoutePreserves"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Route", b => - { - b.Navigation("Preserves"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/git/JurasicZoo/ZooDataBaseImplement/Migrations/20240530120856_InitialCreate.cs b/git/JurasicZoo/ZooDataBaseImplement/Migrations/20240530120856_InitialCreate.cs deleted file mode 100644 index 14ea651..0000000 --- a/git/JurasicZoo/ZooDataBaseImplement/Migrations/20240530120856_InitialCreate.cs +++ /dev/null @@ -1,154 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace ZooDataBaseImplement.Migrations -{ - /// - public partial class InitialCreate : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Clients", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - ClientFIO = table.Column(type: "nvarchar(max)", nullable: false), - EMail = table.Column(type: "nvarchar(max)", nullable: false), - Password = table.Column(type: "nvarchar(max)", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Clients", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Employees", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - EmployeeFIO = table.Column(type: "nvarchar(max)", nullable: false), - Login = table.Column(type: "nvarchar(max)", nullable: false), - Password = table.Column(type: "nvarchar(max)", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Employees", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Routes", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - ClientId = table.Column(type: "int", nullable: false), - RouteName = table.Column(type: "nvarchar(max)", nullable: false), - RoutePrice = table.Column(type: "float", nullable: false), - Status = table.Column(type: "int", nullable: false), - DateStart = table.Column(type: "datetime2", nullable: false), - DateFinish = table.Column(type: "datetime2", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Routes", x => x.Id); - table.ForeignKey( - name: "FK_Routes_Clients_ClientId", - column: x => x.ClientId, - principalTable: "Clients", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "Preserves", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - PreserveName = table.Column(type: "nvarchar(max)", nullable: false), - PreservePrice = table.Column(type: "float", nullable: false), - EmployeeId = table.Column(type: "int", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Preserves", x => x.Id); - table.ForeignKey( - name: "FK_Preserves_Employees_EmployeeId", - column: x => x.EmployeeId, - principalTable: "Employees", - principalColumn: "Id"); - }); - - migrationBuilder.CreateTable( - name: "RoutePreserves", - columns: table => new - { - Id = table.Column(type: "int", nullable: false) - .Annotation("SqlServer:Identity", "1, 1"), - RouteID = table.Column(type: "int", nullable: false), - PreserveID = table.Column(type: "int", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_RoutePreserves", x => x.Id); - table.ForeignKey( - name: "FK_RoutePreserves_Preserves_PreserveID", - column: x => x.PreserveID, - principalTable: "Preserves", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_RoutePreserves_Routes_RouteID", - column: x => x.RouteID, - principalTable: "Routes", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_Preserves_EmployeeId", - table: "Preserves", - column: "EmployeeId"); - - migrationBuilder.CreateIndex( - name: "IX_RoutePreserves_PreserveID", - table: "RoutePreserves", - column: "PreserveID"); - - migrationBuilder.CreateIndex( - name: "IX_RoutePreserves_RouteID", - table: "RoutePreserves", - column: "RouteID"); - - migrationBuilder.CreateIndex( - name: "IX_Routes_ClientId", - table: "Routes", - column: "ClientId"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "RoutePreserves"); - - migrationBuilder.DropTable( - name: "Preserves"); - - migrationBuilder.DropTable( - name: "Routes"); - - migrationBuilder.DropTable( - name: "Employees"); - - migrationBuilder.DropTable( - name: "Clients"); - } - } -} diff --git a/git/JurasicZoo/ZooDataBaseImplement/Migrations/ZooDatabaseModelSnapshot.cs b/git/JurasicZoo/ZooDataBaseImplement/Migrations/ZooDatabaseModelSnapshot.cs deleted file mode 100644 index 253d970..0000000 --- a/git/JurasicZoo/ZooDataBaseImplement/Migrations/ZooDatabaseModelSnapshot.cs +++ /dev/null @@ -1,216 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using ZooDataBaseImplement; - -#nullable disable - -namespace ZooDataBaseImplement.Migrations -{ - [DbContext(typeof(ZooDatabase))] - partial class ZooDatabaseModelSnapshot : ModelSnapshot - { - protected override void BuildModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.18") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientFIO") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("EMail") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Password") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Clients"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Employee", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("EmployeeFIO") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Login") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("Password") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Employees"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Preserve", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("EmployeeId") - .HasColumnType("int"); - - b.Property("PreserveName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("PreservePrice") - .HasColumnType("float"); - - b.HasKey("Id"); - - b.HasIndex("EmployeeId"); - - b.ToTable("Preserves"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Route", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientId") - .HasColumnType("int"); - - b.Property("DateFinish") - .HasColumnType("datetime2"); - - b.Property("DateStart") - .HasColumnType("datetime2"); - - b.Property("RouteName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("RoutePrice") - .HasColumnType("float"); - - b.Property("Status") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ClientId"); - - b.ToTable("Routes"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.RoutePreserve", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("PreserveID") - .HasColumnType("int"); - - b.Property("RouteID") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("PreserveID"); - - b.HasIndex("RouteID"); - - b.ToTable("RoutePreserves"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Preserve", b => - { - b.HasOne("ZooDataBaseImplement.Models.Employee", null) - .WithMany("Preserves") - .HasForeignKey("EmployeeId"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Route", b => - { - b.HasOne("ZooDataBaseImplement.Models.Client", "Client") - .WithMany("Routes") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Client"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.RoutePreserve", b => - { - b.HasOne("ZooDataBaseImplement.Models.Preserve", "Preserve") - .WithMany("RoutePreserves") - .HasForeignKey("PreserveID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("ZooDataBaseImplement.Models.Route", "Route") - .WithMany("Preserves") - .HasForeignKey("RouteID") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Preserve"); - - b.Navigation("Route"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Client", b => - { - b.Navigation("Routes"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Employee", b => - { - b.Navigation("Preserves"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Preserve", b => - { - b.Navigation("RoutePreserves"); - }); - - modelBuilder.Entity("ZooDataBaseImplement.Models.Route", b => - { - b.Navigation("Preserves"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/git/JurasicZoo/ZooDataBaseImplement/ZooDataBaseImplement.csproj b/git/JurasicZoo/ZooDataBaseImplement/ZooDataBaseImplement.csproj index a44b9bc..b6badad 100644 --- a/git/JurasicZoo/ZooDataBaseImplement/ZooDataBaseImplement.csproj +++ b/git/JurasicZoo/ZooDataBaseImplement/ZooDataBaseImplement.csproj @@ -8,19 +8,15 @@ - all runtime; build; native; contentfiles; analyzers; buildtransitive + - - - - diff --git a/git/JurasicZoo/ZooDataBaseImplement/ZooDatabase.cs b/git/JurasicZoo/ZooDataBaseImplement/ZooDatabase.cs index 9c6cca9..fe8b626 100644 --- a/git/JurasicZoo/ZooDataBaseImplement/ZooDatabase.cs +++ b/git/JurasicZoo/ZooDataBaseImplement/ZooDatabase.cs @@ -16,7 +16,7 @@ namespace ZooDataBaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=.\SQLEXPRESS;Initial Catalog=ZooDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseNpgsql(@"Host=localhost;Port=5432;Database=jurasiczoo;Username=postgres;Password=1212"); } base.OnConfiguring(optionsBuilder); }