Your Name 1 year ago
parent
commit
8ae3580cfe

+ 3 - 3
СУБД Техносервис/FormMain.Designer.cs

@@ -74,7 +74,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("Arial Narrow", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.label1.Location = new System.Drawing.Point(35, 31);
+            this.label1.Location = new System.Drawing.Point(246, 27);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(177, 37);
             this.label1.TabIndex = 1;
@@ -82,9 +82,9 @@
             // 
             // pictureBox1
             // 
-            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Left;
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(351, 0);
+            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(144, 100);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;

+ 1 - 1
СУБД Техносервис/FormMain.cs

@@ -37,7 +37,6 @@ namespace СУБД_Техносервис
         {
             // TODO: данная строка кода позволяет загрузить данные в таблицу "techServiceBAUDataSet.Employee". При необходимости она может быть перемещена или удалена.
             this.employeeTableAdapter.Fill(this.techServiceBAUDataSet.Employee);
-            GetCapcha();
         }
 
         private void CbxShowPassw_CheckedChanged(object sender, EventArgs e)
@@ -76,6 +75,7 @@ namespace СУБД_Техносервис
             }
             FormWorkPlace FrmWork = new FormWorkPlace();
             this.Hide();
+            FrmWork.BsEmployee.Filter = $"Login = '{TbxLogin.Text}'";
             FrmWork.ShowDialog();
             this.Show();
             GetCapcha();

+ 1 - 1
СУБД Техносервис/FormMain.resx

@@ -564,7 +564,7 @@
   <data name="PCapcha.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAUgAAACJCAIAAADBtTbBAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAMQZJREFUeF7tnF2WbSuunN0RP1czqx1uiBvjDvjBnSgLPogZCJg/a63MnbtOxmBQ
+        wAAADsABataJCQAAMQZJREFUeF7tnF2WbSuunN0RP1czqx1uiBvjDvjBnSgLPogZCJg/a63MnbtOxmBQ
         oZAQQkwyc59xx/0f//l5+F//5//FgGj+xS9+cR8/6GGfPGA99V/84hd38BN/Y4PfX9e/+MXL+CkPO/1O
         /n3Pv/jFO/hZf4rznucXLsVdv/jFL3b4EQ87nquGFMgvfvGLF/DnH/byMeuRJ7GxX/ziZ+DHfpM/609x
         J26+3L531v7iF38v/vDD5uH524NLlMtjfvGLn4Of+WX++YfdWIUes4+k1MBbeBT8i5v43//3fzb2T0X6

+ 268 - 16
СУБД Техносервис/FormWorkPlace.Designer.cs

@@ -28,10 +28,11 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormWorkPlace));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
@@ -40,27 +41,61 @@
             this.Photo = new System.Windows.Forms.DataGridViewImageColumn();
             this.Title = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.FIO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PbxPhoto = new System.Windows.Forms.PictureBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.LblPhoto = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.RbtNum = new System.Windows.Forms.RadioButton();
+            this.RbtInfo = new System.Windows.Forms.RadioButton();
+            this.TbxFind = new System.Windows.Forms.TextBox();
+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();
+            this.ToolSCount = new System.Windows.Forms.ToolStripStatusLabel();
+            this.label5 = new System.Windows.Forms.Label();
+            this.CmbDefect = new System.Windows.Forms.ComboBox();
+            this.BsEmployee = new System.Windows.Forms.BindingSource(this.components);
+            this.techServiceBAUDataSet = new СУБД_Техносервис.TechServiceBAUDataSet();
+            this.employeeTableAdapter = new СУБД_Техносервис.TechServiceBAUDataSetTableAdapters.EmployeeTableAdapter();
+            this.tableAdapterManager = new СУБД_Техносервис.TechServiceBAUDataSetTableAdapters.TableAdapterManager();
+            this.BsAllTypeDefect = new System.Windows.Forms.BindingSource(this.components);
+            this.allTypeDefectTableAdapter = new СУБД_Техносервис.TechServiceBAUDataSetTableAdapters.AllTypeDefectTableAdapter();
+            this.BsRequest = new System.Windows.Forms.BindingSource(this.components);
+            this.requestTableAdapter = new СУБД_Техносервис.TechServiceBAUDataSetTableAdapters.RequestTableAdapter();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.DgvRequest)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PbxPhoto)).BeginInit();
+            this.groupBox1.SuspendLayout();
+            this.statusStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.BsEmployee)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.techServiceBAUDataSet)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.BsAllTypeDefect)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.BsRequest)).BeginInit();
             this.SuspendLayout();
             // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(225)))));
+            this.panel1.Controls.Add(this.LblPhoto);
+            this.panel1.Controls.Add(this.label2);
+            this.panel1.Controls.Add(this.label4);
+            this.panel1.Controls.Add(this.PbxPhoto);
+            this.panel1.Controls.Add(this.label3);
             this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.pictureBox1);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(492, 100);
+            this.panel1.Size = new System.Drawing.Size(570, 100);
             this.panel1.TabIndex = 1;
             // 
             // label1
             // 
+            this.label1.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("Arial Narrow", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.label1.Location = new System.Drawing.Point(56, 31);
+            this.label1.Location = new System.Drawing.Point(175, 31);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(204, 37);
             this.label1.TabIndex = 1;
@@ -68,9 +103,9 @@
             // 
             // pictureBox1
             // 
-            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Left;
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(348, 0);
+            this.pictureBox1.Location = new System.Drawing.Point(0, 0);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(144, 100);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -81,6 +116,9 @@
             // 
             this.DgvRequest.AllowUserToAddRows = false;
             this.DgvRequest.AllowUserToDeleteRows = false;
+            this.DgvRequest.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.DgvRequest.BackgroundColor = System.Drawing.Color.White;
             this.DgvRequest.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.DgvRequest.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.SingleHorizontal;
@@ -92,7 +130,7 @@
             this.Title,
             this.FIO});
             this.DgvRequest.GridColor = System.Drawing.Color.White;
-            this.DgvRequest.Location = new System.Drawing.Point(12, 106);
+            this.DgvRequest.Location = new System.Drawing.Point(12, 168);
             this.DgvRequest.MultiSelect = false;
             this.DgvRequest.Name = "DgvRequest";
             this.DgvRequest.ReadOnly = true;
@@ -103,13 +141,13 @@
             this.DgvRequest.RowTemplate.Height = 130;
             this.DgvRequest.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.DgvRequest.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.DgvRequest.Size = new System.Drawing.Size(468, 292);
+            this.DgvRequest.Size = new System.Drawing.Size(546, 283);
             this.DgvRequest.TabIndex = 2;
             // 
             // id
             // 
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.id.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.id.DefaultCellStyle = dataGridViewCellStyle1;
             this.id.HeaderText = "ид";
             this.id.Name = "id";
             this.id.ReadOnly = true;
@@ -127,8 +165,8 @@
             // 
             // Title
             // 
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
-            this.Title.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
+            this.Title.DefaultCellStyle = dataGridViewCellStyle2;
             this.Title.HeaderText = "Инфо";
             this.Title.Name = "Title";
             this.Title.ReadOnly = true;
@@ -138,24 +176,207 @@
             // FIO
             // 
             this.FIO.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
-            this.FIO.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopLeft;
+            this.FIO.DefaultCellStyle = dataGridViewCellStyle3;
             this.FIO.HeaderText = "ФИО";
             this.FIO.Name = "FIO";
             this.FIO.ReadOnly = true;
             this.FIO.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             // 
+            // PbxPhoto
+            // 
+            this.PbxPhoto.Dock = System.Windows.Forms.DockStyle.Right;
+            this.PbxPhoto.Location = new System.Drawing.Point(461, 0);
+            this.PbxPhoto.Name = "PbxPhoto";
+            this.PbxPhoto.Size = new System.Drawing.Size(109, 100);
+            this.PbxPhoto.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.PbxPhoto.TabIndex = 2;
+            this.PbxPhoto.TabStop = false;
+            // 
+            // label2
+            // 
+            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label2.AutoSize = true;
+            this.label2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.BsEmployee, "Surname", true));
+            this.label2.Location = new System.Drawing.Point(410, 48);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(31, 16);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "label2";
+            // 
+            // label3
+            // 
+            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label3.AutoSize = true;
+            this.label3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.BsEmployee, "Name", true));
+            this.label3.Location = new System.Drawing.Point(410, 64);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(31, 16);
+            this.label3.TabIndex = 4;
+            this.label3.Text = "label3";
+            // 
+            // label4
+            // 
+            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label4.AutoSize = true;
+            this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.BsEmployee, "Patronymic", true));
+            this.label4.Location = new System.Drawing.Point(410, 80);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(31, 16);
+            this.label4.TabIndex = 5;
+            this.label4.Text = "label4";
+            // 
+            // LblPhoto
+            // 
+            this.LblPhoto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.LblPhoto.AutoSize = true;
+            this.LblPhoto.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.BsEmployee, "Photo", true));
+            this.LblPhoto.Location = new System.Drawing.Point(493, 48);
+            this.LblPhoto.Name = "LblPhoto";
+            this.LblPhoto.Size = new System.Drawing.Size(31, 16);
+            this.LblPhoto.TabIndex = 3;
+            this.LblPhoto.Text = "label5";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.TbxFind);
+            this.groupBox1.Controls.Add(this.RbtInfo);
+            this.groupBox1.Controls.Add(this.RbtNum);
+            this.groupBox1.Location = new System.Drawing.Point(12, 106);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(352, 56);
+            this.groupBox1.TabIndex = 3;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Поиск";
+            // 
+            // RbtNum
+            // 
+            this.RbtNum.AutoSize = true;
+            this.RbtNum.Location = new System.Drawing.Point(7, 14);
+            this.RbtNum.Name = "RbtNum";
+            this.RbtNum.Size = new System.Drawing.Size(107, 20);
+            this.RbtNum.TabIndex = 0;
+            this.RbtNum.Text = "По номеру заявки";
+            this.RbtNum.UseVisualStyleBackColor = true;
+            this.RbtNum.CheckedChanged += new System.EventHandler(this.RbtNum_CheckedChanged);
+            // 
+            // RbtInfo
+            // 
+            this.RbtInfo.AutoSize = true;
+            this.RbtInfo.Checked = true;
+            this.RbtInfo.Location = new System.Drawing.Point(119, 14);
+            this.RbtInfo.Name = "RbtInfo";
+            this.RbtInfo.Size = new System.Drawing.Size(225, 20);
+            this.RbtInfo.TabIndex = 1;
+            this.RbtInfo.TabStop = true;
+            this.RbtInfo.Text = "По оборудованию, статусу, исполнителям";
+            this.RbtInfo.UseVisualStyleBackColor = true;
+            // 
+            // TbxFind
+            // 
+            this.TbxFind.Location = new System.Drawing.Point(7, 33);
+            this.TbxFind.Name = "TbxFind";
+            this.TbxFind.Size = new System.Drawing.Size(329, 21);
+            this.TbxFind.TabIndex = 2;
+            this.TbxFind.TextChanged += new System.EventHandler(this.TbxFind_TextChanged);
+            // 
+            // statusStrip1
+            // 
+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ToolSCount});
+            this.statusStrip1.Location = new System.Drawing.Point(0, 454);
+            this.statusStrip1.Name = "statusStrip1";
+            this.statusStrip1.Size = new System.Drawing.Size(570, 22);
+            this.statusStrip1.TabIndex = 4;
+            this.statusStrip1.Text = "statusStrip1";
+            // 
+            // ToolSCount
+            // 
+            this.ToolSCount.Name = "ToolSCount";
+            this.ToolSCount.Size = new System.Drawing.Size(45, 17);
+            this.ToolSCount.Text = "Заявки";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(370, 119);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(185, 16);
+            this.label5.TabIndex = 5;
+            this.label5.Text = "Фильтрация по типам неисправностей";
+            // 
+            // CmbDefect
+            // 
+            this.CmbDefect.DataSource = this.BsAllTypeDefect;
+            this.CmbDefect.DisplayMember = "TypeDefect";
+            this.CmbDefect.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CmbDefect.FormattingEnabled = true;
+            this.CmbDefect.Location = new System.Drawing.Point(370, 138);
+            this.CmbDefect.Name = "CmbDefect";
+            this.CmbDefect.Size = new System.Drawing.Size(185, 24);
+            this.CmbDefect.TabIndex = 6;
+            this.CmbDefect.SelectedIndexChanged += new System.EventHandler(this.CmbDefect_SelectedIndexChanged);
+            // 
+            // BsEmployee
+            // 
+            this.BsEmployee.DataMember = "Employee";
+            this.BsEmployee.DataSource = this.techServiceBAUDataSet;
+            // 
+            // techServiceBAUDataSet
+            // 
+            this.techServiceBAUDataSet.DataSetName = "TechServiceBAUDataSet";
+            this.techServiceBAUDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // employeeTableAdapter
+            // 
+            this.employeeTableAdapter.ClearBeforeFill = true;
+            // 
+            // tableAdapterManager
+            // 
+            this.tableAdapterManager.BackupDataSetBeforeUpdate = false;
+            this.tableAdapterManager.ClientTableAdapter = null;
+            this.tableAdapterManager.EmployeeTableAdapter = this.employeeTableAdapter;
+            this.tableAdapterManager.ExecutionRequestTableAdapter = null;
+            this.tableAdapterManager.RequestTableAdapter = null;
+            this.tableAdapterManager.RoleTableAdapter = null;
+            this.tableAdapterManager.StatusTableAdapter = null;
+            this.tableAdapterManager.TypeDefectTableAdapter = null;
+            this.tableAdapterManager.UpdateOrder = СУБД_Техносервис.TechServiceBAUDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
+            // 
+            // BsAllTypeDefect
+            // 
+            this.BsAllTypeDefect.DataMember = "AllTypeDefect";
+            this.BsAllTypeDefect.DataSource = this.techServiceBAUDataSet;
+            // 
+            // allTypeDefectTableAdapter
+            // 
+            this.allTypeDefectTableAdapter.ClearBeforeFill = true;
+            // 
+            // BsRequest
+            // 
+            this.BsRequest.DataMember = "Request";
+            this.BsRequest.DataSource = this.techServiceBAUDataSet;
+            // 
+            // requestTableAdapter
+            // 
+            this.requestTableAdapter.ClearBeforeFill = true;
+            // 
             // FormWorkPlace
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(492, 428);
+            this.ClientSize = new System.Drawing.Size(570, 476);
+            this.Controls.Add(this.CmbDefect);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.statusStrip1);
+            this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.DgvRequest);
             this.Controls.Add(this.panel1);
             this.Font = new System.Drawing.Font("Arial Narrow", 9F);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.MinimumSize = new System.Drawing.Size(586, 515);
             this.Name = "FormWorkPlace";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "ООО \"Техносервис\"";
@@ -164,7 +385,17 @@
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.DgvRequest)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.PbxPhoto)).EndInit();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.statusStrip1.ResumeLayout(false);
+            this.statusStrip1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.BsEmployee)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.techServiceBAUDataSet)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.BsAllTypeDefect)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.BsRequest)).EndInit();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -178,5 +409,26 @@
         private System.Windows.Forms.DataGridViewImageColumn Photo;
         private System.Windows.Forms.DataGridViewTextBoxColumn Title;
         private System.Windows.Forms.DataGridViewTextBoxColumn FIO;
+        private TechServiceBAUDataSet techServiceBAUDataSet;
+        private TechServiceBAUDataSetTableAdapters.EmployeeTableAdapter employeeTableAdapter;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.PictureBox PbxPhoto;
+        private System.Windows.Forms.Label label3;
+        public System.Windows.Forms.BindingSource BsEmployee;
+        private TechServiceBAUDataSetTableAdapters.TableAdapterManager tableAdapterManager;
+        private System.Windows.Forms.Label LblPhoto;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.RadioButton RbtInfo;
+        private System.Windows.Forms.RadioButton RbtNum;
+        private System.Windows.Forms.TextBox TbxFind;
+        private System.Windows.Forms.StatusStrip statusStrip1;
+        private System.Windows.Forms.ToolStripStatusLabel ToolSCount;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.ComboBox CmbDefect;
+        private System.Windows.Forms.BindingSource BsAllTypeDefect;
+        private TechServiceBAUDataSetTableAdapters.AllTypeDefectTableAdapter allTypeDefectTableAdapter;
+        private System.Windows.Forms.BindingSource BsRequest;
+        private TechServiceBAUDataSetTableAdapters.RequestTableAdapter requestTableAdapter;
     }
 }

+ 54 - 1
СУБД Техносервис/FormWorkPlace.cs

@@ -25,6 +25,27 @@ namespace СУБД_Техносервис
         /// </summary>
         void OutputRequest()
         {
+            string Uslovie = "";
+            if (RbtInfo.Checked)
+            {
+                Uslovie = $@"where (EquipmentDefect Like '%{TbxFind.Text}%' or Status.Title Like '%{TbxFind.Text}%' or (SELECT        String_AGG(Master.Surname + ' ' + Master.Name + ' ' + Master.Patronymic, ', ')
+FROM            Employee AS Master INNER JOIN
+                         ExecutionRequest ON Master.IdEmployee = ExecutionRequest.IdMaster
+where ExecutionRequest.IdRequest = Request.IdRequest) Like '%{TbxFind.Text}%')";
+            }
+            else if (RbtNum.Checked && TbxFind.Text != "")
+            {
+                try
+                {
+                    Uslovie = $"where IdRequest = {int.Parse(TbxFind.Text)}";
+                }
+                catch
+                {
+                    Uslovie = $"where IdRequest = 0";
+                }
+            }
+            if(CmbDefect.SelectedIndex > 0)
+            Uslovie += $" and TypeDefect.Title = '{CmbDefect.Text}'";
             SqlConnection con = new SqlConnection(TxtCon);
             con.Open();
             string TxtQuery = @"SELECT        Request.IdRequest, Manager.Photo, (Manager.Surname + ' ' + Manager.Name + ' ' + Manager.Patronymic) as FIOManager, (Client.Surname + ' ' + Client.Name + ' ' + Client.Patronymic) as FIOClient, Request.EquipmentDefect, Request.DateAccepting, TypeDefect.Title as TypeDefect, 
@@ -36,7 +57,7 @@ FROM            Client INNER JOIN
                          Request ON Client.IdClient = Request.IdClient INNER JOIN
                          Employee AS Manager ON Request.IdManager = Manager.IdEmployee INNER JOIN
                          TypeDefect ON Request.IdTypeDefect = TypeDefect.IdTypeDefect INNER JOIN
-                         Status ON Request.IdStatus = Status.IdStatus";
+                         Status ON Request.IdStatus = Status.IdStatus " + Uslovie;
             SqlCommand cmd = new SqlCommand(TxtQuery, con);
             SqlDataReader Rez = cmd.ExecuteReader();
             DgvRequest.Rows.Clear();
@@ -56,11 +77,43 @@ FROM            Client INNER JOIN
                 {
                     DgvRequest.Rows.Add(Rez["IdRequest"], Image.FromFile(Application.StartupPath + "\\Photo\\Picture.png"), TxtInfo, $"Исполнители: {Rez["FIOMasters"]}");
                 }
+                if (Rez["Statys"].ToString() == "В ожидании")
+                    DgvRequest.Rows[DgvRequest.RowCount - 1].DefaultCellStyle.BackColor = Color.Yellow;
             }
+            ToolSCount.Text = $"Записей {DgvRequest.RowCount} из {BsRequest.Count}";
             con.Close();
         }
 
         private void FormWorkPlace_Load(object sender, EventArgs e)
+        {
+            // TODO: данная строка кода позволяет загрузить данные в таблицу "techServiceBAUDataSet.Request". При необходимости она может быть перемещена или удалена.
+            this.requestTableAdapter.Fill(this.techServiceBAUDataSet.Request);
+            // TODO: данная строка кода позволяет загрузить данные в таблицу "techServiceBAUDataSet.AllTypeDefect". При необходимости она может быть перемещена или удалена.
+            this.allTypeDefectTableAdapter.Fill(this.techServiceBAUDataSet.AllTypeDefect);
+            // TODO: данная строка кода позволяет загрузить данные в таблицу "techServiceBAUDataSet.AllTypeDefect". При необходимости она может быть перемещена или удалена.
+            this.allTypeDefectTableAdapter.Fill(this.techServiceBAUDataSet.AllTypeDefect);
+            // TODO: данная строка кода позволяет загрузить данные в таблицу "techServiceBAUDataSet.Employee". При необходимости она может быть перемещена или удалена.
+            this.employeeTableAdapter.Fill(this.techServiceBAUDataSet.Employee);
+            OutputRequest();
+            try
+            {
+                PbxPhoto.Image = Image.FromFile(Application.StartupPath + $"\\Photo\\{LblPhoto.Text}");
+            }
+            catch { }
+            LblPhoto.Hide();
+        }
+
+        private void TbxFind_TextChanged(object sender, EventArgs e)
+        {
+            OutputRequest();
+        }
+
+        private void RbtNum_CheckedChanged(object sender, EventArgs e)
+        {
+            OutputRequest();
+        }
+
+        private void CmbDefect_SelectedIndexChanged(object sender, EventArgs e)
         {
             OutputRequest();
         }

+ 27 - 0
СУБД Техносервис/FormWorkPlace.resx

@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="BsEmployee.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>196, 17</value>
+  </metadata>
+  <metadata name="techServiceBAUDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -564,6 +570,27 @@
   <metadata name="FIO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>188, 56</value>
+  </metadata>
+  <metadata name="BsAllTypeDefect.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>304, 56</value>
+  </metadata>
+  <metadata name="employeeTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>421, 17</value>
+  </metadata>
+  <metadata name="tableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="allTypeDefectTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>443, 56</value>
+  </metadata>
+  <metadata name="BsRequest.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>313, 17</value>
+  </metadata>
+  <metadata name="requestTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 95</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAgBAAAAAAAAAAAAAAAAAAAAAA

+ 529 - 0
СУБД Техносервис/TechServiceBAUDataSet.Designer.cs

@@ -38,6 +38,8 @@ namespace СУБД_Техносервис {
         
         private TypeDefectDataTable tableTypeDefect;
         
+        private AllTypeDefectDataTable tableAllTypeDefect;
+        
         private global::System.Data.DataRelation relationFK_Employee_Role;
         
         private global::System.Data.DataRelation relationFK_ExecutionRequest_Employee;
@@ -101,6 +103,9 @@ namespace СУБД_Техносервис {
                 if ((ds.Tables["TypeDefect"] != null)) {
                     base.Tables.Add(new TypeDefectDataTable(ds.Tables["TypeDefect"]));
                 }
+                if ((ds.Tables["AllTypeDefect"] != null)) {
+                    base.Tables.Add(new AllTypeDefectDataTable(ds.Tables["AllTypeDefect"]));
+                }
                 this.DataSetName = ds.DataSetName;
                 this.Prefix = ds.Prefix;
                 this.Namespace = ds.Namespace;
@@ -189,6 +194,16 @@ namespace СУБД_Техносервис {
             }
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [global::System.ComponentModel.Browsable(false)]
+        [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
+        public AllTypeDefectDataTable AllTypeDefect {
+            get {
+                return this.tableAllTypeDefect;
+            }
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         [global::System.ComponentModel.BrowsableAttribute(true)]
@@ -277,6 +292,9 @@ namespace СУБД_Техносервис {
                 if ((ds.Tables["TypeDefect"] != null)) {
                     base.Tables.Add(new TypeDefectDataTable(ds.Tables["TypeDefect"]));
                 }
+                if ((ds.Tables["AllTypeDefect"] != null)) {
+                    base.Tables.Add(new AllTypeDefectDataTable(ds.Tables["AllTypeDefect"]));
+                }
                 this.DataSetName = ds.DataSetName;
                 this.Prefix = ds.Prefix;
                 this.Namespace = ds.Namespace;
@@ -352,6 +370,12 @@ namespace СУБД_Техносервис {
                     this.tableTypeDefect.InitVars();
                 }
             }
+            this.tableAllTypeDefect = ((AllTypeDefectDataTable)(base.Tables["AllTypeDefect"]));
+            if ((initTable == true)) {
+                if ((this.tableAllTypeDefect != null)) {
+                    this.tableAllTypeDefect.InitVars();
+                }
+            }
             this.relationFK_Employee_Role = this.Relations["FK_Employee_Role"];
             this.relationFK_ExecutionRequest_Employee = this.Relations["FK_ExecutionRequest_Employee"];
             this.relationFK_ExecutionRequest_Request = this.Relations["FK_ExecutionRequest_Request"];
@@ -383,6 +407,8 @@ namespace СУБД_Техносервис {
             base.Tables.Add(this.tableStatus);
             this.tableTypeDefect = new TypeDefectDataTable();
             base.Tables.Add(this.tableTypeDefect);
+            this.tableAllTypeDefect = new AllTypeDefectDataTable();
+            base.Tables.Add(this.tableAllTypeDefect);
             this.relationFK_Employee_Role = new global::System.Data.DataRelation("FK_Employee_Role", new global::System.Data.DataColumn[] {
                         this.tableRole.IdRoleColumn}, new global::System.Data.DataColumn[] {
                         this.tableEmployee.IdRoleColumn}, false);
@@ -455,6 +481,12 @@ namespace СУБД_Техносервис {
             return false;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        private bool ShouldSerializeAllTypeDefect() {
+            return false;
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) {
@@ -531,6 +563,9 @@ namespace СУБД_Техносервис {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         public delegate void TypeDefectRowChangeEventHandler(object sender, TypeDefectRowChangeEvent e);
         
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        public delegate void AllTypeDefectRowChangeEventHandler(object sender, AllTypeDefectRowChangeEvent e);
+        
         /// <summary>
         ///Represents the strongly named DataTable class.
         ///</summary>
@@ -2737,6 +2772,256 @@ namespace СУБД_Техносервис {
             }
         }
         
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class AllTypeDefectDataTable : global::System.Data.TypedTableBase<AllTypeDefectRow> {
+            
+            private global::System.Data.DataColumn columnTypeDefect;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public AllTypeDefectDataTable() {
+                this.TableName = "AllTypeDefect";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal AllTypeDefectDataTable(global::System.Data.DataTable table) {
+                this.TableName = table.TableName;
+                if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
+                    this.CaseSensitive = table.CaseSensitive;
+                }
+                if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
+                    this.Locale = table.Locale;
+                }
+                if ((table.Namespace != table.DataSet.Namespace)) {
+                    this.Namespace = table.Namespace;
+                }
+                this.Prefix = table.Prefix;
+                this.MinimumCapacity = table.MinimumCapacity;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected AllTypeDefectDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : 
+                    base(info, context) {
+                this.InitVars();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataColumn TypeDefectColumn {
+                get {
+                    return this.columnTypeDefect;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            [global::System.ComponentModel.Browsable(false)]
+            public int Count {
+                get {
+                    return this.Rows.Count;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public AllTypeDefectRow this[int index] {
+                get {
+                    return ((AllTypeDefectRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event AllTypeDefectRowChangeEventHandler AllTypeDefectRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event AllTypeDefectRowChangeEventHandler AllTypeDefectRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event AllTypeDefectRowChangeEventHandler AllTypeDefectRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event AllTypeDefectRowChangeEventHandler AllTypeDefectRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void AddAllTypeDefectRow(AllTypeDefectRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public AllTypeDefectRow AddAllTypeDefectRow(string TypeDefect) {
+                AllTypeDefectRow rowAllTypeDefectRow = ((AllTypeDefectRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        TypeDefect};
+                rowAllTypeDefectRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowAllTypeDefectRow);
+                return rowAllTypeDefectRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                AllTypeDefectDataTable cln = ((AllTypeDefectDataTable)(base.Clone()));
+                cln.InitVars();
+                return cln;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override global::System.Data.DataTable CreateInstance() {
+                return new AllTypeDefectDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal void InitVars() {
+                this.columnTypeDefect = base.Columns["TypeDefect"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            private void InitClass() {
+                this.columnTypeDefect = new global::System.Data.DataColumn("TypeDefect", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTypeDefect);
+                this.columnTypeDefect.ReadOnly = true;
+                this.columnTypeDefect.Caption = "Column1";
+                this.columnTypeDefect.MaxLength = 50;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public AllTypeDefectRow NewAllTypeDefectRow() {
+                return ((AllTypeDefectRow)(this.NewRow()));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
+                return new AllTypeDefectRow(builder);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override global::System.Type GetRowType() {
+                return typeof(AllTypeDefectRow);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanged(e);
+                if ((this.AllTypeDefectRowChanged != null)) {
+                    this.AllTypeDefectRowChanged(this, new AllTypeDefectRowChangeEvent(((AllTypeDefectRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowChanging(e);
+                if ((this.AllTypeDefectRowChanging != null)) {
+                    this.AllTypeDefectRowChanging(this, new AllTypeDefectRowChangeEvent(((AllTypeDefectRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleted(e);
+                if ((this.AllTypeDefectRowDeleted != null)) {
+                    this.AllTypeDefectRowDeleted(this, new AllTypeDefectRowChangeEvent(((AllTypeDefectRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
+                base.OnRowDeleting(e);
+                if ((this.AllTypeDefectRowDeleting != null)) {
+                    this.AllTypeDefectRowDeleting(this, new AllTypeDefectRowChangeEvent(((AllTypeDefectRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void RemoveAllTypeDefectRow(AllTypeDefectRow row) {
+                this.Rows.Remove(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
+                global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
+                global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
+                TechServiceBAUDataSet ds = new TechServiceBAUDataSet();
+                global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
+                any1.Namespace = "http://www.w3.org/2001/XMLSchema";
+                any1.MinOccurs = new decimal(0);
+                any1.MaxOccurs = decimal.MaxValue;
+                any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any1);
+                global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
+                any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
+                any2.MinOccurs = new decimal(1);
+                any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
+                sequence.Items.Add(any2);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute1.Name = "namespace";
+                attribute1.FixedValue = ds.Namespace;
+                type.Attributes.Add(attribute1);
+                global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
+                attribute2.Name = "tableTypeName";
+                attribute2.FixedValue = "AllTypeDefectDataTable";
+                type.Attributes.Add(attribute2);
+                type.Particle = sequence;
+                global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
+                if (xs.Contains(dsSchema.TargetNamespace)) {
+                    global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
+                    global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
+                    try {
+                        global::System.Xml.Schema.XmlSchema schema = null;
+                        dsSchema.Write(s1);
+                        for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
+                            schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
+                            s2.SetLength(0);
+                            schema.Write(s2);
+                            if ((s1.Length == s2.Length)) {
+                                s1.Position = 0;
+                                s2.Position = 0;
+                                for (; ((s1.Position != s1.Length) 
+                                            && (s1.ReadByte() == s2.ReadByte())); ) {
+                                    ;
+                                }
+                                if ((s1.Position == s1.Length)) {
+                                    return type;
+                                }
+                            }
+                        }
+                    }
+                    finally {
+                        if ((s1 != null)) {
+                            s1.Close();
+                        }
+                        if ((s2 != null)) {
+                            s2.Close();
+                        }
+                    }
+                }
+                xs.Add(dsSchema);
+                return type;
+            }
+        }
+        
         /// <summary>
         ///Represents strongly named DataRow class.
         ///</summary>
@@ -3745,6 +4030,49 @@ namespace СУБД_Техносервис {
             }
         }
         
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class AllTypeDefectRow : global::System.Data.DataRow {
+            
+            private AllTypeDefectDataTable tableAllTypeDefect;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal AllTypeDefectRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableAllTypeDefect = ((AllTypeDefectDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string TypeDefect {
+                get {
+                    try {
+                        return ((string)(this[this.tableAllTypeDefect.TypeDefectColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("Значение для столбца \'TypeDefect\' в таблице \'AllTypeDefect\' равно DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableAllTypeDefect.TypeDefectColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsTypeDefectNull() {
+                return this.IsNull(this.tableAllTypeDefect.TypeDefectColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetTypeDefectNull() {
+                this[this.tableAllTypeDefect.TypeDefectColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
         /// <summary>
         ///Row event argument class
         ///</summary>
@@ -3982,6 +4310,40 @@ namespace СУБД_Техносервис {
                 }
             }
         }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        public class AllTypeDefectRowChangeEvent : global::System.EventArgs {
+            
+            private AllTypeDefectRow eventRow;
+            
+            private global::System.Data.DataRowAction eventAction;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public AllTypeDefectRowChangeEvent(AllTypeDefectRow row, global::System.Data.DataRowAction action) {
+                this.eventRow = row;
+                this.eventAction = action;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public AllTypeDefectRow Row {
+                get {
+                    return this.eventRow;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public global::System.Data.DataRowAction Action {
+                get {
+                    return this.eventAction;
+                }
+            }
+        }
     }
 }
 namespace СУБД_Техносервис.TechServiceBAUDataSetTableAdapters {
@@ -6858,6 +7220,173 @@ SELECT IdRequest, IdStatus, IdTypeDefect, IdClient, IdManager, DateAccepting, Da
         }
     }
     
+    /// <summary>
+    ///Represents the connection and commands used to retrieve and save data.
+    ///</summary>
+    [global::System.ComponentModel.DesignerCategoryAttribute("code")]
+    [global::System.ComponentModel.ToolboxItem(true)]
+    [global::System.ComponentModel.DataObjectAttribute(true)]
+    [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
+        ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
+    [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+    public partial class AllTypeDefectTableAdapter : global::System.ComponentModel.Component {
+        
+        private global::System.Data.SqlClient.SqlDataAdapter _adapter;
+        
+        private global::System.Data.SqlClient.SqlConnection _connection;
+        
+        private global::System.Data.SqlClient.SqlTransaction _transaction;
+        
+        private global::System.Data.SqlClient.SqlCommand[] _commandCollection;
+        
+        private bool _clearBeforeFill;
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        public AllTypeDefectTableAdapter() {
+            this.ClearBeforeFill = true;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter {
+            get {
+                if ((this._adapter == null)) {
+                    this.InitAdapter();
+                }
+                return this._adapter;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        internal global::System.Data.SqlClient.SqlConnection Connection {
+            get {
+                if ((this._connection == null)) {
+                    this.InitConnection();
+                }
+                return this._connection;
+            }
+            set {
+                this._connection = value;
+                if ((this.Adapter.InsertCommand != null)) {
+                    this.Adapter.InsertCommand.Connection = value;
+                }
+                if ((this.Adapter.DeleteCommand != null)) {
+                    this.Adapter.DeleteCommand.Connection = value;
+                }
+                if ((this.Adapter.UpdateCommand != null)) {
+                    this.Adapter.UpdateCommand.Connection = value;
+                }
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    if ((this.CommandCollection[i] != null)) {
+                        ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value;
+                    }
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        internal global::System.Data.SqlClient.SqlTransaction Transaction {
+            get {
+                return this._transaction;
+            }
+            set {
+                this._transaction = value;
+                for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
+                    this.CommandCollection[i].Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.DeleteCommand != null))) {
+                    this.Adapter.DeleteCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.InsertCommand != null))) {
+                    this.Adapter.InsertCommand.Transaction = this._transaction;
+                }
+                if (((this.Adapter != null) 
+                            && (this.Adapter.UpdateCommand != null))) {
+                    this.Adapter.UpdateCommand.Transaction = this._transaction;
+                }
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        protected global::System.Data.SqlClient.SqlCommand[] CommandCollection {
+            get {
+                if ((this._commandCollection == null)) {
+                    this.InitCommandCollection();
+                }
+                return this._commandCollection;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        public bool ClearBeforeFill {
+            get {
+                return this._clearBeforeFill;
+            }
+            set {
+                this._clearBeforeFill = value;
+            }
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        private void InitAdapter() {
+            this._adapter = new global::System.Data.SqlClient.SqlDataAdapter();
+            global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
+            tableMapping.SourceTable = "Table";
+            tableMapping.DataSetTable = "AllTypeDefect";
+            tableMapping.ColumnMappings.Add("Column1", "TypeDefect");
+            this._adapter.TableMappings.Add(tableMapping);
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        private void InitConnection() {
+            this._connection = new global::System.Data.SqlClient.SqlConnection();
+            this._connection.ConnectionString = global::СУБД_Техносервис.Properties.Settings.Default.TechServiceBAUConnectionString;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        private void InitCommandCollection() {
+            this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
+            this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
+            this._commandCollection[0].Connection = this.Connection;
+            this._commandCollection[0].CommandText = "Select \'Все заявки\'\r\nunion all\r\nSelect Title\r\nFrom TypeDefect";
+            this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
+        public virtual int Fill(TechServiceBAUDataSet.AllTypeDefectDataTable dataTable) {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            if ((this.ClearBeforeFill == true)) {
+                dataTable.Clear();
+            }
+            int returnValue = this.Adapter.Fill(dataTable);
+            return returnValue;
+        }
+        
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
+        [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
+        public virtual TechServiceBAUDataSet.AllTypeDefectDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            TechServiceBAUDataSet.AllTypeDefectDataTable dataTable = new TechServiceBAUDataSet.AllTypeDefectDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
     /// <summary>
     ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
     ///</summary>

+ 9 - 1
СУБД Техносервис/TechServiceBAUDataSet.xsc

@@ -1 +1,9 @@
-
+<?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 />
+</DataSetUISetting>

+ 78 - 46
СУБД Техносервис/TechServiceBAUDataSet.xsd

@@ -461,33 +461,52 @@ SELECT IdTypeDefect, Title FROM TypeDefect WHERE (IdTypeDefect = @IdTypeDefect)<
             </Mappings>
             <Sources />
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="AllTypeDefectTableAdapter" GeneratorDataComponentClassName="AllTypeDefectTableAdapter" Name="AllTypeDefect" UserDataComponentName="AllTypeDefectTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="TechServiceBAUConnectionString (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>Select 'Все заявки'
+union all
+Select Title
+From TypeDefect</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="Column1" DataSetColumn="TypeDefect" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="TechServiceBAUDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="True" msprop:Generator_UserDSName="TechServiceBAUDataSet" msprop:Generator_DataSetName="TechServiceBAUDataSet">
+  <xs:element name="TechServiceBAUDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="TechServiceBAUDataSet" msprop:EnableTableAdapterManager="True" msprop:Generator_DataSetName="TechServiceBAUDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="Client" msprop:Generator_RowEvHandlerName="ClientRowChangeEventHandler" msprop:Generator_RowDeletedName="ClientRowDeleted" msprop:Generator_RowDeletingName="ClientRowDeleting" msprop:Generator_RowEvArgName="ClientRowChangeEvent" msprop:Generator_TablePropName="Client" msprop:Generator_RowChangedName="ClientRowChanged" msprop:Generator_RowChangingName="ClientRowChanging" msprop:Generator_TableClassName="ClientDataTable" msprop:Generator_RowClassName="ClientRow" msprop:Generator_TableVarName="tableClient" msprop:Generator_UserTableName="Client">
+        <xs:element name="Client" msprop:Generator_RowClassName="ClientRow" msprop:Generator_RowEvHandlerName="ClientRowChangeEventHandler" msprop:Generator_RowDeletedName="ClientRowDeleted" msprop:Generator_RowDeletingName="ClientRowDeleting" msprop:Generator_RowEvArgName="ClientRowChangeEvent" msprop:Generator_TablePropName="Client" msprop:Generator_RowChangedName="ClientRowChanged" msprop:Generator_UserTableName="Client" msprop:Generator_RowChangingName="ClientRowChanging" msprop:Generator_TableClassName="ClientDataTable" msprop:Generator_TableVarName="tableClient">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IdClient" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IdClient" msprop:Generator_ColumnPropNameInTable="IdClientColumn" msprop:Generator_ColumnVarNameInTable="columnIdClient" msprop:Generator_UserColumnName="IdClient" type="xs:int" />
-              <xs:element name="Surname" msprop:Generator_ColumnPropNameInRow="Surname" msprop:Generator_ColumnPropNameInTable="SurnameColumn" msprop:Generator_ColumnVarNameInTable="columnSurname" msprop:Generator_UserColumnName="Surname" minOccurs="0">
+              <xs:element name="IdClient" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IdClient" msprop:Generator_ColumnPropNameInTable="IdClientColumn" msprop:Generator_ColumnPropNameInRow="IdClient" msprop:Generator_ColumnVarNameInTable="columnIdClient" type="xs:int" />
+              <xs:element name="Surname" msprop:Generator_UserColumnName="Surname" msprop:Generator_ColumnPropNameInTable="SurnameColumn" msprop:Generator_ColumnPropNameInRow="Surname" msprop:Generator_ColumnVarNameInTable="columnSurname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Name" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnVarNameInTable="columnName" msprop:Generator_UserColumnName="Name" minOccurs="0">
+              <xs:element name="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_ColumnVarNameInTable="columnName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Patronymic" msprop:Generator_ColumnPropNameInRow="Patronymic" msprop:Generator_ColumnPropNameInTable="PatronymicColumn" msprop:Generator_ColumnVarNameInTable="columnPatronymic" msprop:Generator_UserColumnName="Patronymic" minOccurs="0">
+              <xs:element name="Patronymic" msprop:Generator_UserColumnName="Patronymic" msprop:Generator_ColumnPropNameInTable="PatronymicColumn" msprop:Generator_ColumnPropNameInRow="Patronymic" msprop:Generator_ColumnVarNameInTable="columnPatronymic" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -497,47 +516,47 @@ SELECT IdTypeDefect, Title FROM TypeDefect WHERE (IdTypeDefect = @IdTypeDefect)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Employee" msprop:Generator_RowEvHandlerName="EmployeeRowChangeEventHandler" msprop:Generator_RowDeletedName="EmployeeRowDeleted" msprop:Generator_RowDeletingName="EmployeeRowDeleting" msprop:Generator_RowEvArgName="EmployeeRowChangeEvent" msprop:Generator_TablePropName="Employee" msprop:Generator_RowChangedName="EmployeeRowChanged" msprop:Generator_RowChangingName="EmployeeRowChanging" msprop:Generator_TableClassName="EmployeeDataTable" msprop:Generator_RowClassName="EmployeeRow" msprop:Generator_TableVarName="tableEmployee" msprop:Generator_UserTableName="Employee">
+        <xs:element name="Employee" msprop:Generator_RowClassName="EmployeeRow" msprop:Generator_RowEvHandlerName="EmployeeRowChangeEventHandler" msprop:Generator_RowDeletedName="EmployeeRowDeleted" msprop:Generator_RowDeletingName="EmployeeRowDeleting" msprop:Generator_RowEvArgName="EmployeeRowChangeEvent" msprop:Generator_TablePropName="Employee" msprop:Generator_RowChangedName="EmployeeRowChanged" msprop:Generator_UserTableName="Employee" msprop:Generator_RowChangingName="EmployeeRowChanging" msprop:Generator_TableClassName="EmployeeDataTable" msprop:Generator_TableVarName="tableEmployee">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IdEmployee" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IdEmployee" msprop:Generator_ColumnPropNameInTable="IdEmployeeColumn" msprop:Generator_ColumnVarNameInTable="columnIdEmployee" msprop:Generator_UserColumnName="IdEmployee" type="xs:int" />
-              <xs:element name="IdRole" msprop:Generator_ColumnPropNameInRow="IdRole" msprop:Generator_ColumnPropNameInTable="IdRoleColumn" msprop:Generator_ColumnVarNameInTable="columnIdRole" msprop:Generator_UserColumnName="IdRole" type="xs:int" minOccurs="0" />
-              <xs:element name="Surname" msprop:Generator_ColumnPropNameInRow="Surname" msprop:Generator_ColumnPropNameInTable="SurnameColumn" msprop:Generator_ColumnVarNameInTable="columnSurname" msprop:Generator_UserColumnName="Surname" minOccurs="0">
+              <xs:element name="IdEmployee" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IdEmployee" msprop:Generator_ColumnPropNameInTable="IdEmployeeColumn" msprop:Generator_ColumnPropNameInRow="IdEmployee" msprop:Generator_ColumnVarNameInTable="columnIdEmployee" type="xs:int" />
+              <xs:element name="IdRole" msprop:Generator_UserColumnName="IdRole" msprop:Generator_ColumnPropNameInTable="IdRoleColumn" msprop:Generator_ColumnPropNameInRow="IdRole" msprop:Generator_ColumnVarNameInTable="columnIdRole" type="xs:int" minOccurs="0" />
+              <xs:element name="Surname" msprop:Generator_UserColumnName="Surname" msprop:Generator_ColumnPropNameInTable="SurnameColumn" msprop:Generator_ColumnPropNameInRow="Surname" msprop:Generator_ColumnVarNameInTable="columnSurname" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Name" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnVarNameInTable="columnName" msprop:Generator_UserColumnName="Name" minOccurs="0">
+              <xs:element name="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_ColumnVarNameInTable="columnName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Patronymic" msprop:Generator_ColumnPropNameInRow="Patronymic" msprop:Generator_ColumnPropNameInTable="PatronymicColumn" msprop:Generator_ColumnVarNameInTable="columnPatronymic" msprop:Generator_UserColumnName="Patronymic" minOccurs="0">
+              <xs:element name="Patronymic" msprop:Generator_UserColumnName="Patronymic" msprop:Generator_ColumnPropNameInTable="PatronymicColumn" msprop:Generator_ColumnPropNameInRow="Patronymic" msprop:Generator_ColumnVarNameInTable="columnPatronymic" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Login" msprop:Generator_ColumnPropNameInRow="Login" msprop:Generator_ColumnPropNameInTable="LoginColumn" msprop:Generator_ColumnVarNameInTable="columnLogin" msprop:Generator_UserColumnName="Login" minOccurs="0">
+              <xs:element name="Login" msprop:Generator_UserColumnName="Login" msprop:Generator_ColumnPropNameInTable="LoginColumn" msprop:Generator_ColumnPropNameInRow="Login" msprop:Generator_ColumnVarNameInTable="columnLogin" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Password" msprop:Generator_ColumnPropNameInRow="Password" msprop:Generator_ColumnPropNameInTable="PasswordColumn" msprop:Generator_ColumnVarNameInTable="columnPassword" msprop:Generator_UserColumnName="Password" minOccurs="0">
+              <xs:element name="Password" msprop:Generator_UserColumnName="Password" msprop:Generator_ColumnPropNameInTable="PasswordColumn" msprop:Generator_ColumnPropNameInRow="Password" msprop:Generator_ColumnVarNameInTable="columnPassword" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Photo" msprop:Generator_ColumnPropNameInRow="Photo" msprop:Generator_ColumnPropNameInTable="PhotoColumn" msprop:Generator_ColumnVarNameInTable="columnPhoto" msprop:Generator_UserColumnName="Photo" minOccurs="0">
+              <xs:element name="Photo" msprop:Generator_UserColumnName="Photo" msprop:Generator_ColumnPropNameInTable="PhotoColumn" msprop:Generator_ColumnPropNameInRow="Photo" msprop:Generator_ColumnVarNameInTable="columnPhoto" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -547,40 +566,40 @@ SELECT IdTypeDefect, Title FROM TypeDefect WHERE (IdTypeDefect = @IdTypeDefect)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ExecutionRequest" msprop:Generator_RowEvHandlerName="ExecutionRequestRowChangeEventHandler" msprop:Generator_RowDeletedName="ExecutionRequestRowDeleted" msprop:Generator_RowDeletingName="ExecutionRequestRowDeleting" msprop:Generator_RowEvArgName="ExecutionRequestRowChangeEvent" msprop:Generator_TablePropName="ExecutionRequest" msprop:Generator_RowChangedName="ExecutionRequestRowChanged" msprop:Generator_RowChangingName="ExecutionRequestRowChanging" msprop:Generator_TableClassName="ExecutionRequestDataTable" msprop:Generator_RowClassName="ExecutionRequestRow" msprop:Generator_TableVarName="tableExecutionRequest" msprop:Generator_UserTableName="ExecutionRequest">
+        <xs:element name="ExecutionRequest" msprop:Generator_RowClassName="ExecutionRequestRow" msprop:Generator_RowEvHandlerName="ExecutionRequestRowChangeEventHandler" msprop:Generator_RowDeletedName="ExecutionRequestRowDeleted" msprop:Generator_RowDeletingName="ExecutionRequestRowDeleting" msprop:Generator_RowEvArgName="ExecutionRequestRowChangeEvent" msprop:Generator_TablePropName="ExecutionRequest" msprop:Generator_RowChangedName="ExecutionRequestRowChanged" msprop:Generator_UserTableName="ExecutionRequest" msprop:Generator_RowChangingName="ExecutionRequestRowChanging" msprop:Generator_TableClassName="ExecutionRequestDataTable" msprop:Generator_TableVarName="tableExecutionRequest">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IdExecution" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IdExecution" msprop:Generator_ColumnPropNameInTable="IdExecutionColumn" msprop:Generator_ColumnVarNameInTable="columnIdExecution" msprop:Generator_UserColumnName="IdExecution" type="xs:int" />
-              <xs:element name="IdRequest" msprop:Generator_ColumnPropNameInRow="IdRequest" msprop:Generator_ColumnPropNameInTable="IdRequestColumn" msprop:Generator_ColumnVarNameInTable="columnIdRequest" msprop:Generator_UserColumnName="IdRequest" type="xs:int" minOccurs="0" />
-              <xs:element name="IdMaster" msprop:Generator_ColumnPropNameInRow="IdMaster" msprop:Generator_ColumnPropNameInTable="IdMasterColumn" msprop:Generator_ColumnVarNameInTable="columnIdMaster" msprop:Generator_UserColumnName="IdMaster" type="xs:int" minOccurs="0" />
+              <xs:element name="IdExecution" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IdExecution" msprop:Generator_ColumnPropNameInTable="IdExecutionColumn" msprop:Generator_ColumnPropNameInRow="IdExecution" msprop:Generator_ColumnVarNameInTable="columnIdExecution" type="xs:int" />
+              <xs:element name="IdRequest" msprop:Generator_UserColumnName="IdRequest" msprop:Generator_ColumnPropNameInTable="IdRequestColumn" msprop:Generator_ColumnPropNameInRow="IdRequest" msprop:Generator_ColumnVarNameInTable="columnIdRequest" type="xs:int" minOccurs="0" />
+              <xs:element name="IdMaster" msprop:Generator_UserColumnName="IdMaster" msprop:Generator_ColumnPropNameInTable="IdMasterColumn" msprop:Generator_ColumnPropNameInRow="IdMaster" msprop:Generator_ColumnVarNameInTable="columnIdMaster" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Request" msprop:Generator_RowEvHandlerName="RequestRowChangeEventHandler" msprop:Generator_RowDeletedName="RequestRowDeleted" msprop:Generator_RowDeletingName="RequestRowDeleting" msprop:Generator_RowEvArgName="RequestRowChangeEvent" msprop:Generator_TablePropName="Request" msprop:Generator_RowChangedName="RequestRowChanged" msprop:Generator_RowChangingName="RequestRowChanging" msprop:Generator_TableClassName="RequestDataTable" msprop:Generator_RowClassName="RequestRow" msprop:Generator_TableVarName="tableRequest" msprop:Generator_UserTableName="Request">
+        <xs:element name="Request" msprop:Generator_RowClassName="RequestRow" msprop:Generator_RowEvHandlerName="RequestRowChangeEventHandler" msprop:Generator_RowDeletedName="RequestRowDeleted" msprop:Generator_RowDeletingName="RequestRowDeleting" msprop:Generator_RowEvArgName="RequestRowChangeEvent" msprop:Generator_TablePropName="Request" msprop:Generator_RowChangedName="RequestRowChanged" msprop:Generator_UserTableName="Request" msprop:Generator_RowChangingName="RequestRowChanging" msprop:Generator_TableClassName="RequestDataTable" msprop:Generator_TableVarName="tableRequest">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IdRequest" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IdRequest" msprop:Generator_ColumnPropNameInTable="IdRequestColumn" msprop:Generator_ColumnVarNameInTable="columnIdRequest" msprop:Generator_UserColumnName="IdRequest" type="xs:int" />
-              <xs:element name="IdStatus" msprop:Generator_ColumnPropNameInRow="IdStatus" msprop:Generator_ColumnPropNameInTable="IdStatusColumn" msprop:Generator_ColumnVarNameInTable="columnIdStatus" msprop:Generator_UserColumnName="IdStatus" type="xs:int" minOccurs="0" />
-              <xs:element name="IdTypeDefect" msprop:Generator_ColumnPropNameInRow="IdTypeDefect" msprop:Generator_ColumnPropNameInTable="IdTypeDefectColumn" msprop:Generator_ColumnVarNameInTable="columnIdTypeDefect" msprop:Generator_UserColumnName="IdTypeDefect" type="xs:int" minOccurs="0" />
-              <xs:element name="IdClient" msprop:Generator_ColumnPropNameInRow="IdClient" msprop:Generator_ColumnPropNameInTable="IdClientColumn" msprop:Generator_ColumnVarNameInTable="columnIdClient" msprop:Generator_UserColumnName="IdClient" type="xs:int" minOccurs="0" />
-              <xs:element name="IdManager" msprop:Generator_ColumnPropNameInRow="IdManager" msprop:Generator_ColumnPropNameInTable="IdManagerColumn" msprop:Generator_ColumnVarNameInTable="columnIdManager" msprop:Generator_UserColumnName="IdManager" type="xs:int" minOccurs="0" />
-              <xs:element name="DateAccepting" msprop:Generator_ColumnPropNameInRow="DateAccepting" msprop:Generator_ColumnPropNameInTable="DateAcceptingColumn" msprop:Generator_ColumnVarNameInTable="columnDateAccepting" msprop:Generator_UserColumnName="DateAccepting" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="DateCompletion" msprop:Generator_ColumnPropNameInRow="DateCompletion" msprop:Generator_ColumnPropNameInTable="DateCompletionColumn" msprop:Generator_ColumnVarNameInTable="columnDateCompletion" msprop:Generator_UserColumnName="DateCompletion" type="xs:dateTime" minOccurs="0" />
-              <xs:element name="EquipmentDefect" msprop:Generator_ColumnPropNameInRow="EquipmentDefect" msprop:Generator_ColumnPropNameInTable="EquipmentDefectColumn" msprop:Generator_ColumnVarNameInTable="columnEquipmentDefect" msprop:Generator_UserColumnName="EquipmentDefect" minOccurs="0">
+              <xs:element name="IdRequest" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IdRequest" msprop:Generator_ColumnPropNameInTable="IdRequestColumn" msprop:Generator_ColumnPropNameInRow="IdRequest" msprop:Generator_ColumnVarNameInTable="columnIdRequest" type="xs:int" />
+              <xs:element name="IdStatus" msprop:Generator_UserColumnName="IdStatus" msprop:Generator_ColumnPropNameInTable="IdStatusColumn" msprop:Generator_ColumnPropNameInRow="IdStatus" msprop:Generator_ColumnVarNameInTable="columnIdStatus" type="xs:int" minOccurs="0" />
+              <xs:element name="IdTypeDefect" msprop:Generator_UserColumnName="IdTypeDefect" msprop:Generator_ColumnPropNameInTable="IdTypeDefectColumn" msprop:Generator_ColumnPropNameInRow="IdTypeDefect" msprop:Generator_ColumnVarNameInTable="columnIdTypeDefect" type="xs:int" minOccurs="0" />
+              <xs:element name="IdClient" msprop:Generator_UserColumnName="IdClient" msprop:Generator_ColumnPropNameInTable="IdClientColumn" msprop:Generator_ColumnPropNameInRow="IdClient" msprop:Generator_ColumnVarNameInTable="columnIdClient" type="xs:int" minOccurs="0" />
+              <xs:element name="IdManager" msprop:Generator_UserColumnName="IdManager" msprop:Generator_ColumnPropNameInTable="IdManagerColumn" msprop:Generator_ColumnPropNameInRow="IdManager" msprop:Generator_ColumnVarNameInTable="columnIdManager" type="xs:int" minOccurs="0" />
+              <xs:element name="DateAccepting" msprop:Generator_UserColumnName="DateAccepting" msprop:Generator_ColumnPropNameInTable="DateAcceptingColumn" msprop:Generator_ColumnPropNameInRow="DateAccepting" msprop:Generator_ColumnVarNameInTable="columnDateAccepting" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="DateCompletion" msprop:Generator_UserColumnName="DateCompletion" msprop:Generator_ColumnPropNameInTable="DateCompletionColumn" msprop:Generator_ColumnPropNameInRow="DateCompletion" msprop:Generator_ColumnVarNameInTable="columnDateCompletion" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="EquipmentDefect" msprop:Generator_UserColumnName="EquipmentDefect" msprop:Generator_ColumnPropNameInTable="EquipmentDefectColumn" msprop:Generator_ColumnPropNameInRow="EquipmentDefect" msprop:Generator_ColumnVarNameInTable="columnEquipmentDefect" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Description" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_UserColumnName="Description" minOccurs="0">
+              <xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Comment" msprop:Generator_ColumnPropNameInRow="Comment" msprop:Generator_ColumnPropNameInTable="CommentColumn" msprop:Generator_ColumnVarNameInTable="columnComment" msprop:Generator_UserColumnName="Comment" minOccurs="0">
+              <xs:element name="Comment" msprop:Generator_UserColumnName="Comment" msprop:Generator_ColumnPropNameInTable="CommentColumn" msprop:Generator_ColumnPropNameInRow="Comment" msprop:Generator_ColumnVarNameInTable="columnComment" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />
@@ -590,11 +609,25 @@ SELECT IdTypeDefect, Title FROM TypeDefect WHERE (IdTypeDefect = @IdTypeDefect)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Role" msprop:Generator_RowEvHandlerName="RoleRowChangeEventHandler" msprop:Generator_RowDeletedName="RoleRowDeleted" msprop:Generator_RowDeletingName="RoleRowDeleting" msprop:Generator_RowEvArgName="RoleRowChangeEvent" msprop:Generator_TablePropName="Role" msprop:Generator_RowChangedName="RoleRowChanged" msprop:Generator_RowChangingName="RoleRowChanging" msprop:Generator_TableClassName="RoleDataTable" msprop:Generator_RowClassName="RoleRow" msprop:Generator_TableVarName="tableRole" msprop:Generator_UserTableName="Role">
+        <xs:element name="Role" msprop:Generator_RowClassName="RoleRow" msprop:Generator_RowEvHandlerName="RoleRowChangeEventHandler" msprop:Generator_RowDeletedName="RoleRowDeleted" msprop:Generator_RowDeletingName="RoleRowDeleting" msprop:Generator_RowEvArgName="RoleRowChangeEvent" msprop:Generator_TablePropName="Role" msprop:Generator_RowChangedName="RoleRowChanged" msprop:Generator_UserTableName="Role" msprop:Generator_RowChangingName="RoleRowChanging" msprop:Generator_TableClassName="RoleDataTable" msprop:Generator_TableVarName="tableRole">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="IdRole" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IdRole" msprop:Generator_ColumnPropNameInTable="IdRoleColumn" msprop:Generator_ColumnPropNameInRow="IdRole" msprop:Generator_ColumnVarNameInTable="columnIdRole" type="xs:int" />
+              <xs:element name="Title" msprop:Generator_UserColumnName="Title" msprop:Generator_ColumnPropNameInTable="TitleColumn" msprop:Generator_ColumnPropNameInRow="Title" msprop:Generator_ColumnVarNameInTable="columnTitle" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Status" msprop:Generator_RowClassName="StatusRow" msprop:Generator_RowEvHandlerName="StatusRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusRowDeleted" msprop:Generator_RowDeletingName="StatusRowDeleting" msprop:Generator_RowEvArgName="StatusRowChangeEvent" msprop:Generator_TablePropName="Status" msprop:Generator_RowChangedName="StatusRowChanged" msprop:Generator_UserTableName="Status" msprop:Generator_RowChangingName="StatusRowChanging" msprop:Generator_TableClassName="StatusDataTable" msprop:Generator_TableVarName="tableStatus">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IdRole" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IdRole" msprop:Generator_ColumnPropNameInTable="IdRoleColumn" msprop:Generator_ColumnVarNameInTable="columnIdRole" msprop:Generator_UserColumnName="IdRole" type="xs:int" />
-              <xs:element name="Title" msprop:Generator_ColumnPropNameInRow="Title" msprop:Generator_ColumnPropNameInTable="TitleColumn" msprop:Generator_ColumnVarNameInTable="columnTitle" msprop:Generator_UserColumnName="Title" minOccurs="0">
+              <xs:element name="IdStatus" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IdStatus" msprop:Generator_ColumnPropNameInTable="IdStatusColumn" msprop:Generator_ColumnPropNameInRow="IdStatus" msprop:Generator_ColumnVarNameInTable="columnIdStatus" type="xs:int" />
+              <xs:element name="Title" msprop:Generator_UserColumnName="Title" msprop:Generator_ColumnPropNameInTable="TitleColumn" msprop:Generator_ColumnPropNameInRow="Title" msprop:Generator_ColumnVarNameInTable="columnTitle" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -604,11 +637,11 @@ SELECT IdTypeDefect, Title FROM TypeDefect WHERE (IdTypeDefect = @IdTypeDefect)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Status" msprop:Generator_RowEvHandlerName="StatusRowChangeEventHandler" msprop:Generator_RowDeletedName="StatusRowDeleted" msprop:Generator_RowDeletingName="StatusRowDeleting" msprop:Generator_RowEvArgName="StatusRowChangeEvent" msprop:Generator_TablePropName="Status" msprop:Generator_RowChangedName="StatusRowChanged" msprop:Generator_RowChangingName="StatusRowChanging" msprop:Generator_TableClassName="StatusDataTable" msprop:Generator_RowClassName="StatusRow" msprop:Generator_TableVarName="tableStatus" msprop:Generator_UserTableName="Status">
+        <xs:element name="TypeDefect" msprop:Generator_RowClassName="TypeDefectRow" msprop:Generator_RowEvHandlerName="TypeDefectRowChangeEventHandler" msprop:Generator_RowDeletedName="TypeDefectRowDeleted" msprop:Generator_RowDeletingName="TypeDefectRowDeleting" msprop:Generator_RowEvArgName="TypeDefectRowChangeEvent" msprop:Generator_TablePropName="TypeDefect" msprop:Generator_RowChangedName="TypeDefectRowChanged" msprop:Generator_UserTableName="TypeDefect" msprop:Generator_RowChangingName="TypeDefectRowChanging" msprop:Generator_TableClassName="TypeDefectDataTable" msprop:Generator_TableVarName="tableTypeDefect">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IdStatus" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IdStatus" msprop:Generator_ColumnPropNameInTable="IdStatusColumn" msprop:Generator_ColumnVarNameInTable="columnIdStatus" msprop:Generator_UserColumnName="IdStatus" type="xs:int" />
-              <xs:element name="Title" msprop:Generator_ColumnPropNameInRow="Title" msprop:Generator_ColumnPropNameInTable="TitleColumn" msprop:Generator_ColumnVarNameInTable="columnTitle" msprop:Generator_UserColumnName="Title" minOccurs="0">
+              <xs:element name="IdTypeDefect" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IdTypeDefect" msprop:Generator_ColumnPropNameInTable="IdTypeDefectColumn" msprop:Generator_ColumnPropNameInRow="IdTypeDefect" msprop:Generator_ColumnVarNameInTable="columnIdTypeDefect" type="xs:int" />
+              <xs:element name="Title" msprop:Generator_UserColumnName="Title" msprop:Generator_ColumnPropNameInTable="TitleColumn" msprop:Generator_ColumnPropNameInRow="Title" msprop:Generator_ColumnVarNameInTable="columnTitle" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -618,11 +651,10 @@ SELECT IdTypeDefect, Title FROM TypeDefect WHERE (IdTypeDefect = @IdTypeDefect)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TypeDefect" msprop:Generator_RowEvHandlerName="TypeDefectRowChangeEventHandler" msprop:Generator_RowDeletedName="TypeDefectRowDeleted" msprop:Generator_RowDeletingName="TypeDefectRowDeleting" msprop:Generator_RowEvArgName="TypeDefectRowChangeEvent" msprop:Generator_TablePropName="TypeDefect" msprop:Generator_RowChangedName="TypeDefectRowChanged" msprop:Generator_RowChangingName="TypeDefectRowChanging" msprop:Generator_TableClassName="TypeDefectDataTable" msprop:Generator_RowClassName="TypeDefectRow" msprop:Generator_TableVarName="tableTypeDefect" msprop:Generator_UserTableName="TypeDefect">
+        <xs:element name="AllTypeDefect" msprop:Generator_RowEvHandlerName="AllTypeDefectRowChangeEventHandler" msprop:Generator_RowDeletedName="AllTypeDefectRowDeleted" msprop:Generator_RowDeletingName="AllTypeDefectRowDeleting" msprop:Generator_RowEvArgName="AllTypeDefectRowChangeEvent" msprop:Generator_TablePropName="AllTypeDefect" msprop:Generator_RowChangedName="AllTypeDefectRowChanged" msprop:Generator_RowChangingName="AllTypeDefectRowChanging" msprop:Generator_TableClassName="AllTypeDefectDataTable" msprop:Generator_RowClassName="AllTypeDefectRow" msprop:Generator_TableVarName="tableAllTypeDefect" msprop:Generator_UserTableName="AllTypeDefect">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IdTypeDefect" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IdTypeDefect" msprop:Generator_ColumnPropNameInTable="IdTypeDefectColumn" msprop:Generator_ColumnVarNameInTable="columnIdTypeDefect" msprop:Generator_UserColumnName="IdTypeDefect" type="xs:int" />
-              <xs:element name="Title" msprop:Generator_ColumnPropNameInRow="Title" msprop:Generator_ColumnPropNameInTable="TitleColumn" msprop:Generator_ColumnVarNameInTable="columnTitle" msprop:Generator_UserColumnName="Title" minOccurs="0">
+              <xs:element name="TypeDefect" msdata:ReadOnly="true" msdata:Caption="Column1" msprop:Generator_ColumnPropNameInRow="TypeDefect" msprop:Generator_ColumnPropNameInTable="TypeDefectColumn" msprop:Generator_ColumnVarNameInTable="columnTypeDefect" msprop:Generator_UserColumnName="TypeDefect" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -665,13 +697,13 @@ SELECT IdTypeDefect, Title FROM TypeDefect WHERE (IdTypeDefect = @IdTypeDefect)<
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_Employee_Role" msdata:parent="Role" msdata:child="Employee" msdata:parentkey="IdRole" msdata:childkey="IdRole" msprop:Generator_UserParentTable="Role" msprop:Generator_UserChildTable="Employee" msprop:Generator_RelationVarName="relationFK_Employee_Role" msprop:Generator_UserRelationName="FK_Employee_Role" msprop:Generator_ChildPropName="GetEmployeeRows" msprop:Generator_ParentPropName="RoleRow" />
-      <msdata:Relationship name="FK_ExecutionRequest_Employee" msdata:parent="Employee" msdata:child="ExecutionRequest" msdata:parentkey="IdEmployee" msdata:childkey="IdMaster" msprop:Generator_UserParentTable="Employee" msprop:Generator_UserChildTable="ExecutionRequest" msprop:Generator_RelationVarName="relationFK_ExecutionRequest_Employee" msprop:Generator_ChildPropName="GetExecutionRequestRows" msprop:Generator_ParentPropName="EmployeeRow" msprop:Generator_UserRelationName="FK_ExecutionRequest_Employee" />
-      <msdata:Relationship name="FK_ExecutionRequest_Request" msdata:parent="Request" msdata:child="ExecutionRequest" msdata:parentkey="IdRequest" msdata:childkey="IdRequest" msprop:Generator_UserParentTable="Request" msprop:Generator_UserChildTable="ExecutionRequest" msprop:Generator_RelationVarName="relationFK_ExecutionRequest_Request" msprop:Generator_UserRelationName="FK_ExecutionRequest_Request" msprop:Generator_ChildPropName="GetExecutionRequestRows" msprop:Generator_ParentPropName="RequestRow" />
-      <msdata:Relationship name="FK_Request_Client" msdata:parent="Client" msdata:child="Request" msdata:parentkey="IdClient" msdata:childkey="IdClient" msprop:Generator_UserParentTable="Client" msprop:Generator_UserChildTable="Request" msprop:Generator_RelationVarName="relationFK_Request_Client" msprop:Generator_ChildPropName="GetRequestRows" msprop:Generator_ParentPropName="ClientRow" msprop:Generator_UserRelationName="FK_Request_Client" />
-      <msdata:Relationship name="FK_Request_Employee" msdata:parent="Employee" msdata:child="Request" msdata:parentkey="IdEmployee" msdata:childkey="IdManager" msprop:Generator_UserParentTable="Employee" msprop:Generator_UserChildTable="Request" msprop:Generator_RelationVarName="relationFK_Request_Employee" msprop:Generator_ChildPropName="GetRequestRows" msprop:Generator_ParentPropName="EmployeeRow" msprop:Generator_UserRelationName="FK_Request_Employee" />
-      <msdata:Relationship name="FK_Request_Status" msdata:parent="Status" msdata:child="Request" msdata:parentkey="IdStatus" msdata:childkey="IdStatus" msprop:Generator_UserParentTable="Status" msprop:Generator_UserChildTable="Request" msprop:Generator_RelationVarName="relationFK_Request_Status" msprop:Generator_UserRelationName="FK_Request_Status" msprop:Generator_ChildPropName="GetRequestRows" msprop:Generator_ParentPropName="StatusRow" />
-      <msdata:Relationship name="FK_Request_TypeDefect" msdata:parent="TypeDefect" msdata:child="Request" msdata:parentkey="IdTypeDefect" msdata:childkey="IdTypeDefect" msprop:Generator_UserParentTable="TypeDefect" msprop:Generator_UserChildTable="Request" msprop:Generator_RelationVarName="relationFK_Request_TypeDefect" msprop:Generator_UserRelationName="FK_Request_TypeDefect" msprop:Generator_ChildPropName="GetRequestRows" msprop:Generator_ParentPropName="TypeDefectRow" />
+      <msdata:Relationship name="FK_Employee_Role" msdata:parent="Role" msdata:child="Employee" msdata:parentkey="IdRole" msdata:childkey="IdRole" msprop:Generator_UserParentTable="Role" msprop:Generator_UserChildTable="Employee" msprop:Generator_RelationVarName="relationFK_Employee_Role" msprop:Generator_ChildPropName="GetEmployeeRows" msprop:Generator_ParentPropName="RoleRow" msprop:Generator_UserRelationName="FK_Employee_Role" />
+      <msdata:Relationship name="FK_ExecutionRequest_Employee" msdata:parent="Employee" msdata:child="ExecutionRequest" msdata:parentkey="IdEmployee" msdata:childkey="IdMaster" msprop:Generator_UserParentTable="Employee" msprop:Generator_UserChildTable="ExecutionRequest" msprop:Generator_RelationVarName="relationFK_ExecutionRequest_Employee" msprop:Generator_ChildPropName="GetExecutionRequestRows" msprop:Generator_UserRelationName="FK_ExecutionRequest_Employee" msprop:Generator_ParentPropName="EmployeeRow" />
+      <msdata:Relationship name="FK_ExecutionRequest_Request" msdata:parent="Request" msdata:child="ExecutionRequest" msdata:parentkey="IdRequest" msdata:childkey="IdRequest" msprop:Generator_UserParentTable="Request" msprop:Generator_UserChildTable="ExecutionRequest" msprop:Generator_RelationVarName="relationFK_ExecutionRequest_Request" msprop:Generator_ChildPropName="GetExecutionRequestRows" msprop:Generator_ParentPropName="RequestRow" msprop:Generator_UserRelationName="FK_ExecutionRequest_Request" />
+      <msdata:Relationship name="FK_Request_Client" msdata:parent="Client" msdata:child="Request" msdata:parentkey="IdClient" msdata:childkey="IdClient" msprop:Generator_UserParentTable="Client" msprop:Generator_UserChildTable="Request" msprop:Generator_RelationVarName="relationFK_Request_Client" msprop:Generator_ChildPropName="GetRequestRows" msprop:Generator_UserRelationName="FK_Request_Client" msprop:Generator_ParentPropName="ClientRow" />
+      <msdata:Relationship name="FK_Request_Employee" msdata:parent="Employee" msdata:child="Request" msdata:parentkey="IdEmployee" msdata:childkey="IdManager" msprop:Generator_UserParentTable="Employee" msprop:Generator_UserChildTable="Request" msprop:Generator_RelationVarName="relationFK_Request_Employee" msprop:Generator_ChildPropName="GetRequestRows" msprop:Generator_UserRelationName="FK_Request_Employee" msprop:Generator_ParentPropName="EmployeeRow" />
+      <msdata:Relationship name="FK_Request_Status" msdata:parent="Status" msdata:child="Request" msdata:parentkey="IdStatus" msdata:childkey="IdStatus" msprop:Generator_UserParentTable="Status" msprop:Generator_UserChildTable="Request" msprop:Generator_RelationVarName="relationFK_Request_Status" msprop:Generator_ChildPropName="GetRequestRows" msprop:Generator_ParentPropName="StatusRow" msprop:Generator_UserRelationName="FK_Request_Status" />
+      <msdata:Relationship name="FK_Request_TypeDefect" msdata:parent="TypeDefect" msdata:child="Request" msdata:parentkey="IdTypeDefect" msdata:childkey="IdTypeDefect" msprop:Generator_UserParentTable="TypeDefect" msprop:Generator_UserChildTable="Request" msprop:Generator_RelationVarName="relationFK_Request_TypeDefect" msprop:Generator_ChildPropName="GetRequestRows" msprop:Generator_ParentPropName="TypeDefectRow" msprop:Generator_UserRelationName="FK_Request_TypeDefect" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

BIN
СУБД Техносервис/bin/Debug/СУБД Техносервис.exe