zhorova il y a 1 an
Parent
commit
c5900ace6a

+ 35 - 24
Perevozki/Admin.Designer.cs

@@ -44,10 +44,11 @@ namespace Perevozki
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(25, 242);
-            this.button1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.button1.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.button1.Location = new System.Drawing.Point(281, 85);
+            this.button1.Margin = new System.Windows.Forms.Padding(5);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(227, 41);
+            this.button1.Size = new System.Drawing.Size(227, 40);
             this.button1.TabIndex = 0;
             this.button1.Text = "Добавить сотрудника";
             this.button1.UseVisualStyleBackColor = true;
@@ -55,85 +56,94 @@ namespace Perevozki
             // 
             // textBox1
             // 
+            this.textBox1.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.textBox1.Location = new System.Drawing.Point(25, 124);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(5);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(224, 30);
+            this.textBox1.Size = new System.Drawing.Size(224, 26);
             this.textBox1.TabIndex = 1;
             // 
             // textBox2
             // 
+            this.textBox2.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.textBox2.Location = new System.Drawing.Point(25, 196);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(5);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(224, 30);
+            this.textBox2.Size = new System.Drawing.Size(224, 26);
             this.textBox2.TabIndex = 2;
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(208, 51);
-            this.button2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.button2.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.button2.Location = new System.Drawing.Point(127, 85);
+            this.button2.Margin = new System.Windows.Forms.Padding(5);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(41, 30);
+            this.button2.Size = new System.Drawing.Size(92, 26);
             this.button2.TabIndex = 3;
-            this.button2.Text = "X";
+            this.button2.Text = "Удалить";
             this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
             // textBox3
             // 
+            this.textBox3.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.textBox3.Location = new System.Drawing.Point(127, 51);
-            this.textBox3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.textBox3.Margin = new System.Windows.Forms.Padding(5);
             this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(63, 30);
+            this.textBox3.Size = new System.Drawing.Size(92, 26);
             this.textBox3.TabIndex = 4;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(25, 16);
+            this.label1.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label1.Location = new System.Drawing.Point(21, 9);
             this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(165, 23);
+            this.label1.Size = new System.Drawing.Size(129, 19);
             this.label1.TabIndex = 5;
             this.label1.Text = "Удалить сотрудника";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label2.Location = new System.Drawing.Point(20, 51);
             this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(97, 23);
+            this.label2.Size = new System.Drawing.Size(83, 19);
             this.label2.TabIndex = 6;
             this.label2.Text = "Введите ID";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label3.Location = new System.Drawing.Point(25, 96);
             this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(63, 23);
+            this.label3.Size = new System.Drawing.Size(48, 19);
             this.label3.TabIndex = 7;
             this.label3.Text = "Логин:";
             // 
             // label4
             // 
             this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.label4.Location = new System.Drawing.Point(25, 165);
             this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(74, 23);
+            this.label4.Size = new System.Drawing.Size(58, 19);
             this.label4.TabIndex = 8;
             this.label4.Text = "Пароль:";
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(24, 293);
+            this.button3.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.button3.Location = new System.Drawing.Point(280, 136);
             this.button3.Margin = new System.Windows.Forms.Padding(5);
             this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(227, 41);
+            this.button3.Size = new System.Drawing.Size(227, 40);
             this.button3.TabIndex = 9;
             this.button3.Text = "Изменить даные";
             this.button3.UseVisualStyleBackColor = true;
@@ -141,10 +151,11 @@ namespace Perevozki
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(25, 344);
+            this.button4.Font = new System.Drawing.Font("Cooper Black", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.button4.Location = new System.Drawing.Point(281, 187);
             this.button4.Margin = new System.Windows.Forms.Padding(5);
             this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(227, 41);
+            this.button4.Size = new System.Drawing.Size(227, 40);
             this.button4.TabIndex = 10;
             this.button4.Text = "Назад";
             this.button4.UseVisualStyleBackColor = true;
@@ -155,7 +166,7 @@ namespace Perevozki
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 23F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Window;
-            this.ClientSize = new System.Drawing.Size(284, 398);
+            this.ClientSize = new System.Drawing.Size(548, 255);
             this.Controls.Add(this.button4);
             this.Controls.Add(this.button3);
             this.Controls.Add(this.label4);
@@ -168,7 +179,7 @@ namespace Perevozki
             this.Controls.Add(this.textBox1);
             this.Controls.Add(this.button1);
             this.Font = new System.Drawing.Font("Comic Sans MS", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "Admin";
             this.Text = "Admin";
             this.ResumeLayout(false);

+ 5 - 5
Perevozki/Auth.Designer.cs

@@ -39,7 +39,7 @@ namespace Perevozki
             // Vhod
             // 
             this.Vhod.Location = new System.Drawing.Point(41, 251);
-            this.Vhod.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Vhod.Margin = new System.Windows.Forms.Padding(5);
             this.Vhod.Name = "Vhod";
             this.Vhod.Size = new System.Drawing.Size(208, 41);
             this.Vhod.TabIndex = 0;
@@ -50,7 +50,7 @@ namespace Perevozki
             // textBox1
             // 
             this.textBox1.Location = new System.Drawing.Point(41, 183);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(5);
             this.textBox1.Name = "textBox1";
             this.textBox1.Size = new System.Drawing.Size(206, 30);
             this.textBox1.TabIndex = 1;
@@ -58,7 +58,7 @@ namespace Perevozki
             // textBox2
             // 
             this.textBox2.Location = new System.Drawing.Point(41, 100);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(5);
             this.textBox2.Name = "textBox2";
             this.textBox2.Size = new System.Drawing.Size(206, 30);
             this.textBox2.TabIndex = 2;
@@ -95,9 +95,9 @@ namespace Perevozki
             this.Controls.Add(this.textBox1);
             this.Controls.Add(this.Vhod);
             this.Font = new System.Drawing.Font("Comic Sans MS", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "Auth";
-            this.Text = "Ы";
+            this.Text = "Auth";
             this.ResumeLayout(false);
             this.PerformLayout();
 

+ 3 - 3
Perevozki/Auth.cs

@@ -25,7 +25,7 @@ namespace Perevozki
             var pass = textBox2.Text;
             SqlDataAdapter adapter = new SqlDataAdapter();
             DataTable table = new DataTable();
-            string querystring = $"select Login, Pass from Usery where Login='{log}' and Pass='{pass}'";
+            string querystring = $"select Login, Password from Polzovateli where Login='{log}' and Password='{pass}'";
             SqlCommand command = new SqlCommand(querystring, dataBase.GetConnection());
             adapter.SelectCommand = command;
             adapter.Fill(table);
@@ -33,8 +33,8 @@ namespace Perevozki
             {
                 MessageBox.Show("Вы успешно вошли!");
                 Menu f2 = new Menu();
-                f2.Show();
-                Hide();
+                f2.ShowDialog();
+                
             }
             else
             {

+ 161 - 34
Perevozki/CreateOrder.Designer.cs

@@ -29,34 +29,41 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.textBox1 = new System.Windows.Forms.TextBox();
+            System.Windows.Forms.Label iDSotrLabel;
+            System.Windows.Forms.Label statusLabel;
+            System.Windows.Forms.Label dateNachalaLabel;
+            System.Windows.Forms.Label dateOkonchaniaLabel;
+            System.Windows.Forms.Label iDOrderLabel1;
             this.button1 = new System.Windows.Forms.Button();
             this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.perevozkiBDDataSet = new Perevozki.PerevozkiBDDataSet();
-            this.ordersBindingSource = new System.Windows.Forms.BindingSource(this.components);
-            this.ordersTableAdapter = new Perevozki.PerevozkiBDDataSetTableAdapters.OrdersTableAdapter();
             this.iDOrderDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.iDSotrDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.statusDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dateNachalaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dateOkonchaniaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ordersBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.perevozkiBDDataSet = new Perevozki.PerevozkiBDDataSet();
+            this.ordersTableAdapter = new Perevozki.PerevozkiBDDataSetTableAdapters.OrdersTableAdapter();
+            this.tableAdapterManager = new Perevozki.PerevozkiBDDataSetTableAdapters.TableAdapterManager();
+            this.iDSotrTextBox = new System.Windows.Forms.TextBox();
+            this.statusTextBox = new System.Windows.Forms.TextBox();
+            this.dateNachalaDateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.dateOkonchaniaDateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.iDOrderTextBox = new System.Windows.Forms.TextBox();
+            this.button2 = new System.Windows.Forms.Button();
+            iDSotrLabel = new System.Windows.Forms.Label();
+            statusLabel = new System.Windows.Forms.Label();
+            dateNachalaLabel = new System.Windows.Forms.Label();
+            dateOkonchaniaLabel = new System.Windows.Forms.Label();
+            iDOrderLabel1 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSet)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ordersBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSet)).BeginInit();
             this.SuspendLayout();
             // 
-            // textBox1
-            // 
-            this.textBox1.Location = new System.Drawing.Point(317, 327);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(5);
-            this.textBox1.Multiline = true;
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(306, 51);
-            this.textBox1.TabIndex = 5;
-            // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(14, 327);
+            this.button1.Location = new System.Drawing.Point(387, 305);
             this.button1.Margin = new System.Windows.Forms.Padding(5);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(248, 51);
@@ -83,20 +90,6 @@
             this.dataGridView1.Size = new System.Drawing.Size(633, 281);
             this.dataGridView1.TabIndex = 3;
             // 
-            // perevozkiBDDataSet
-            // 
-            this.perevozkiBDDataSet.DataSetName = "PerevozkiBDDataSet";
-            this.perevozkiBDDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
-            // ordersBindingSource
-            // 
-            this.ordersBindingSource.DataMember = "Orders";
-            this.ordersBindingSource.DataSource = this.perevozkiBDDataSet;
-            // 
-            // ordersTableAdapter
-            // 
-            this.ordersTableAdapter.ClearBeforeFill = true;
-            // 
             // iDOrderDataGridViewTextBoxColumn
             // 
             this.iDOrderDataGridViewTextBoxColumn.DataPropertyName = "IDOrder";
@@ -127,12 +120,141 @@
             this.dateOkonchaniaDataGridViewTextBoxColumn.HeaderText = "DateOkonchania";
             this.dateOkonchaniaDataGridViewTextBoxColumn.Name = "dateOkonchaniaDataGridViewTextBoxColumn";
             // 
+            // ordersBindingSource
+            // 
+            this.ordersBindingSource.DataMember = "Orders";
+            this.ordersBindingSource.DataSource = this.perevozkiBDDataSet;
+            // 
+            // perevozkiBDDataSet
+            // 
+            this.perevozkiBDDataSet.DataSetName = "PerevozkiBDDataSet";
+            this.perevozkiBDDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // ordersTableAdapter
+            // 
+            this.ordersTableAdapter.ClearBeforeFill = true;
+            // 
+            // tableAdapterManager
+            // 
+            this.tableAdapterManager.BackupDataSetBeforeUpdate = false;
+            this.tableAdapterManager.OrdersTableAdapter = this.ordersTableAdapter;
+            this.tableAdapterManager.PolzovateliTableAdapter = null;
+            this.tableAdapterManager.SmeniTableAdapter = null;
+            this.tableAdapterManager.SotrudnikiTableAdapter = null;
+            this.tableAdapterManager.UpdateOrder = Perevozki.PerevozkiBDDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+            // 
+            // iDSotrLabel
+            // 
+            iDSotrLabel.AutoSize = true;
+            iDSotrLabel.Location = new System.Drawing.Point(12, 346);
+            iDSotrLabel.Name = "iDSotrLabel";
+            iDSotrLabel.Size = new System.Drawing.Size(70, 23);
+            iDSotrLabel.TabIndex = 6;
+            iDSotrLabel.Text = "IDSotr:";
+            // 
+            // iDSotrTextBox
+            // 
+            this.iDSotrTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.ordersBindingSource, "IDSotr", true));
+            this.iDSotrTextBox.Location = new System.Drawing.Point(156, 343);
+            this.iDSotrTextBox.Name = "iDSotrTextBox";
+            this.iDSotrTextBox.Size = new System.Drawing.Size(200, 30);
+            this.iDSotrTextBox.TabIndex = 7;
+            // 
+            // statusLabel
+            // 
+            statusLabel.AutoSize = true;
+            statusLabel.Location = new System.Drawing.Point(12, 382);
+            statusLabel.Name = "statusLabel";
+            statusLabel.Size = new System.Drawing.Size(63, 23);
+            statusLabel.TabIndex = 8;
+            statusLabel.Text = "Status:";
+            // 
+            // statusTextBox
+            // 
+            this.statusTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.ordersBindingSource, "Status", true));
+            this.statusTextBox.Location = new System.Drawing.Point(156, 379);
+            this.statusTextBox.Name = "statusTextBox";
+            this.statusTextBox.Size = new System.Drawing.Size(200, 30);
+            this.statusTextBox.TabIndex = 9;
+            // 
+            // dateNachalaLabel
+            // 
+            dateNachalaLabel.AutoSize = true;
+            dateNachalaLabel.Location = new System.Drawing.Point(12, 419);
+            dateNachalaLabel.Name = "dateNachalaLabel";
+            dateNachalaLabel.Size = new System.Drawing.Size(113, 23);
+            dateNachalaLabel.TabIndex = 10;
+            dateNachalaLabel.Text = "Date Nachala:";
+            // 
+            // dateNachalaDateTimePicker
+            // 
+            this.dateNachalaDateTimePicker.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.ordersBindingSource, "DateNachala", true));
+            this.dateNachalaDateTimePicker.Location = new System.Drawing.Point(156, 415);
+            this.dateNachalaDateTimePicker.Name = "dateNachalaDateTimePicker";
+            this.dateNachalaDateTimePicker.Size = new System.Drawing.Size(200, 30);
+            this.dateNachalaDateTimePicker.TabIndex = 11;
+            // 
+            // dateOkonchaniaLabel
+            // 
+            dateOkonchaniaLabel.AutoSize = true;
+            dateOkonchaniaLabel.Location = new System.Drawing.Point(12, 455);
+            dateOkonchaniaLabel.Name = "dateOkonchaniaLabel";
+            dateOkonchaniaLabel.Size = new System.Drawing.Size(138, 23);
+            dateOkonchaniaLabel.TabIndex = 12;
+            dateOkonchaniaLabel.Text = "Date Okonchania:";
+            // 
+            // dateOkonchaniaDateTimePicker
+            // 
+            this.dateOkonchaniaDateTimePicker.DataBindings.Add(new System.Windows.Forms.Binding("Value", this.ordersBindingSource, "DateOkonchania", true));
+            this.dateOkonchaniaDateTimePicker.Location = new System.Drawing.Point(156, 451);
+            this.dateOkonchaniaDateTimePicker.Name = "dateOkonchaniaDateTimePicker";
+            this.dateOkonchaniaDateTimePicker.Size = new System.Drawing.Size(200, 30);
+            this.dateOkonchaniaDateTimePicker.TabIndex = 13;
+            // 
+            // iDOrderLabel1
+            // 
+            iDOrderLabel1.AutoSize = true;
+            iDOrderLabel1.Location = new System.Drawing.Point(12, 307);
+            iDOrderLabel1.Name = "iDOrderLabel1";
+            iDOrderLabel1.Size = new System.Drawing.Size(82, 23);
+            iDOrderLabel1.TabIndex = 13;
+            iDOrderLabel1.Text = "IDOrder:";
+            // 
+            // iDOrderTextBox
+            // 
+            this.iDOrderTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.ordersBindingSource, "IDOrder", true));
+            this.iDOrderTextBox.Location = new System.Drawing.Point(156, 307);
+            this.iDOrderTextBox.Name = "iDOrderTextBox";
+            this.iDOrderTextBox.Size = new System.Drawing.Size(200, 30);
+            this.iDOrderTextBox.TabIndex = 14;
+            // 
+            // button2
+            // 
+            this.button2.Location = new System.Drawing.Point(378, 391);
+            this.button2.Margin = new System.Windows.Forms.Padding(5);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(248, 51);
+            this.button2.TabIndex = 15;
+            this.button2.Text = "создать заказ";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
             // CreateOrder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 23F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(649, 392);
-            this.Controls.Add(this.textBox1);
+            this.ClientSize = new System.Drawing.Size(680, 552);
+            this.Controls.Add(this.button2);
+            this.Controls.Add(iDOrderLabel1);
+            this.Controls.Add(this.iDOrderTextBox);
+            this.Controls.Add(iDSotrLabel);
+            this.Controls.Add(this.iDSotrTextBox);
+            this.Controls.Add(statusLabel);
+            this.Controls.Add(this.statusTextBox);
+            this.Controls.Add(dateNachalaLabel);
+            this.Controls.Add(this.dateNachalaDateTimePicker);
+            this.Controls.Add(dateOkonchaniaLabel);
+            this.Controls.Add(this.dateOkonchaniaDateTimePicker);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.dataGridView1);
             this.Font = new System.Drawing.Font("Comic Sans MS", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
@@ -141,16 +263,14 @@
             this.Text = "CreateOrder";
             this.Load += new System.EventHandler(this.CreateOrder_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSet)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ordersBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSet)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
         }
 
         #endregion
-
-        private System.Windows.Forms.TextBox textBox1;
         private System.Windows.Forms.Button button1;
         private System.Windows.Forms.DataGridView dataGridView1;
         private PerevozkiBDDataSet perevozkiBDDataSet;
@@ -161,5 +281,12 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn statusDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn dateNachalaDataGridViewTextBoxColumn;
         private System.Windows.Forms.DataGridViewTextBoxColumn dateOkonchaniaDataGridViewTextBoxColumn;
+        private PerevozkiBDDataSetTableAdapters.TableAdapterManager tableAdapterManager;
+        public System.Windows.Forms.TextBox iDOrderTextBox;
+        public System.Windows.Forms.TextBox iDSotrTextBox;
+        public System.Windows.Forms.TextBox statusTextBox;
+        public System.Windows.Forms.DateTimePicker dateNachalaDateTimePicker;
+        public System.Windows.Forms.DateTimePicker dateOkonchaniaDateTimePicker;
+        private System.Windows.Forms.Button button2;
     }
 }

+ 19 - 0
Perevozki/CreateOrder.cs

@@ -12,6 +12,8 @@ namespace Perevozki
 {
     public partial class CreateOrder : Form
     {
+        DB dB = new DB();
+        
         public CreateOrder()
         {
             InitializeComponent();
@@ -26,7 +28,24 @@ namespace Perevozki
 
         private void button1_Click(object sender, EventArgs e)
         {
+            var io = iDOrderTextBox.Text;
+            var iso = iDSotrTextBox.Text;
+            var status = statusTextBox.Text;
+            var datena = dateNachalaDateTimePicker.Value;
+            var datekon = dateOkonchaniaDateTimePicker.Value;
 
+            System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand();
+            cmd.CommandText = $"INSERT into Orders (IDSotr,Status,DateNachala,DateOkonchania) VALUES ('{iso}','{status}','{datena}','{datekon}')";
+            cmd.Connection = dB.GetConnection();
+
+            dB.OpenConnection();
+            cmd.ExecuteNonQuery();
+            dB.CloseConnection();
+        }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            this.ordersTableAdapter.Fill(this.perevozkiBDDataSet.Orders);
         }
     }
 }

+ 23 - 2
Perevozki/CreateOrder.resx

@@ -120,13 +120,34 @@
   <metadata name="ordersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>179, 17</value>
   </metadata>
+  <metadata name="ordersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>179, 17</value>
+  </metadata>
   <metadata name="perevozkiBDDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="ordersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>179, 17</value>
+  <metadata name="perevozkiBDDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
   <metadata name="ordersTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>344, 17</value>
   </metadata>
+  <metadata name="tableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>504, 17</value>
+  </metadata>
+  <metadata name="iDSotrLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="statusLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="dateNachalaLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="dateOkonchaniaLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="iDOrderLabel1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
 </root>

+ 7 - 6
Perevozki/Menu.Designer.cs

@@ -37,7 +37,7 @@ namespace Perevozki
             // button1
             // 
             this.button1.Location = new System.Drawing.Point(76, 58);
-            this.button1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.button1.Margin = new System.Windows.Forms.Padding(5);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(125, 41);
             this.button1.TabIndex = 0;
@@ -48,7 +48,7 @@ namespace Perevozki
             // button2
             // 
             this.button2.Location = new System.Drawing.Point(76, 156);
-            this.button2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.button2.Margin = new System.Windows.Forms.Padding(5);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(125, 41);
             this.button2.TabIndex = 1;
@@ -59,12 +59,13 @@ namespace Perevozki
             // button3
             // 
             this.button3.Location = new System.Drawing.Point(76, 251);
-            this.button3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.button3.Margin = new System.Windows.Forms.Padding(5);
             this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(125, 41);
+            this.button3.Size = new System.Drawing.Size(125, 61);
             this.button3.TabIndex = 2;
-            this.button3.Text = "КоллЦентер";
+            this.button3.Text = "Создать Заявку";
             this.button3.UseVisualStyleBackColor = true;
+            this.button3.Click += new System.EventHandler(this.button3_Click);
             // 
             // Menu
             // 
@@ -75,7 +76,7 @@ namespace Perevozki
             this.Controls.Add(this.button2);
             this.Controls.Add(this.button1);
             this.Font = new System.Drawing.Font("Comic Sans MS", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "Menu";
             this.Text = "Menu";
             this.Load += new System.EventHandler(this.Menu_Load);

+ 10 - 6
Perevozki/Menu.cs

@@ -19,20 +19,24 @@ namespace Perevozki
         private void button1_Click(object sender, EventArgs e)
         {
             Admin f2 = new Admin();
-            f2.Show();
-            Hide();
+            f2.ShowDialog();
         }
 
         private void Menu_Load(object sender, EventArgs e)
         {
-
+            
         }
 
         private void button2_Click(object sender, EventArgs e)
         {
-            Voditel f4 = new Voditel();
-            f4.Show();
-            Hide();
+            Orders f4 = new Orders();
+            f4.ShowDialog();
+        }
+
+        private void button3_Click(object sender, EventArgs e)
+        {
+            CreateOrder co = new CreateOrder();
+            co.ShowDialog();
         }
     }
 }

+ 242 - 86
Perevozki/Orders.Designer.cs

@@ -1,6 +1,6 @@
 namespace Perevozki
 {
-    partial class Voditel
+    partial class Orders
     {
         /// <summary>
         /// Required designer variable.
@@ -29,141 +29,297 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.dataGridView1 = new System.Windows.Forms.DataGridView();
-            this.perevozkiBDDataSet = new Perevozki.PerevozkiBDDataSet();
-            this.perevozkiBDDataSetBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Orders));
             this.ordersBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.perevozkiBDDataSetBindingSource = new System.Windows.Forms.BindingSource(this.components);
+            this.perevozkiBDDataSet = new Perevozki.PerevozkiBDDataSet();
             this.ordersTableAdapter = new Perevozki.PerevozkiBDDataSetTableAdapters.OrdersTableAdapter();
-            this.iDOrderDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.iDSotrDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.statusDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dateNachalaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dateOkonchaniaDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.button1 = new System.Windows.Forms.Button();
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSet)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSetBindingSource)).BeginInit();
+            this.tableAdapterManager = new Perevozki.PerevozkiBDDataSetTableAdapters.TableAdapterManager();
+            this.ordersBindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.ordersDataGridView = new System.Windows.Forms.DataGridView();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox();
+            this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
+            this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
+            this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.ordersBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSetBindingSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSet)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ordersBindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ordersDataGridView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit();
+            this.bindingNavigator1.SuspendLayout();
             this.SuspendLayout();
             // 
-            // dataGridView1
-            // 
-            this.dataGridView1.AllowUserToAddRows = false;
-            this.dataGridView1.AutoGenerateColumns = false;
-            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.iDOrderDataGridViewTextBoxColumn,
-            this.iDSotrDataGridViewTextBoxColumn,
-            this.statusDataGridViewTextBoxColumn,
-            this.dateNachalaDataGridViewTextBoxColumn,
-            this.dateOkonchaniaDataGridViewTextBoxColumn});
-            this.dataGridView1.DataSource = this.ordersBindingSource;
-            this.dataGridView1.Location = new System.Drawing.Point(3, 0);
-            this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.Size = new System.Drawing.Size(551, 159);
-            this.dataGridView1.TabIndex = 0;
-            // 
-            // perevozkiBDDataSet
+            // ordersBindingSource
             // 
-            this.perevozkiBDDataSet.DataSetName = "PerevozkiBDDataSet";
-            this.perevozkiBDDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            this.ordersBindingSource.DataMember = "Orders";
+            this.ordersBindingSource.DataSource = this.perevozkiBDDataSetBindingSource;
             // 
             // perevozkiBDDataSetBindingSource
             // 
             this.perevozkiBDDataSetBindingSource.DataSource = this.perevozkiBDDataSet;
             this.perevozkiBDDataSetBindingSource.Position = 0;
             // 
-            // ordersBindingSource
+            // perevozkiBDDataSet
             // 
-            this.ordersBindingSource.DataMember = "Orders";
-            this.ordersBindingSource.DataSource = this.perevozkiBDDataSetBindingSource;
+            this.perevozkiBDDataSet.DataSetName = "PerevozkiBDDataSet";
+            this.perevozkiBDDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
             // 
             // ordersTableAdapter
             // 
             this.ordersTableAdapter.ClearBeforeFill = true;
             // 
-            // iDOrderDataGridViewTextBoxColumn
+            // button1
             // 
-            this.iDOrderDataGridViewTextBoxColumn.DataPropertyName = "IDOrder";
-            this.iDOrderDataGridViewTextBoxColumn.HeaderText = "IDOrder";
-            this.iDOrderDataGridViewTextBoxColumn.Name = "iDOrderDataGridViewTextBoxColumn";
+            this.button1.Location = new System.Drawing.Point(12, 259);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(158, 29);
+            this.button1.TabIndex = 1;
+            this.button1.Text = "изменить статус";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
-            // iDSotrDataGridViewTextBoxColumn
+            // tableAdapterManager
             // 
-            this.iDSotrDataGridViewTextBoxColumn.DataPropertyName = "IDSotr";
-            this.iDSotrDataGridViewTextBoxColumn.HeaderText = "IDSotr";
-            this.iDSotrDataGridViewTextBoxColumn.Name = "iDSotrDataGridViewTextBoxColumn";
+            this.tableAdapterManager.BackupDataSetBeforeUpdate = false;
+            this.tableAdapterManager.OrdersTableAdapter = this.ordersTableAdapter;
+            this.tableAdapterManager.PolzovateliTableAdapter = null;
+            this.tableAdapterManager.SmeniTableAdapter = null;
+            this.tableAdapterManager.SotrudnikiTableAdapter = null;
+            this.tableAdapterManager.UpdateOrder = Perevozki.PerevozkiBDDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
             // 
-            // statusDataGridViewTextBoxColumn
+            // ordersBindingSource1
             // 
-            this.statusDataGridViewTextBoxColumn.DataPropertyName = "Status";
-            this.statusDataGridViewTextBoxColumn.HeaderText = "Status";
-            this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn";
+            this.ordersBindingSource1.DataMember = "Orders";
+            this.ordersBindingSource1.DataSource = this.perevozkiBDDataSet;
             // 
-            // dateNachalaDataGridViewTextBoxColumn
+            // ordersDataGridView
             // 
-            this.dateNachalaDataGridViewTextBoxColumn.DataPropertyName = "DateNachala";
-            this.dateNachalaDataGridViewTextBoxColumn.HeaderText = "DateNachala";
-            this.dateNachalaDataGridViewTextBoxColumn.Name = "dateNachalaDataGridViewTextBoxColumn";
+            this.ordersDataGridView.AutoGenerateColumns = false;
+            this.ordersDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.ordersDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3,
+            this.dataGridViewTextBoxColumn4,
+            this.dataGridViewTextBoxColumn5});
+            this.ordersDataGridView.DataSource = this.ordersBindingSource1;
+            this.ordersDataGridView.Location = new System.Drawing.Point(12, 30);
+            this.ordersDataGridView.Name = "ordersDataGridView";
+            this.ordersDataGridView.Size = new System.Drawing.Size(564, 220);
+            this.ordersDataGridView.TabIndex = 5;
             // 
-            // dateOkonchaniaDataGridViewTextBoxColumn
+            // dataGridViewTextBoxColumn1
             // 
-            this.dateOkonchaniaDataGridViewTextBoxColumn.DataPropertyName = "DateOkonchania";
-            this.dateOkonchaniaDataGridViewTextBoxColumn.HeaderText = "DateOkonchania";
-            this.dateOkonchaniaDataGridViewTextBoxColumn.Name = "dateOkonchaniaDataGridViewTextBoxColumn";
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "IDOrder";
+            this.dataGridViewTextBoxColumn1.HeaderText = "IDOrder";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
             // 
-            // button1
+            // dataGridViewTextBoxColumn2
             // 
-            this.button1.Location = new System.Drawing.Point(12, 183);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(158, 29);
-            this.button1.TabIndex = 1;
-            this.button1.Text = "изменить статус";
-            this.button1.UseVisualStyleBackColor = true;
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "IDSotr";
+            this.dataGridViewTextBoxColumn2.HeaderText = "IDSotr";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
             // 
-            // textBox1
+            // dataGridViewTextBoxColumn3
             // 
-            this.textBox1.Location = new System.Drawing.Point(176, 183);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(171, 30);
-            this.textBox1.TabIndex = 2;
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "Status";
+            this.dataGridViewTextBoxColumn3.HeaderText = "Status";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
             // 
-            // Voditel
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "DateNachala";
+            this.dataGridViewTextBoxColumn4.HeaderText = "DateNachala";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "DateOkonchania";
+            this.dataGridViewTextBoxColumn5.HeaderText = "DateOkonchania";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            // 
+            // bindingNavigatorMoveFirstItem
+            // 
+            this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image")));
+            this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem";
+            this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveFirstItem.Text = "Переместить в начало";
+            // 
+            // bindingNavigatorMovePreviousItem
+            // 
+            this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image")));
+            this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem";
+            this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMovePreviousItem.Text = "Переместить назад";
+            // 
+            // bindingNavigatorSeparator
+            // 
+            this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator";
+            this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorPositionItem
+            // 
+            this.bindingNavigatorPositionItem.AccessibleName = "Положение";
+            this.bindingNavigatorPositionItem.AutoSize = false;
+            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
+            this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
+            this.bindingNavigatorPositionItem.Text = "0";
+            this.bindingNavigatorPositionItem.ToolTipText = "Текущее положение";
+            // 
+            // bindingNavigatorCountItem
+            // 
+            this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
+            this.bindingNavigatorCountItem.Size = new System.Drawing.Size(43, 22);
+            this.bindingNavigatorCountItem.Text = "для {0}";
+            this.bindingNavigatorCountItem.ToolTipText = "Общее число элементов";
+            // 
+            // bindingNavigatorSeparator1
+            // 
+            this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1";
+            this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorMoveNextItem
+            // 
+            this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image")));
+            this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem";
+            this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveNextItem.Text = "Переместить вперед";
+            this.bindingNavigatorMoveNextItem.Click += new System.EventHandler(this.bindingNavigatorMoveNextItem_Click);
+            // 
+            // bindingNavigatorMoveLastItem
+            // 
+            this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image")));
+            this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem";
+            this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorMoveLastItem.Text = "Переместить в конец";
+            // 
+            // bindingNavigatorSeparator2
+            // 
+            this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2";
+            this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25);
+            // 
+            // bindingNavigatorAddNewItem
+            // 
+            this.bindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
+            this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
+            this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorAddNewItem.Text = "Добавить";
+            // 
+            // bindingNavigatorDeleteItem
+            // 
+            this.bindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
+            this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
+            this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
+            this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(23, 22);
+            this.bindingNavigatorDeleteItem.Text = "Удалить";
+            // 
+            // bindingNavigator1
+            // 
+            this.bindingNavigator1.AddNewItem = this.bindingNavigatorAddNewItem;
+            this.bindingNavigator1.BindingSource = this.ordersBindingSource1;
+            this.bindingNavigator1.CountItem = this.bindingNavigatorCountItem;
+            this.bindingNavigator1.DeleteItem = this.bindingNavigatorDeleteItem;
+            this.bindingNavigator1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.bindingNavigatorMoveFirstItem,
+            this.bindingNavigatorMovePreviousItem,
+            this.bindingNavigatorSeparator,
+            this.bindingNavigatorPositionItem,
+            this.bindingNavigatorCountItem,
+            this.bindingNavigatorSeparator1,
+            this.bindingNavigatorMoveNextItem,
+            this.bindingNavigatorMoveLastItem,
+            this.bindingNavigatorSeparator2,
+            this.bindingNavigatorAddNewItem,
+            this.bindingNavigatorDeleteItem});
+            this.bindingNavigator1.Location = new System.Drawing.Point(0, 0);
+            this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
+            this.bindingNavigator1.MoveLastItem = this.bindingNavigatorMoveLastItem;
+            this.bindingNavigator1.MoveNextItem = this.bindingNavigatorMoveNextItem;
+            this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
+            this.bindingNavigator1.Name = "bindingNavigator1";
+            this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem;
+            this.bindingNavigator1.Size = new System.Drawing.Size(690, 25);
+            this.bindingNavigator1.TabIndex = 4;
+            this.bindingNavigator1.Text = "bindingNavigator1";
+            // 
+            // Orders
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 23F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(554, 231);
-            this.Controls.Add(this.textBox1);
+            this.ClientSize = new System.Drawing.Size(690, 357);
+            this.Controls.Add(this.ordersDataGridView);
+            this.Controls.Add(this.bindingNavigator1);
             this.Controls.Add(this.button1);
-            this.Controls.Add(this.dataGridView1);
             this.Font = new System.Drawing.Font("Comic Sans MS", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
-            this.Name = "Voditel";
-            this.Text = "Voditel";
+            this.Margin = new System.Windows.Forms.Padding(5);
+            this.Name = "Orders";
+            this.Text = "Orders";
             this.Load += new System.EventHandler(this.Voditel_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSet)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSetBindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ordersBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSetBindingSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.perevozkiBDDataSet)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ordersBindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ordersDataGridView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit();
+            this.bindingNavigator1.ResumeLayout(false);
+            this.bindingNavigator1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
         }
 
         #endregion
-
-        private System.Windows.Forms.DataGridView dataGridView1;
         private System.Windows.Forms.BindingSource perevozkiBDDataSetBindingSource;
         private PerevozkiBDDataSet perevozkiBDDataSet;
         private System.Windows.Forms.BindingSource ordersBindingSource;
         private PerevozkiBDDataSetTableAdapters.OrdersTableAdapter ordersTableAdapter;
-        private System.Windows.Forms.DataGridViewTextBoxColumn iDOrderDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn iDSotrDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn statusDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dateNachalaDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dateOkonchaniaDataGridViewTextBoxColumn;
         private System.Windows.Forms.Button button1;
-        private System.Windows.Forms.TextBox textBox1;
+        private PerevozkiBDDataSetTableAdapters.TableAdapterManager tableAdapterManager;
+        private System.Windows.Forms.BindingSource ordersBindingSource1;
+        private System.Windows.Forms.DataGridView ordersDataGridView;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator;
+        private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem;
+        private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem;
+        private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem;
+        private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem;
+        private System.Windows.Forms.BindingNavigator bindingNavigator1;
     }
 }

+ 18 - 2
Perevozki/Orders.cs

@@ -10,9 +10,9 @@ using System.Windows.Forms;
 
 namespace Perevozki
 {
-    public partial class Voditel : Form
+    public partial class Orders : Form
     {
-        public Voditel()
+        public Orders()
         {
             InitializeComponent();
         }
@@ -23,5 +23,21 @@ namespace Perevozki
             this.ordersTableAdapter.Fill(this.perevozkiBDDataSet.Orders);
 
         }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            this.ordersBindingSource.EndEdit();
+            this.ordersTableAdapter.Update(perevozkiBDDataSet.Orders);
+        }
+
+        private void textBox1_TextChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void bindingNavigatorMoveNextItem_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

+ 78 - 4
Perevozki/Orders.resx

@@ -120,8 +120,8 @@
   <metadata name="ordersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>420, 17</value>
   </metadata>
-  <metadata name="perevozkiBDDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+  <metadata name="perevozkiBDDataSetBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>179, 17</value>
   </metadata>
   <metadata name="perevozkiBDDataSetBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>179, 17</value>
@@ -129,10 +129,84 @@
   <metadata name="perevozkiBDDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="ordersBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>420, 17</value>
+  <metadata name="perevozkiBDDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
   </metadata>
   <metadata name="ordersTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>585, 17</value>
   </metadata>
+  <metadata name="tableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>189, 56</value>
+  </metadata>
+  <metadata name="ordersBindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>514, 56</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="bindingNavigatorMoveFirstItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMovePreviousItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="bindingNavigatorMoveNextItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        oAc0QjgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bindingNavigatorMoveLastItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="bindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
+        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
+        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
+        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
+        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
+        rkJggg==
+</value>
+  </data>
+  <data name="bindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+</value>
+  </data>
+  <metadata name="bindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>360, 56</value>
+  </metadata>
 </root>

+ 10 - 10
Perevozki/Perevozki.csproj

@@ -59,11 +59,11 @@
     <Compile Include="Auth.Designer.cs">
       <DependentUpon>Auth.cs</DependentUpon>
     </Compile>
-    <Compile Include="CallCenter.cs">
+    <Compile Include="CreateOrder.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="CallCenter.Designer.cs">
-      <DependentUpon>CallCenter.cs</DependentUpon>
+    <Compile Include="CreateOrder.Designer.cs">
+      <DependentUpon>CreateOrder.cs</DependentUpon>
     </Compile>
     <Compile Include="DB.cs" />
     <Compile Include="Menu.cs">
@@ -79,11 +79,11 @@
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Voditel.cs">
+    <Compile Include="Orders.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Voditel.Designer.cs">
-      <DependentUpon>Voditel.cs</DependentUpon>
+    <Compile Include="Orders.Designer.cs">
+      <DependentUpon>Orders.cs</DependentUpon>
     </Compile>
     <EmbeddedResource Include="Admin.resx">
       <DependentUpon>Admin.cs</DependentUpon>
@@ -91,8 +91,8 @@
     <EmbeddedResource Include="Auth.resx">
       <DependentUpon>Auth.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="CallCenter.resx">
-      <DependentUpon>CallCenter.cs</DependentUpon>
+    <EmbeddedResource Include="CreateOrder.resx">
+      <DependentUpon>CreateOrder.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Menu.resx">
       <DependentUpon>Menu.cs</DependentUpon>
@@ -107,8 +107,8 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="Voditel.resx">
-      <DependentUpon>Voditel.cs</DependentUpon>
+    <EmbeddedResource Include="Orders.resx">
+      <DependentUpon>Orders.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
     <None Include="PerevozkiBDDataSet.xsc">

+ 34 - 2
Perevozki/PerevozkiBDDataSet.Designer.cs

@@ -38,6 +38,8 @@ namespace Perevozki {
         
         private global::System.Data.DataRelation relationFK_Smeni_Sotrudniki;
         
+        private global::System.Data.DataRelation relationFK_Sotrudniki_Polzovateli;
+        
         private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema;
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -275,6 +277,7 @@ namespace Perevozki {
             this.relationFK_Orders_Polzovateli = this.Relations["FK_Orders_Polzovateli"];
             this.relationFK_Orders_Sotrudniki = this.Relations["FK_Orders_Sotrudniki"];
             this.relationFK_Smeni_Sotrudniki = this.Relations["FK_Smeni_Sotrudniki"];
+            this.relationFK_Sotrudniki_Polzovateli = this.Relations["FK_Sotrudniki_Polzovateli"];
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -305,6 +308,10 @@ namespace Perevozki {
                         this.tableSotrudniki.IDSotrColumn}, new global::System.Data.DataColumn[] {
                         this.tableSmeni.IDSotrColumn}, false);
             this.Relations.Add(this.relationFK_Smeni_Sotrudniki);
+            this.relationFK_Sotrudniki_Polzovateli = new global::System.Data.DataRelation("FK_Sotrudniki_Polzovateli", new global::System.Data.DataColumn[] {
+                        this.tablePolzovateli.IDUserColumn}, new global::System.Data.DataColumn[] {
+                        this.tableSotrudniki.IDUserColumn}, false);
+            this.Relations.Add(this.relationFK_Sotrudniki_Polzovateli);
         }
         
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1418,12 +1425,15 @@ namespace Perevozki {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
-            public SotrudnikiRow AddSotrudnikiRow(int IDSotr, int IDUser, int Dolznost) {
+            public SotrudnikiRow AddSotrudnikiRow(int IDSotr, PolzovateliRow parentPolzovateliRowByFK_Sotrudniki_Polzovateli, int Dolznost) {
                 SotrudnikiRow rowSotrudnikiRow = ((SotrudnikiRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         IDSotr,
-                        IDUser,
+                        null,
                         Dolznost};
+                if ((parentPolzovateliRowByFK_Sotrudniki_Polzovateli != null)) {
+                    columnValuesArray[1] = parentPolzovateliRowByFK_Sotrudniki_Polzovateli[0];
+                }
                 rowSotrudnikiRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowSotrudnikiRow);
                 return rowSotrudnikiRow;
@@ -1848,6 +1858,17 @@ namespace Perevozki {
                     return ((OrdersRow[])(base.GetChildRows(this.Table.ChildRelations["FK_Orders_Polzovateli"])));
                 }
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public SotrudnikiRow[] GetSotrudnikiRows() {
+                if ((this.Table.ChildRelations["FK_Sotrudniki_Polzovateli"] == null)) {
+                    return new SotrudnikiRow[0];
+                }
+                else {
+                    return ((SotrudnikiRow[])(base.GetChildRows(this.Table.ChildRelations["FK_Sotrudniki_Polzovateli"])));
+                }
+            }
         }
         
         /// <summary>
@@ -2028,6 +2049,17 @@ namespace Perevozki {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public PolzovateliRow PolzovateliRow {
+                get {
+                    return ((PolzovateliRow)(this.GetParentRow(this.Table.ParentRelations["FK_Sotrudniki_Polzovateli"])));
+                }
+                set {
+                    this.SetParentRow(value, this.Table.ParentRelations["FK_Sotrudniki_Polzovateli"]);
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
             public bool IsIDUserNull() {

+ 21 - 1
Perevozki/PerevozkiBDDataSet.xsc

@@ -1 +1,21 @@
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--<autogenerated>
+     This code was generated by a tool.
+     Changes to this file may cause incorrect behavior and will be lost if
+     the code is regenerated.
+</autogenerated>-->
+<DataSetUISetting Version="1.00" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+  <TableUISettings>
+    <TableUISetting Name="Orders">
+      <ColumnUISettings>
+        <ColumnUISetting Name="Status">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
+              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+            </ControlSetting>
+          </ControlSettings>
+        </ColumnUISetting>
+      </ColumnUISettings>
+    </TableUISetting>
+  </TableUISettings>
+</DataSetUISetting>

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
Perevozki/PerevozkiBDDataSet.xsd


+ 68 - 1
Perevozki/PerevozkiBDDataSet.xss

@@ -1 +1,68 @@
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--<autogenerated>
+     This code was generated by a tool to store the dataset designer's layout information.
+     Changes to this file may cause incorrect behavior and will be lost if
+     the code is regenerated.
+</autogenerated>-->
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="19" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+  <Shapes>
+    <Shape ID="DesignTable:Orders" ZOrder="8" X="70" Y="70" Height="172" Width="183" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:Polzovateli" ZOrder="7" X="323" Y="70" Height="134" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:Smeni" ZOrder="6" X="598" Y="274" Height="153" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:Sotrudniki" ZOrder="5" X="323" Y="274" Height="134" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+  </Shapes>
+  <Connectors>
+    <Connector ID="DesignRelation:FK_Orders_Polzovateli" ZOrder="4" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>323</X>
+          <Y>137</Y>
+        </Point>
+        <Point>
+          <X>253</X>
+          <Y>137</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Orders_Sotrudniki" ZOrder="3" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>323</X>
+          <Y>291</Y>
+        </Point>
+        <Point>
+          <X>236</X>
+          <Y>291</Y>
+        </Point>
+        <Point>
+          <X>236</X>
+          <Y>242</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Smeni_Sotrudniki" ZOrder="2" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>528</X>
+          <Y>341</Y>
+        </Point>
+        <Point>
+          <X>598</X>
+          <Y>341</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Sotrudniki_Polzovateli" ZOrder="1" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>425</X>
+          <Y>204</Y>
+        </Point>
+        <Point>
+          <X>425</X>
+          <Y>274</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+  </Connectors>
+</DiagramLayout>

BIN
Perevozki/bin/Debug/Perevozki.exe


BIN
Perevozki/bin/Debug/Perevozki.pdb


+ 0 - 0
Perevozki/obj/Debug/Perevozki.CallCenter.resources → Perevozki/obj/Debug/Perevozki.CreateOrder.resources


BIN
Perevozki/obj/Debug/Perevozki.Orders.resources


BIN
Perevozki/obj/Debug/Perevozki.Voditel.resources


+ 1 - 1
Perevozki/obj/Debug/Perevozki.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c44d73092ec42cb7831e23a0d50ec8aa1fcd465a
+7d297dcbf667c48f7228bd0065ded4bc690bf192

+ 3 - 2
Perevozki/obj/Debug/Perevozki.csproj.FileListAbsolute.txt

@@ -20,5 +20,6 @@ C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.csproj.GenerateRe
 C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.csproj.CoreCompileInputs.cache
 C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.exe
 C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.pdb
-C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.CallCenter.resources
-C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.Voditel.resources
+C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.csproj.SuggestedBindingRedirects.cache
+C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.CreateOrder.resources
+C:\Users\user2\Desktop\Perevozki\Perevozki\obj\Debug\Perevozki.Orders.resources

BIN
Perevozki/obj/Debug/Perevozki.csproj.GenerateResource.cache


+ 0 - 0
Perevozki/obj/Debug/Perevozki.csproj.SuggestedBindingRedirects.cache


BIN
Perevozki/obj/Debug/Perevozki.exe


BIN
Perevozki/obj/Debug/Perevozki.pdb


BIN
Perevozki/obj/Debug/TempPE/PerevozkiBDDataSet.Designer.cs.dll


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff