Explorar o código

менеджер, поиск и фильтрация, тип партнера не реализован

Your Name hai 9 meses
pai
achega
84164e1d6c

+ 530 - 0
СУБД Альфапол/AlfafloorGDVDataSet.Designer.cs

@@ -46,6 +46,8 @@ namespace СУБД_Альфапол {
         
         private TypePartnerDataTable tableTypePartner;
         
+        private Type4FilterDataTable tableType4Filter;
+        
         private global::System.Data.DataRelation relationFK_Partner_City;
         
         private global::System.Data.DataRelation relationFK_Partner_PostCode;
@@ -123,6 +125,9 @@ namespace СУБД_Альфапол {
                 if ((ds.Tables["TypePartner"] != null)) {
                     base.Tables.Add(new TypePartnerDataTable(ds.Tables["TypePartner"]));
                 }
+                if ((ds.Tables["Type4Filter"] != null)) {
+                    base.Tables.Add(new Type4FilterDataTable(ds.Tables["Type4Filter"]));
+                }
                 this.DataSetName = ds.DataSetName;
                 this.Prefix = ds.Prefix;
                 this.Namespace = ds.Namespace;
@@ -251,6 +256,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 Type4FilterDataTable Type4Filter {
+            get {
+                return this.tableType4Filter;
+            }
+        }
+        
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         [global::System.ComponentModel.BrowsableAttribute(true)]
@@ -351,6 +366,9 @@ namespace СУБД_Альфапол {
                 if ((ds.Tables["TypePartner"] != null)) {
                     base.Tables.Add(new TypePartnerDataTable(ds.Tables["TypePartner"]));
                 }
+                if ((ds.Tables["Type4Filter"] != null)) {
+                    base.Tables.Add(new Type4FilterDataTable(ds.Tables["Type4Filter"]));
+                }
                 this.DataSetName = ds.DataSetName;
                 this.Prefix = ds.Prefix;
                 this.Namespace = ds.Namespace;
@@ -450,6 +468,12 @@ namespace СУБД_Альфапол {
                     this.tableTypePartner.InitVars();
                 }
             }
+            this.tableType4Filter = ((Type4FilterDataTable)(base.Tables["Type4Filter"]));
+            if ((initTable == true)) {
+                if ((this.tableType4Filter != null)) {
+                    this.tableType4Filter.InitVars();
+                }
+            }
             this.relationFK_Partner_City = this.Relations["FK_Partner_City"];
             this.relationFK_Partner_PostCode = this.Relations["FK_Partner_PostCode"];
             this.relationFK_Partner_Region = this.Relations["FK_Partner_Region"];
@@ -490,6 +514,8 @@ namespace СУБД_Альфапол {
             base.Tables.Add(this.tableTypeMaterial);
             this.tableTypePartner = new TypePartnerDataTable();
             base.Tables.Add(this.tableTypePartner);
+            this.tableType4Filter = new Type4FilterDataTable();
+            base.Tables.Add(this.tableType4Filter);
             this.relationFK_Partner_City = new global::System.Data.DataRelation("FK_Partner_City", new global::System.Data.DataColumn[] {
                         this.tableCity.IDCityColumn}, new global::System.Data.DataColumn[] {
                         this.tablePartner.IDCityColumn}, false);
@@ -590,6 +616,12 @@ namespace СУБД_Альфапол {
             return false;
         }
         
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        private bool ShouldSerializeType4Filter() {
+            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) {
@@ -678,6 +710,9 @@ namespace СУБД_Альфапол {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
         public delegate void TypePartnerRowChangeEventHandler(object sender, TypePartnerRowChangeEvent e);
         
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        public delegate void Type4FilterRowChangeEventHandler(object sender, Type4FilterRowChangeEvent e);
+        
         /// <summary>
         ///Represents the strongly named DataTable class.
         ///</summary>
@@ -4124,6 +4159,256 @@ namespace СУБД_Альфапол {
             }
         }
         
+        /// <summary>
+        ///Represents the strongly named DataTable class.
+        ///</summary>
+        [global::System.Serializable()]
+        [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
+        public partial class Type4FilterDataTable : global::System.Data.TypedTableBase<Type4FilterRow> {
+            
+            private global::System.Data.DataColumn columnTypePartner;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public Type4FilterDataTable() {
+                this.TableName = "Type4Filter";
+                this.BeginInit();
+                this.InitClass();
+                this.EndInit();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal Type4FilterDataTable(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 Type4FilterDataTable(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 TypePartnerColumn {
+                get {
+                    return this.columnTypePartner;
+                }
+            }
+            
+            [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 Type4FilterRow this[int index] {
+                get {
+                    return ((Type4FilterRow)(this.Rows[index]));
+                }
+            }
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event Type4FilterRowChangeEventHandler Type4FilterRowChanging;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event Type4FilterRowChangeEventHandler Type4FilterRowChanged;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event Type4FilterRowChangeEventHandler Type4FilterRowDeleting;
+            
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public event Type4FilterRowChangeEventHandler Type4FilterRowDeleted;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void AddType4FilterRow(Type4FilterRow row) {
+                this.Rows.Add(row);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public Type4FilterRow AddType4FilterRow(string TypePartner) {
+                Type4FilterRow rowType4FilterRow = ((Type4FilterRow)(this.NewRow()));
+                object[] columnValuesArray = new object[] {
+                        TypePartner};
+                rowType4FilterRow.ItemArray = columnValuesArray;
+                this.Rows.Add(rowType4FilterRow);
+                return rowType4FilterRow;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public override global::System.Data.DataTable Clone() {
+                Type4FilterDataTable cln = ((Type4FilterDataTable)(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 Type4FilterDataTable();
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal void InitVars() {
+                this.columnTypePartner = base.Columns["TypePartner"];
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            private void InitClass() {
+                this.columnTypePartner = new global::System.Data.DataColumn("TypePartner", typeof(string), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTypePartner);
+                this.columnTypePartner.ReadOnly = true;
+                this.columnTypePartner.Caption = "Column1";
+                this.columnTypePartner.MaxLength = 50;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public Type4FilterRow NewType4FilterRow() {
+                return ((Type4FilterRow)(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 Type4FilterRow(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(Type4FilterRow);
+            }
+            
+            [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.Type4FilterRowChanged != null)) {
+                    this.Type4FilterRowChanged(this, new Type4FilterRowChangeEvent(((Type4FilterRow)(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.Type4FilterRowChanging != null)) {
+                    this.Type4FilterRowChanging(this, new Type4FilterRowChangeEvent(((Type4FilterRow)(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.Type4FilterRowDeleted != null)) {
+                    this.Type4FilterRowDeleted(this, new Type4FilterRowChangeEvent(((Type4FilterRow)(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.Type4FilterRowDeleting != null)) {
+                    this.Type4FilterRowDeleting(this, new Type4FilterRowChangeEvent(((Type4FilterRow)(e.Row)), e.Action));
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void RemoveType4FilterRow(Type4FilterRow 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();
+                AlfafloorGDVDataSet ds = new AlfafloorGDVDataSet();
+                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 = "Type4FilterDataTable";
+                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>
@@ -5605,6 +5890,49 @@ namespace СУБД_Альфапол {
             }
         }
         
+        /// <summary>
+        ///Represents strongly named DataRow class.
+        ///</summary>
+        public partial class Type4FilterRow : global::System.Data.DataRow {
+            
+            private Type4FilterDataTable tableType4Filter;
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            internal Type4FilterRow(global::System.Data.DataRowBuilder rb) : 
+                    base(rb) {
+                this.tableType4Filter = ((Type4FilterDataTable)(this.Table));
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public string TypePartner {
+                get {
+                    try {
+                        return ((string)(this[this.tableType4Filter.TypePartnerColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'TypePartner\' in table \'Type4Filter\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableType4Filter.TypePartnerColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public bool IsTypePartnerNull() {
+                return this.IsNull(this.tableType4Filter.TypePartnerColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+            public void SetTypePartnerNull() {
+                this[this.tableType4Filter.TypePartnerColumn] = global::System.Convert.DBNull;
+            }
+        }
+        
         /// <summary>
         ///Row event argument class
         ///</summary>
@@ -5978,6 +6306,40 @@ namespace СУБД_Альфапол {
                 }
             }
         }
+        
+        /// <summary>
+        ///Row event argument class
+        ///</summary>
+        [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
+        public class Type4FilterRowChangeEvent : global::System.EventArgs {
+            
+            private Type4FilterRow 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 Type4FilterRowChangeEvent(Type4FilterRow 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 Type4FilterRow 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 СУБД_Альфапол.AlfafloorGDVDataSetTableAdapters {
@@ -10507,6 +10869,174 @@ SELECT IDTypePartner, TypePartner FROM TypePartner WHERE (IDTypePartner = @IDTyp
         }
     }
     
+    /// <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 Type4FilterTableAdapter : 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 Type4FilterTableAdapter() {
+            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 = "Type4Filter";
+            tableMapping.ColumnMappings.Add("Column1", "TypePartner");
+            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.AlfafloorGDVConnectionString;
+        }
+        
+        [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         TypePartner\r\nFROM            TypePa" +
+                "rtner";
+            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(AlfafloorGDVDataSet.Type4FilterDataTable 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 AlfafloorGDVDataSet.Type4FilterDataTable GetData() {
+            this.Adapter.SelectCommand = this.CommandCollection[0];
+            AlfafloorGDVDataSet.Type4FilterDataTable dataTable = new AlfafloorGDVDataSet.Type4FilterDataTable();
+            this.Adapter.Fill(dataTable);
+            return dataTable;
+        }
+    }
+    
     /// <summary>
     ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios
     ///</summary>

+ 9 - 1
СУБД Альфапол/AlfafloorGDVDataSet.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>

+ 100 - 68
СУБД Альфапол/AlfafloorGDVDataSet.xsd

@@ -726,19 +726,38 @@ SELECT IDTypePartner, TypePartner FROM TypePartner WHERE (IDTypePartner = @IDTyp
             </Mappings>
             <Sources />
           </TableAdapter>
+          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="Type4FilterTableAdapter" GeneratorDataComponentClassName="Type4FilterTableAdapter" Name="Type4Filter" UserDataComponentName="Type4FilterTableAdapter">
+            <MainSource>
+              <DbSource ConnectionRef="AlfafloorGDVConnectionString (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         TypePartner
+FROM            TypePartner</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="Column1" DataSetColumn="TypePartner" />
+            </Mappings>
+            <Sources />
+          </TableAdapter>
         </Tables>
         <Sources />
       </DataSource>
     </xs:appinfo>
   </xs:annotation>
-  <xs:element name="AlfafloorGDVDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="True" msprop:Generator_UserDSName="AlfafloorGDVDataSet" msprop:Generator_DataSetName="AlfafloorGDVDataSet">
+  <xs:element name="AlfafloorGDVDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="AlfafloorGDVDataSet" msprop:EnableTableAdapterManager="True" msprop:Generator_DataSetName="AlfafloorGDVDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="City" msprop:Generator_RowEvHandlerName="CityRowChangeEventHandler" msprop:Generator_RowDeletedName="CityRowDeleted" msprop:Generator_RowDeletingName="CityRowDeleting" msprop:Generator_RowEvArgName="CityRowChangeEvent" msprop:Generator_TablePropName="City" msprop:Generator_RowChangedName="CityRowChanged" msprop:Generator_RowChangingName="CityRowChanging" msprop:Generator_TableClassName="CityDataTable" msprop:Generator_RowClassName="CityRow" msprop:Generator_TableVarName="tableCity" msprop:Generator_UserTableName="City">
+        <xs:element name="City" msprop:Generator_RowClassName="CityRow" msprop:Generator_RowEvHandlerName="CityRowChangeEventHandler" msprop:Generator_RowDeletedName="CityRowDeleted" msprop:Generator_RowDeletingName="CityRowDeleting" msprop:Generator_RowEvArgName="CityRowChangeEvent" msprop:Generator_TablePropName="City" msprop:Generator_RowChangedName="CityRowChanged" msprop:Generator_UserTableName="City" msprop:Generator_RowChangingName="CityRowChanging" msprop:Generator_TableClassName="CityDataTable" msprop:Generator_TableVarName="tableCity">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDCity" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDCity" msprop:Generator_ColumnPropNameInTable="IDCityColumn" msprop:Generator_ColumnVarNameInTable="columnIDCity" msprop:Generator_UserColumnName="IDCity" type="xs:int" />
-              <xs:element name="City" msprop:Generator_ColumnPropNameInRow="City" msprop:Generator_ColumnPropNameInTable="CityColumn" msprop:Generator_ColumnVarNameInTable="columnCity" msprop:Generator_UserColumnName="City" minOccurs="0">
+              <xs:element name="IDCity" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDCity" msprop:Generator_ColumnPropNameInTable="IDCityColumn" msprop:Generator_ColumnPropNameInRow="IDCity" msprop:Generator_ColumnVarNameInTable="columnIDCity" type="xs:int" />
+              <xs:element name="City" msprop:Generator_UserColumnName="City" msprop:Generator_ColumnPropNameInTable="CityColumn" msprop:Generator_ColumnPropNameInRow="City" msprop:Generator_ColumnVarNameInTable="columnCity" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -748,46 +767,46 @@ SELECT IDTypePartner, TypePartner FROM TypePartner WHERE (IDTypePartner = @IDTyp
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Manager" msprop:Generator_RowEvHandlerName="ManagerRowChangeEventHandler" msprop:Generator_RowDeletedName="ManagerRowDeleted" msprop:Generator_RowDeletingName="ManagerRowDeleting" msprop:Generator_RowEvArgName="ManagerRowChangeEvent" msprop:Generator_TablePropName="Manager" msprop:Generator_RowChangedName="ManagerRowChanged" msprop:Generator_RowChangingName="ManagerRowChanging" msprop:Generator_TableClassName="ManagerDataTable" msprop:Generator_RowClassName="ManagerRow" msprop:Generator_TableVarName="tableManager" msprop:Generator_UserTableName="Manager">
+        <xs:element name="Manager" msprop:Generator_RowClassName="ManagerRow" msprop:Generator_RowEvHandlerName="ManagerRowChangeEventHandler" msprop:Generator_RowDeletedName="ManagerRowDeleted" msprop:Generator_RowDeletingName="ManagerRowDeleting" msprop:Generator_RowEvArgName="ManagerRowChangeEvent" msprop:Generator_TablePropName="Manager" msprop:Generator_RowChangedName="ManagerRowChanged" msprop:Generator_UserTableName="Manager" msprop:Generator_RowChangingName="ManagerRowChanging" msprop:Generator_TableClassName="ManagerDataTable" msprop:Generator_TableVarName="tableManager">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDManager" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDManager" msprop:Generator_ColumnPropNameInTable="IDManagerColumn" msprop:Generator_ColumnVarNameInTable="columnIDManager" msprop:Generator_UserColumnName="IDManager" 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="IDManager" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDManager" msprop:Generator_ColumnPropNameInTable="IDManagerColumn" msprop:Generator_ColumnPropNameInRow="IDManager" msprop:Generator_ColumnVarNameInTable="columnIDManager" 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="Patronomyc" msprop:Generator_ColumnPropNameInRow="Patronomyc" msprop:Generator_ColumnPropNameInTable="PatronomycColumn" msprop:Generator_ColumnVarNameInTable="columnPatronomyc" msprop:Generator_UserColumnName="Patronomyc" minOccurs="0">
+              <xs:element name="Patronomyc" msprop:Generator_UserColumnName="Patronomyc" msprop:Generator_ColumnPropNameInTable="PatronomycColumn" msprop:Generator_ColumnPropNameInRow="Patronomyc" msprop:Generator_ColumnVarNameInTable="columnPatronomyc" 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="255" />
@@ -797,131 +816,145 @@ SELECT IDTypePartner, TypePartner FROM TypePartner WHERE (IDTypePartner = @IDTyp
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Partner" msprop:Generator_RowEvHandlerName="PartnerRowChangeEventHandler" msprop:Generator_RowDeletedName="PartnerRowDeleted" msprop:Generator_RowDeletingName="PartnerRowDeleting" msprop:Generator_RowEvArgName="PartnerRowChangeEvent" msprop:Generator_TablePropName="Partner" msprop:Generator_RowChangedName="PartnerRowChanged" msprop:Generator_RowChangingName="PartnerRowChanging" msprop:Generator_TableClassName="PartnerDataTable" msprop:Generator_RowClassName="PartnerRow" msprop:Generator_TableVarName="tablePartner" msprop:Generator_UserTableName="Partner">
+        <xs:element name="Partner" msprop:Generator_RowClassName="PartnerRow" msprop:Generator_RowEvHandlerName="PartnerRowChangeEventHandler" msprop:Generator_RowDeletedName="PartnerRowDeleted" msprop:Generator_RowDeletingName="PartnerRowDeleting" msprop:Generator_RowEvArgName="PartnerRowChangeEvent" msprop:Generator_TablePropName="Partner" msprop:Generator_RowChangedName="PartnerRowChanged" msprop:Generator_UserTableName="Partner" msprop:Generator_RowChangingName="PartnerRowChanging" msprop:Generator_TableClassName="PartnerDataTable" msprop:Generator_TableVarName="tablePartner">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDPartner" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDPartner" msprop:Generator_ColumnPropNameInTable="IDPartnerColumn" msprop:Generator_ColumnVarNameInTable="columnIDPartner" msprop:Generator_UserColumnName="IDPartner" type="xs:int" />
-              <xs:element name="IDTypePartner" msprop:Generator_ColumnPropNameInRow="IDTypePartner" msprop:Generator_ColumnPropNameInTable="IDTypePartnerColumn" msprop:Generator_ColumnVarNameInTable="columnIDTypePartner" msprop:Generator_UserColumnName="IDTypePartner" type="xs:int" />
-              <xs:element name="Namepartner" msprop:Generator_ColumnPropNameInRow="Namepartner" msprop:Generator_ColumnPropNameInTable="NamepartnerColumn" msprop:Generator_ColumnVarNameInTable="columnNamepartner" msprop:Generator_UserColumnName="Namepartner" minOccurs="0">
+              <xs:element name="IDPartner" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDPartner" msprop:Generator_ColumnPropNameInTable="IDPartnerColumn" msprop:Generator_ColumnPropNameInRow="IDPartner" msprop:Generator_ColumnVarNameInTable="columnIDPartner" type="xs:int" />
+              <xs:element name="IDTypePartner" msprop:Generator_UserColumnName="IDTypePartner" msprop:Generator_ColumnPropNameInTable="IDTypePartnerColumn" msprop:Generator_ColumnPropNameInRow="IDTypePartner" msprop:Generator_ColumnVarNameInTable="columnIDTypePartner" type="xs:int" />
+              <xs:element name="Namepartner" msprop:Generator_UserColumnName="Namepartner" msprop:Generator_ColumnPropNameInTable="NamepartnerColumn" msprop:Generator_ColumnPropNameInRow="Namepartner" msprop:Generator_ColumnVarNameInTable="columnNamepartner" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="150" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <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="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="Patronomyc" msprop:Generator_ColumnPropNameInRow="Patronomyc" msprop:Generator_ColumnPropNameInTable="PatronomycColumn" msprop:Generator_ColumnVarNameInTable="columnPatronomyc" msprop:Generator_UserColumnName="Patronomyc" minOccurs="0">
+              <xs:element name="Patronomyc" msprop:Generator_UserColumnName="Patronomyc" msprop:Generator_ColumnPropNameInTable="PatronomycColumn" msprop:Generator_ColumnPropNameInRow="Patronomyc" msprop:Generator_ColumnVarNameInTable="columnPatronomyc" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Email" msprop:Generator_ColumnPropNameInRow="Email" msprop:Generator_ColumnPropNameInTable="EmailColumn" msprop:Generator_ColumnVarNameInTable="columnEmail" msprop:Generator_UserColumnName="Email" minOccurs="0">
+              <xs:element name="Email" msprop:Generator_UserColumnName="Email" msprop:Generator_ColumnPropNameInTable="EmailColumn" msprop:Generator_ColumnPropNameInRow="Email" msprop:Generator_ColumnVarNameInTable="columnEmail" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Phone" msprop:Generator_ColumnPropNameInRow="Phone" msprop:Generator_ColumnPropNameInTable="PhoneColumn" msprop:Generator_ColumnVarNameInTable="columnPhone" msprop:Generator_UserColumnName="Phone" minOccurs="0">
+              <xs:element name="Phone" msprop:Generator_UserColumnName="Phone" msprop:Generator_ColumnPropNameInTable="PhoneColumn" msprop:Generator_ColumnPropNameInRow="Phone" msprop:Generator_ColumnVarNameInTable="columnPhone" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="IDPostCode" msprop:Generator_ColumnPropNameInRow="IDPostCode" msprop:Generator_ColumnPropNameInTable="IDPostCodeColumn" msprop:Generator_ColumnVarNameInTable="columnIDPostCode" msprop:Generator_UserColumnName="IDPostCode" type="xs:int" minOccurs="0" />
-              <xs:element name="IDRegion" msprop:Generator_ColumnPropNameInRow="IDRegion" msprop:Generator_ColumnPropNameInTable="IDRegionColumn" msprop:Generator_ColumnVarNameInTable="columnIDRegion" msprop:Generator_UserColumnName="IDRegion" type="xs:int" minOccurs="0" />
-              <xs:element name="IDCity" msprop:Generator_ColumnPropNameInRow="IDCity" msprop:Generator_ColumnPropNameInTable="IDCityColumn" msprop:Generator_ColumnVarNameInTable="columnIDCity" msprop:Generator_UserColumnName="IDCity" type="xs:int" minOccurs="0" />
-              <xs:element name="IDStreet" msprop:Generator_ColumnPropNameInRow="IDStreet" msprop:Generator_ColumnPropNameInTable="IDStreetColumn" msprop:Generator_ColumnVarNameInTable="columnIDStreet" msprop:Generator_UserColumnName="IDStreet" type="xs:int" minOccurs="0" />
-              <xs:element name="House" msprop:Generator_ColumnPropNameInRow="House" msprop:Generator_ColumnPropNameInTable="HouseColumn" msprop:Generator_ColumnVarNameInTable="columnHouse" msprop:Generator_UserColumnName="House" type="xs:int" minOccurs="0" />
-              <xs:element name="INN" msprop:Generator_ColumnPropNameInRow="INN" msprop:Generator_ColumnPropNameInTable="INNColumn" msprop:Generator_ColumnVarNameInTable="columnINN" msprop:Generator_UserColumnName="INN" minOccurs="0">
+              <xs:element name="IDPostCode" msprop:Generator_UserColumnName="IDPostCode" msprop:Generator_ColumnPropNameInTable="IDPostCodeColumn" msprop:Generator_ColumnPropNameInRow="IDPostCode" msprop:Generator_ColumnVarNameInTable="columnIDPostCode" type="xs:int" minOccurs="0" />
+              <xs:element name="IDRegion" msprop:Generator_UserColumnName="IDRegion" msprop:Generator_ColumnPropNameInTable="IDRegionColumn" msprop:Generator_ColumnPropNameInRow="IDRegion" msprop:Generator_ColumnVarNameInTable="columnIDRegion" type="xs:int" minOccurs="0" />
+              <xs:element name="IDCity" msprop:Generator_UserColumnName="IDCity" msprop:Generator_ColumnPropNameInTable="IDCityColumn" msprop:Generator_ColumnPropNameInRow="IDCity" msprop:Generator_ColumnVarNameInTable="columnIDCity" type="xs:int" minOccurs="0" />
+              <xs:element name="IDStreet" msprop:Generator_UserColumnName="IDStreet" msprop:Generator_ColumnPropNameInTable="IDStreetColumn" msprop:Generator_ColumnPropNameInRow="IDStreet" msprop:Generator_ColumnVarNameInTable="columnIDStreet" type="xs:int" minOccurs="0" />
+              <xs:element name="House" msprop:Generator_UserColumnName="House" msprop:Generator_ColumnPropNameInTable="HouseColumn" msprop:Generator_ColumnPropNameInRow="House" msprop:Generator_ColumnVarNameInTable="columnHouse" type="xs:int" minOccurs="0" />
+              <xs:element name="INN" msprop:Generator_UserColumnName="INN" msprop:Generator_ColumnPropNameInTable="INNColumn" msprop:Generator_ColumnPropNameInRow="INN" msprop:Generator_ColumnVarNameInTable="columnINN" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Rating" msprop:Generator_ColumnPropNameInRow="Rating" msprop:Generator_ColumnPropNameInTable="RatingColumn" msprop:Generator_ColumnVarNameInTable="columnRating" msprop:Generator_UserColumnName="Rating" type="xs:int" minOccurs="0" />
+              <xs:element name="Rating" msprop:Generator_UserColumnName="Rating" msprop:Generator_ColumnPropNameInTable="RatingColumn" msprop:Generator_ColumnPropNameInRow="Rating" msprop:Generator_ColumnVarNameInTable="columnRating" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PartnerProducts" msprop:Generator_RowEvHandlerName="PartnerProductsRowChangeEventHandler" msprop:Generator_RowDeletedName="PartnerProductsRowDeleted" msprop:Generator_RowDeletingName="PartnerProductsRowDeleting" msprop:Generator_RowEvArgName="PartnerProductsRowChangeEvent" msprop:Generator_TablePropName="PartnerProducts" msprop:Generator_RowChangedName="PartnerProductsRowChanged" msprop:Generator_RowChangingName="PartnerProductsRowChanging" msprop:Generator_TableClassName="PartnerProductsDataTable" msprop:Generator_RowClassName="PartnerProductsRow" msprop:Generator_TableVarName="tablePartnerProducts" msprop:Generator_UserTableName="PartnerProducts">
+        <xs:element name="PartnerProducts" msprop:Generator_RowClassName="PartnerProductsRow" msprop:Generator_RowEvHandlerName="PartnerProductsRowChangeEventHandler" msprop:Generator_RowDeletedName="PartnerProductsRowDeleted" msprop:Generator_RowDeletingName="PartnerProductsRowDeleting" msprop:Generator_RowEvArgName="PartnerProductsRowChangeEvent" msprop:Generator_TablePropName="PartnerProducts" msprop:Generator_RowChangedName="PartnerProductsRowChanged" msprop:Generator_UserTableName="PartnerProducts" msprop:Generator_RowChangingName="PartnerProductsRowChanging" msprop:Generator_TableClassName="PartnerProductsDataTable" msprop:Generator_TableVarName="tablePartnerProducts">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDPartnerProduct" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDPartnerProduct" msprop:Generator_ColumnPropNameInTable="IDPartnerProductColumn" msprop:Generator_ColumnVarNameInTable="columnIDPartnerProduct" msprop:Generator_UserColumnName="IDPartnerProduct" type="xs:int" />
-              <xs:element name="IDProduct" msprop:Generator_ColumnPropNameInRow="IDProduct" msprop:Generator_ColumnPropNameInTable="IDProductColumn" msprop:Generator_ColumnVarNameInTable="columnIDProduct" msprop:Generator_UserColumnName="IDProduct" type="xs:int" minOccurs="0" />
-              <xs:element name="IDPartner" msprop:Generator_ColumnPropNameInRow="IDPartner" msprop:Generator_ColumnPropNameInTable="IDPartnerColumn" msprop:Generator_ColumnVarNameInTable="columnIDPartner" msprop:Generator_UserColumnName="IDPartner" type="xs:int" minOccurs="0" />
-              <xs:element name="CountProduct" msprop:Generator_ColumnPropNameInRow="CountProduct" msprop:Generator_ColumnPropNameInTable="CountProductColumn" msprop:Generator_ColumnVarNameInTable="columnCountProduct" msprop:Generator_UserColumnName="CountProduct" type="xs:int" minOccurs="0" />
-              <xs:element name="DateSale" msprop:Generator_ColumnPropNameInRow="DateSale" msprop:Generator_ColumnPropNameInTable="DateSaleColumn" msprop:Generator_ColumnVarNameInTable="columnDateSale" msprop:Generator_UserColumnName="DateSale" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="IDPartnerProduct" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDPartnerProduct" msprop:Generator_ColumnPropNameInTable="IDPartnerProductColumn" msprop:Generator_ColumnPropNameInRow="IDPartnerProduct" msprop:Generator_ColumnVarNameInTable="columnIDPartnerProduct" type="xs:int" />
+              <xs:element name="IDProduct" msprop:Generator_UserColumnName="IDProduct" msprop:Generator_ColumnPropNameInTable="IDProductColumn" msprop:Generator_ColumnPropNameInRow="IDProduct" msprop:Generator_ColumnVarNameInTable="columnIDProduct" type="xs:int" minOccurs="0" />
+              <xs:element name="IDPartner" msprop:Generator_UserColumnName="IDPartner" msprop:Generator_ColumnPropNameInTable="IDPartnerColumn" msprop:Generator_ColumnPropNameInRow="IDPartner" msprop:Generator_ColumnVarNameInTable="columnIDPartner" type="xs:int" minOccurs="0" />
+              <xs:element name="CountProduct" msprop:Generator_UserColumnName="CountProduct" msprop:Generator_ColumnPropNameInTable="CountProductColumn" msprop:Generator_ColumnPropNameInRow="CountProduct" msprop:Generator_ColumnVarNameInTable="columnCountProduct" type="xs:int" minOccurs="0" />
+              <xs:element name="DateSale" msprop:Generator_UserColumnName="DateSale" msprop:Generator_ColumnPropNameInTable="DateSaleColumn" msprop:Generator_ColumnPropNameInRow="DateSale" msprop:Generator_ColumnVarNameInTable="columnDateSale" type="xs:dateTime" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="PostCode" msprop:Generator_RowEvHandlerName="PostCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="PostCodeRowDeleted" msprop:Generator_RowDeletingName="PostCodeRowDeleting" msprop:Generator_RowEvArgName="PostCodeRowChangeEvent" msprop:Generator_TablePropName="PostCode" msprop:Generator_RowChangedName="PostCodeRowChanged" msprop:Generator_RowChangingName="PostCodeRowChanging" msprop:Generator_TableClassName="PostCodeDataTable" msprop:Generator_RowClassName="PostCodeRow" msprop:Generator_TableVarName="tablePostCode" msprop:Generator_UserTableName="PostCode">
+        <xs:element name="PostCode" msprop:Generator_RowClassName="PostCodeRow" msprop:Generator_RowEvHandlerName="PostCodeRowChangeEventHandler" msprop:Generator_RowDeletedName="PostCodeRowDeleted" msprop:Generator_RowDeletingName="PostCodeRowDeleting" msprop:Generator_RowEvArgName="PostCodeRowChangeEvent" msprop:Generator_TablePropName="PostCode" msprop:Generator_RowChangedName="PostCodeRowChanged" msprop:Generator_UserTableName="PostCode" msprop:Generator_RowChangingName="PostCodeRowChanging" msprop:Generator_TableClassName="PostCodeDataTable" msprop:Generator_TableVarName="tablePostCode">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDPostCode" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDPostCode" msprop:Generator_ColumnPropNameInTable="IDPostCodeColumn" msprop:Generator_ColumnVarNameInTable="columnIDPostCode" msprop:Generator_UserColumnName="IDPostCode" type="xs:int" />
-              <xs:element name="PostCode" msprop:Generator_ColumnPropNameInRow="PostCode" msprop:Generator_ColumnPropNameInTable="PostCodeColumn" msprop:Generator_ColumnVarNameInTable="columnPostCode" msprop:Generator_UserColumnName="PostCode" type="xs:int" minOccurs="0" />
+              <xs:element name="IDPostCode" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDPostCode" msprop:Generator_ColumnPropNameInTable="IDPostCodeColumn" msprop:Generator_ColumnPropNameInRow="IDPostCode" msprop:Generator_ColumnVarNameInTable="columnIDPostCode" type="xs:int" />
+              <xs:element name="PostCode" msprop:Generator_UserColumnName="PostCode" msprop:Generator_ColumnPropNameInTable="PostCodeColumn" msprop:Generator_ColumnPropNameInRow="PostCode" msprop:Generator_ColumnVarNameInTable="columnPostCode" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Product" msprop:Generator_RowEvHandlerName="ProductRowChangeEventHandler" msprop:Generator_RowDeletedName="ProductRowDeleted" msprop:Generator_RowDeletingName="ProductRowDeleting" msprop:Generator_RowEvArgName="ProductRowChangeEvent" msprop:Generator_TablePropName="Product" msprop:Generator_RowChangedName="ProductRowChanged" msprop:Generator_RowChangingName="ProductRowChanging" msprop:Generator_TableClassName="ProductDataTable" msprop:Generator_RowClassName="ProductRow" msprop:Generator_TableVarName="tableProduct" msprop:Generator_UserTableName="Product">
+        <xs:element name="Product" msprop:Generator_RowClassName="ProductRow" msprop:Generator_RowEvHandlerName="ProductRowChangeEventHandler" msprop:Generator_RowDeletedName="ProductRowDeleted" msprop:Generator_RowDeletingName="ProductRowDeleting" msprop:Generator_RowEvArgName="ProductRowChangeEvent" msprop:Generator_TablePropName="Product" msprop:Generator_RowChangedName="ProductRowChanged" msprop:Generator_UserTableName="Product" msprop:Generator_RowChangingName="ProductRowChanging" msprop:Generator_TableClassName="ProductDataTable" msprop:Generator_TableVarName="tableProduct">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDProduct" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDProduct" msprop:Generator_ColumnPropNameInTable="IDProductColumn" msprop:Generator_ColumnVarNameInTable="columnIDProduct" msprop:Generator_UserColumnName="IDProduct" type="xs:int" />
-              <xs:element name="IDProductType" msprop:Generator_ColumnPropNameInRow="IDProductType" msprop:Generator_ColumnPropNameInTable="IDProductTypeColumn" msprop:Generator_ColumnVarNameInTable="columnIDProductType" msprop:Generator_UserColumnName="IDProductType" type="xs:int" minOccurs="0" />
-              <xs:element name="ProductName" msprop:Generator_ColumnPropNameInRow="ProductName" msprop:Generator_ColumnPropNameInTable="ProductNameColumn" msprop:Generator_ColumnVarNameInTable="columnProductName" msprop:Generator_UserColumnName="ProductName" minOccurs="0">
+              <xs:element name="IDProduct" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDProduct" msprop:Generator_ColumnPropNameInTable="IDProductColumn" msprop:Generator_ColumnPropNameInRow="IDProduct" msprop:Generator_ColumnVarNameInTable="columnIDProduct" type="xs:int" />
+              <xs:element name="IDProductType" msprop:Generator_UserColumnName="IDProductType" msprop:Generator_ColumnPropNameInTable="IDProductTypeColumn" msprop:Generator_ColumnPropNameInRow="IDProductType" msprop:Generator_ColumnVarNameInTable="columnIDProductType" type="xs:int" minOccurs="0" />
+              <xs:element name="ProductName" msprop:Generator_UserColumnName="ProductName" msprop:Generator_ColumnPropNameInTable="ProductNameColumn" msprop:Generator_ColumnPropNameInRow="ProductName" msprop:Generator_ColumnVarNameInTable="columnProductName" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="150" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Article" msprop:Generator_ColumnPropNameInRow="Article" msprop:Generator_ColumnPropNameInTable="ArticleColumn" msprop:Generator_ColumnVarNameInTable="columnArticle" msprop:Generator_UserColumnName="Article" minOccurs="0">
+              <xs:element name="Article" msprop:Generator_UserColumnName="Article" msprop:Generator_ColumnPropNameInTable="ArticleColumn" msprop:Generator_ColumnPropNameInRow="Article" msprop:Generator_ColumnVarNameInTable="columnArticle" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="Cost" msprop:Generator_UserColumnName="Cost" msprop:Generator_ColumnPropNameInTable="CostColumn" msprop:Generator_ColumnPropNameInRow="Cost" msprop:Generator_ColumnVarNameInTable="columnCost" type="xs:decimal" minOccurs="0" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="ProductType" msprop:Generator_RowClassName="ProductTypeRow" msprop:Generator_RowEvHandlerName="ProductTypeRowChangeEventHandler" msprop:Generator_RowDeletedName="ProductTypeRowDeleted" msprop:Generator_RowDeletingName="ProductTypeRowDeleting" msprop:Generator_RowEvArgName="ProductTypeRowChangeEvent" msprop:Generator_TablePropName="ProductType" msprop:Generator_RowChangedName="ProductTypeRowChanged" msprop:Generator_UserTableName="ProductType" msprop:Generator_RowChangingName="ProductTypeRowChanging" msprop:Generator_TableClassName="ProductTypeDataTable" msprop:Generator_TableVarName="tableProductType">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="IDProductType" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDProductType" msprop:Generator_ColumnPropNameInTable="IDProductTypeColumn" msprop:Generator_ColumnPropNameInRow="IDProductType" msprop:Generator_ColumnVarNameInTable="columnIDProductType" type="xs:int" />
+              <xs:element name="ProductType" msprop:Generator_UserColumnName="ProductType" msprop:Generator_ColumnPropNameInTable="ProductTypeColumn" msprop:Generator_ColumnPropNameInRow="ProductType" msprop:Generator_ColumnVarNameInTable="columnProductType" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Cost" msprop:Generator_ColumnPropNameInRow="Cost" msprop:Generator_ColumnPropNameInTable="CostColumn" msprop:Generator_ColumnVarNameInTable="columnCost" msprop:Generator_UserColumnName="Cost" type="xs:decimal" minOccurs="0" />
+              <xs:element name="Сoefficient" msprop:Generator_UserColumnName="Сoefficient" msprop:Generator_ColumnPropNameInTable="СoefficientColumn" msprop:Generator_ColumnPropNameInRow="Сoefficient" msprop:Generator_ColumnVarNameInTable="columnСoefficient" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="ProductType" msprop:Generator_RowEvHandlerName="ProductTypeRowChangeEventHandler" msprop:Generator_RowDeletedName="ProductTypeRowDeleted" msprop:Generator_RowDeletingName="ProductTypeRowDeleting" msprop:Generator_RowEvArgName="ProductTypeRowChangeEvent" msprop:Generator_TablePropName="ProductType" msprop:Generator_RowChangedName="ProductTypeRowChanged" msprop:Generator_RowChangingName="ProductTypeRowChanging" msprop:Generator_TableClassName="ProductTypeDataTable" msprop:Generator_RowClassName="ProductTypeRow" msprop:Generator_TableVarName="tableProductType" msprop:Generator_UserTableName="ProductType">
+        <xs:element name="Region" msprop:Generator_RowClassName="RegionRow" msprop:Generator_RowEvHandlerName="RegionRowChangeEventHandler" msprop:Generator_RowDeletedName="RegionRowDeleted" msprop:Generator_RowDeletingName="RegionRowDeleting" msprop:Generator_RowEvArgName="RegionRowChangeEvent" msprop:Generator_TablePropName="Region" msprop:Generator_RowChangedName="RegionRowChanged" msprop:Generator_UserTableName="Region" msprop:Generator_RowChangingName="RegionRowChanging" msprop:Generator_TableClassName="RegionDataTable" msprop:Generator_TableVarName="tableRegion">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDProductType" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDProductType" msprop:Generator_ColumnPropNameInTable="IDProductTypeColumn" msprop:Generator_ColumnVarNameInTable="columnIDProductType" msprop:Generator_UserColumnName="IDProductType" type="xs:int" />
-              <xs:element name="ProductType" msprop:Generator_ColumnPropNameInRow="ProductType" msprop:Generator_ColumnPropNameInTable="ProductTypeColumn" msprop:Generator_ColumnVarNameInTable="columnProductType" msprop:Generator_UserColumnName="ProductType" minOccurs="0">
+              <xs:element name="IDRegion" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDRegion" msprop:Generator_ColumnPropNameInTable="IDRegionColumn" msprop:Generator_ColumnPropNameInRow="IDRegion" msprop:Generator_ColumnVarNameInTable="columnIDRegion" type="xs:int" />
+              <xs:element name="Region" msprop:Generator_UserColumnName="Region" msprop:Generator_ColumnPropNameInTable="RegionColumn" msprop:Generator_ColumnPropNameInRow="Region" msprop:Generator_ColumnVarNameInTable="columnRegion" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="Сoefficient" msprop:Generator_ColumnPropNameInRow="Сoefficient" msprop:Generator_ColumnPropNameInTable="СoefficientColumn" msprop:Generator_ColumnVarNameInTable="columnСoefficient" msprop:Generator_UserColumnName="Сoefficient" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Region" msprop:Generator_RowEvHandlerName="RegionRowChangeEventHandler" msprop:Generator_RowDeletedName="RegionRowDeleted" msprop:Generator_RowDeletingName="RegionRowDeleting" msprop:Generator_RowEvArgName="RegionRowChangeEvent" msprop:Generator_TablePropName="Region" msprop:Generator_RowChangedName="RegionRowChanged" msprop:Generator_RowChangingName="RegionRowChanging" msprop:Generator_TableClassName="RegionDataTable" msprop:Generator_RowClassName="RegionRow" msprop:Generator_TableVarName="tableRegion" msprop:Generator_UserTableName="Region">
+        <xs:element name="Street" msprop:Generator_RowClassName="StreetRow" msprop:Generator_RowEvHandlerName="StreetRowChangeEventHandler" msprop:Generator_RowDeletedName="StreetRowDeleted" msprop:Generator_RowDeletingName="StreetRowDeleting" msprop:Generator_RowEvArgName="StreetRowChangeEvent" msprop:Generator_TablePropName="Street" msprop:Generator_RowChangedName="StreetRowChanged" msprop:Generator_UserTableName="Street" msprop:Generator_RowChangingName="StreetRowChanging" msprop:Generator_TableClassName="StreetDataTable" msprop:Generator_TableVarName="tableStreet">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDRegion" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDRegion" msprop:Generator_ColumnPropNameInTable="IDRegionColumn" msprop:Generator_ColumnVarNameInTable="columnIDRegion" msprop:Generator_UserColumnName="IDRegion" type="xs:int" />
-              <xs:element name="Region" msprop:Generator_ColumnPropNameInRow="Region" msprop:Generator_ColumnPropNameInTable="RegionColumn" msprop:Generator_ColumnVarNameInTable="columnRegion" msprop:Generator_UserColumnName="Region" minOccurs="0">
+              <xs:element name="IDStreet" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDStreet" msprop:Generator_ColumnPropNameInTable="IDStreetColumn" msprop:Generator_ColumnPropNameInRow="IDStreet" msprop:Generator_ColumnVarNameInTable="columnIDStreet" type="xs:int" />
+              <xs:element name="Street" msprop:Generator_UserColumnName="Street" msprop:Generator_ColumnPropNameInTable="StreetColumn" msprop:Generator_ColumnPropNameInRow="Street" msprop:Generator_ColumnVarNameInTable="columnStreet" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -931,40 +964,39 @@ SELECT IDTypePartner, TypePartner FROM TypePartner WHERE (IDTypePartner = @IDTyp
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="Street" msprop:Generator_RowEvHandlerName="StreetRowChangeEventHandler" msprop:Generator_RowDeletedName="StreetRowDeleted" msprop:Generator_RowDeletingName="StreetRowDeleting" msprop:Generator_RowEvArgName="StreetRowChangeEvent" msprop:Generator_TablePropName="Street" msprop:Generator_RowChangedName="StreetRowChanged" msprop:Generator_RowChangingName="StreetRowChanging" msprop:Generator_TableClassName="StreetDataTable" msprop:Generator_RowClassName="StreetRow" msprop:Generator_TableVarName="tableStreet" msprop:Generator_UserTableName="Street">
+        <xs:element name="TypeMaterial" msprop:Generator_RowClassName="TypeMaterialRow" msprop:Generator_RowEvHandlerName="TypeMaterialRowChangeEventHandler" msprop:Generator_RowDeletedName="TypeMaterialRowDeleted" msprop:Generator_RowDeletingName="TypeMaterialRowDeleting" msprop:Generator_RowEvArgName="TypeMaterialRowChangeEvent" msprop:Generator_TablePropName="TypeMaterial" msprop:Generator_RowChangedName="TypeMaterialRowChanged" msprop:Generator_UserTableName="TypeMaterial" msprop:Generator_RowChangingName="TypeMaterialRowChanging" msprop:Generator_TableClassName="TypeMaterialDataTable" msprop:Generator_TableVarName="tableTypeMaterial">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDStreet" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDStreet" msprop:Generator_ColumnPropNameInTable="IDStreetColumn" msprop:Generator_ColumnVarNameInTable="columnIDStreet" msprop:Generator_UserColumnName="IDStreet" type="xs:int" />
-              <xs:element name="Street" msprop:Generator_ColumnPropNameInRow="Street" msprop:Generator_ColumnPropNameInTable="StreetColumn" msprop:Generator_ColumnVarNameInTable="columnStreet" msprop:Generator_UserColumnName="Street" minOccurs="0">
+              <xs:element name="IDTypeMaterial" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDTypeMaterial" msprop:Generator_ColumnPropNameInTable="IDTypeMaterialColumn" msprop:Generator_ColumnPropNameInRow="IDTypeMaterial" msprop:Generator_ColumnVarNameInTable="columnIDTypeMaterial" type="xs:int" />
+              <xs:element name="TypeMaterial" msprop:Generator_UserColumnName="TypeMaterial" msprop:Generator_ColumnPropNameInTable="TypeMaterialColumn" msprop:Generator_ColumnPropNameInRow="TypeMaterial" msprop:Generator_ColumnVarNameInTable="columnTypeMaterial" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="DefectPercent" msprop:Generator_UserColumnName="DefectPercent" msprop:Generator_ColumnPropNameInTable="DefectPercentColumn" msprop:Generator_ColumnPropNameInRow="DefectPercent" msprop:Generator_ColumnVarNameInTable="columnDefectPercent" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TypeMaterial" msprop:Generator_RowEvHandlerName="TypeMaterialRowChangeEventHandler" msprop:Generator_RowDeletedName="TypeMaterialRowDeleted" msprop:Generator_RowDeletingName="TypeMaterialRowDeleting" msprop:Generator_RowEvArgName="TypeMaterialRowChangeEvent" msprop:Generator_TablePropName="TypeMaterial" msprop:Generator_RowChangedName="TypeMaterialRowChanged" msprop:Generator_RowChangingName="TypeMaterialRowChanging" msprop:Generator_TableClassName="TypeMaterialDataTable" msprop:Generator_RowClassName="TypeMaterialRow" msprop:Generator_TableVarName="tableTypeMaterial" msprop:Generator_UserTableName="TypeMaterial">
+        <xs:element name="TypePartner" msprop:Generator_RowClassName="TypePartnerRow" msprop:Generator_RowEvHandlerName="TypePartnerRowChangeEventHandler" msprop:Generator_RowDeletedName="TypePartnerRowDeleted" msprop:Generator_RowDeletingName="TypePartnerRowDeleting" msprop:Generator_RowEvArgName="TypePartnerRowChangeEvent" msprop:Generator_TablePropName="TypePartner" msprop:Generator_RowChangedName="TypePartnerRowChanged" msprop:Generator_UserTableName="TypePartner" msprop:Generator_RowChangingName="TypePartnerRowChanging" msprop:Generator_TableClassName="TypePartnerDataTable" msprop:Generator_TableVarName="tableTypePartner">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDTypeMaterial" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDTypeMaterial" msprop:Generator_ColumnPropNameInTable="IDTypeMaterialColumn" msprop:Generator_ColumnVarNameInTable="columnIDTypeMaterial" msprop:Generator_UserColumnName="IDTypeMaterial" type="xs:int" />
-              <xs:element name="TypeMaterial" msprop:Generator_ColumnPropNameInRow="TypeMaterial" msprop:Generator_ColumnPropNameInTable="TypeMaterialColumn" msprop:Generator_ColumnVarNameInTable="columnTypeMaterial" msprop:Generator_UserColumnName="TypeMaterial" minOccurs="0">
+              <xs:element name="IDTypePartner" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_UserColumnName="IDTypePartner" msprop:Generator_ColumnPropNameInTable="IDTypePartnerColumn" msprop:Generator_ColumnPropNameInRow="IDTypePartner" msprop:Generator_ColumnVarNameInTable="columnIDTypePartner" type="xs:int" />
+              <xs:element name="TypePartner" msprop:Generator_UserColumnName="TypePartner" msprop:Generator_ColumnPropNameInTable="TypePartnerColumn" msprop:Generator_ColumnPropNameInRow="TypePartner" msprop:Generator_ColumnVarNameInTable="columnTypePartner" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="DefectPercent" msprop:Generator_ColumnPropNameInRow="DefectPercent" msprop:Generator_ColumnPropNameInTable="DefectPercentColumn" msprop:Generator_ColumnVarNameInTable="columnDefectPercent" msprop:Generator_UserColumnName="DefectPercent" type="xs:double" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TypePartner" msprop:Generator_RowEvHandlerName="TypePartnerRowChangeEventHandler" msprop:Generator_RowDeletedName="TypePartnerRowDeleted" msprop:Generator_RowDeletingName="TypePartnerRowDeleting" msprop:Generator_RowEvArgName="TypePartnerRowChangeEvent" msprop:Generator_TablePropName="TypePartner" msprop:Generator_RowChangedName="TypePartnerRowChanged" msprop:Generator_RowChangingName="TypePartnerRowChanging" msprop:Generator_TableClassName="TypePartnerDataTable" msprop:Generator_RowClassName="TypePartnerRow" msprop:Generator_TableVarName="tableTypePartner" msprop:Generator_UserTableName="TypePartner">
+        <xs:element name="Type4Filter" msprop:Generator_RowEvHandlerName="Type4FilterRowChangeEventHandler" msprop:Generator_RowDeletedName="Type4FilterRowDeleted" msprop:Generator_RowDeletingName="Type4FilterRowDeleting" msprop:Generator_RowEvArgName="Type4FilterRowChangeEvent" msprop:Generator_TablePropName="Type4Filter" msprop:Generator_RowChangedName="Type4FilterRowChanged" msprop:Generator_RowChangingName="Type4FilterRowChanging" msprop:Generator_TableClassName="Type4FilterDataTable" msprop:Generator_RowClassName="Type4FilterRow" msprop:Generator_TableVarName="tableType4Filter" msprop:Generator_UserTableName="Type4Filter">
           <xs:complexType>
             <xs:sequence>
-              <xs:element name="IDTypePartner" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnPropNameInRow="IDTypePartner" msprop:Generator_ColumnPropNameInTable="IDTypePartnerColumn" msprop:Generator_ColumnVarNameInTable="columnIDTypePartner" msprop:Generator_UserColumnName="IDTypePartner" type="xs:int" />
-              <xs:element name="TypePartner" msprop:Generator_ColumnPropNameInRow="TypePartner" msprop:Generator_ColumnPropNameInTable="TypePartnerColumn" msprop:Generator_ColumnVarNameInTable="columnTypePartner" msprop:Generator_UserColumnName="TypePartner" minOccurs="0">
+              <xs:element name="TypePartner" msdata:ReadOnly="true" msdata:Caption="Column1" msprop:Generator_ColumnPropNameInRow="TypePartner" msprop:Generator_ColumnPropNameInTable="TypePartnerColumn" msprop:Generator_ColumnVarNameInTable="columnTypePartner" msprop:Generator_UserColumnName="TypePartner" minOccurs="0">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -1023,14 +1055,14 @@ SELECT IDTypePartner, TypePartner FROM TypePartner WHERE (IDTypePartner = @IDTyp
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_Partner_City" msdata:parent="City" msdata:child="Partner" msdata:parentkey="IDCity" msdata:childkey="IDCity" msprop:Generator_UserParentTable="City" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_City" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="CityRow" msprop:Generator_UserRelationName="FK_Partner_City" />
-      <msdata:Relationship name="FK_Partner_PostCode" msdata:parent="PostCode" msdata:child="Partner" msdata:parentkey="IDPostCode" msdata:childkey="IDPostCode" msprop:Generator_UserParentTable="PostCode" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_PostCode" msprop:Generator_UserRelationName="FK_Partner_PostCode" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="PostCodeRow" />
-      <msdata:Relationship name="FK_Partner_Region" msdata:parent="Region" msdata:child="Partner" msdata:parentkey="IDRegion" msdata:childkey="IDRegion" msprop:Generator_UserParentTable="Region" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_Region" msprop:Generator_UserRelationName="FK_Partner_Region" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="RegionRow" />
-      <msdata:Relationship name="FK_Partner_Street" msdata:parent="Street" msdata:child="Partner" msdata:parentkey="IDStreet" msdata:childkey="IDStreet" msprop:Generator_UserParentTable="Street" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_Street" msprop:Generator_UserRelationName="FK_Partner_Street" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="StreetRow" />
-      <msdata:Relationship name="FK_Partner_TypePartner" msdata:parent="TypePartner" msdata:child="Partner" msdata:parentkey="IDTypePartner" msdata:childkey="IDTypePartner" msprop:Generator_UserParentTable="TypePartner" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_TypePartner" msprop:Generator_UserRelationName="FK_Partner_TypePartner" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="TypePartnerRow" />
-      <msdata:Relationship name="FK_PartnerProducts_Partner" msdata:parent="Partner" msdata:child="PartnerProducts" msdata:parentkey="IDPartner" msdata:childkey="IDPartner" msprop:Generator_UserParentTable="Partner" msprop:Generator_UserChildTable="PartnerProducts" msprop:Generator_RelationVarName="relationFK_PartnerProducts_Partner" msprop:Generator_ChildPropName="GetPartnerProductsRows" msprop:Generator_ParentPropName="PartnerRow" msprop:Generator_UserRelationName="FK_PartnerProducts_Partner" />
-      <msdata:Relationship name="FK_PartnerProducts_Product" msdata:parent="Product" msdata:child="PartnerProducts" msdata:parentkey="IDProduct" msdata:childkey="IDProduct" msprop:Generator_UserParentTable="Product" msprop:Generator_UserChildTable="PartnerProducts" msprop:Generator_RelationVarName="relationFK_PartnerProducts_Product" msprop:Generator_UserRelationName="FK_PartnerProducts_Product" msprop:Generator_ChildPropName="GetPartnerProductsRows" msprop:Generator_ParentPropName="ProductRow" />
-      <msdata:Relationship name="FK_Product_ProductType" msdata:parent="ProductType" msdata:child="Product" msdata:parentkey="IDProductType" msdata:childkey="IDProductType" msprop:Generator_UserParentTable="ProductType" msprop:Generator_UserChildTable="Product" msprop:Generator_RelationVarName="relationFK_Product_ProductType" msprop:Generator_UserRelationName="FK_Product_ProductType" msprop:Generator_ChildPropName="GetProductRows" msprop:Generator_ParentPropName="ProductTypeRow" />
+      <msdata:Relationship name="FK_Partner_City" msdata:parent="City" msdata:child="Partner" msdata:parentkey="IDCity" msdata:childkey="IDCity" msprop:Generator_UserParentTable="City" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_City" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_UserRelationName="FK_Partner_City" msprop:Generator_ParentPropName="CityRow" />
+      <msdata:Relationship name="FK_Partner_PostCode" msdata:parent="PostCode" msdata:child="Partner" msdata:parentkey="IDPostCode" msdata:childkey="IDPostCode" msprop:Generator_UserParentTable="PostCode" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_PostCode" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="PostCodeRow" msprop:Generator_UserRelationName="FK_Partner_PostCode" />
+      <msdata:Relationship name="FK_Partner_Region" msdata:parent="Region" msdata:child="Partner" msdata:parentkey="IDRegion" msdata:childkey="IDRegion" msprop:Generator_UserParentTable="Region" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_Region" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="RegionRow" msprop:Generator_UserRelationName="FK_Partner_Region" />
+      <msdata:Relationship name="FK_Partner_Street" msdata:parent="Street" msdata:child="Partner" msdata:parentkey="IDStreet" msdata:childkey="IDStreet" msprop:Generator_UserParentTable="Street" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_Street" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="StreetRow" msprop:Generator_UserRelationName="FK_Partner_Street" />
+      <msdata:Relationship name="FK_Partner_TypePartner" msdata:parent="TypePartner" msdata:child="Partner" msdata:parentkey="IDTypePartner" msdata:childkey="IDTypePartner" msprop:Generator_UserParentTable="TypePartner" msprop:Generator_UserChildTable="Partner" msprop:Generator_RelationVarName="relationFK_Partner_TypePartner" msprop:Generator_ChildPropName="GetPartnerRows" msprop:Generator_ParentPropName="TypePartnerRow" msprop:Generator_UserRelationName="FK_Partner_TypePartner" />
+      <msdata:Relationship name="FK_PartnerProducts_Partner" msdata:parent="Partner" msdata:child="PartnerProducts" msdata:parentkey="IDPartner" msdata:childkey="IDPartner" msprop:Generator_UserParentTable="Partner" msprop:Generator_UserChildTable="PartnerProducts" msprop:Generator_RelationVarName="relationFK_PartnerProducts_Partner" msprop:Generator_ChildPropName="GetPartnerProductsRows" msprop:Generator_UserRelationName="FK_PartnerProducts_Partner" msprop:Generator_ParentPropName="PartnerRow" />
+      <msdata:Relationship name="FK_PartnerProducts_Product" msdata:parent="Product" msdata:child="PartnerProducts" msdata:parentkey="IDProduct" msdata:childkey="IDProduct" msprop:Generator_UserParentTable="Product" msprop:Generator_UserChildTable="PartnerProducts" msprop:Generator_RelationVarName="relationFK_PartnerProducts_Product" msprop:Generator_ChildPropName="GetPartnerProductsRows" msprop:Generator_ParentPropName="ProductRow" msprop:Generator_UserRelationName="FK_PartnerProducts_Product" />
+      <msdata:Relationship name="FK_Product_ProductType" msdata:parent="ProductType" msdata:child="Product" msdata:parentkey="IDProductType" msdata:childkey="IDProductType" msprop:Generator_UserParentTable="ProductType" msprop:Generator_UserChildTable="Product" msprop:Generator_RelationVarName="relationFK_Product_ProductType" msprop:Generator_ChildPropName="GetProductRows" msprop:Generator_ParentPropName="ProductTypeRow" msprop:Generator_UserRelationName="FK_Product_ProductType" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

+ 136 - 1
СУБД Альфапол/AlfafloorGDVDataSet.xss

@@ -1 +1,136 @@
-
+<?xml version="1.0" encoding="utf-8"?>
+<!--<autogenerated>
+     This code was generated by a tool to store the dataset designer's layout information.
+     Changes to this file may cause incorrect behavior and will be lost if
+     the code is regenerated.
+</autogenerated>-->
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+  <Shapes>
+    <Shape ID="DesignTable:City" ZOrder="20" X="327" Y="70" Height="115" Width="167" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Manager" ZOrder="19" X="1185" Y="70" Height="210" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:Partner" ZOrder="18" X="70" Y="70" Height="305" Width="187" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:PartnerProducts" ZOrder="17" X="327" Y="995" Height="172" Width="239" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:PostCode" ZOrder="16" X="327" Y="255" Height="115" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Product" ZOrder="15" X="636" Y="995" Height="172" Width="190" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:ProductType" ZOrder="14" X="896" Y="995" Height="134" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:Region" ZOrder="13" X="327" Y="440" Height="115" Width="185" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Street" ZOrder="12" X="327" Y="625" Height="115" Width="179" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TypeMaterial" ZOrder="11" X="1451" Y="70" Height="134" Width="221" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
+    <Shape ID="DesignTable:TypePartner" ZOrder="10" X="327" Y="810" Height="115" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:Type4Filter" ZOrder="1" X="682" Y="140" Height="154" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
+  </Shapes>
+  <Connectors>
+    <Connector ID="DesignRelation:FK_Partner_City" ZOrder="9" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>327</X>
+          <Y>127</Y>
+        </Point>
+        <Point>
+          <X>257</X>
+          <Y>127</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Partner_PostCode" ZOrder="8" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>327</X>
+          <Y>312</Y>
+        </Point>
+        <Point>
+          <X>257</X>
+          <Y>312</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Partner_Region" ZOrder="7" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>327</X>
+          <Y>457</Y>
+        </Point>
+        <Point>
+          <X>240</X>
+          <Y>457</Y>
+        </Point>
+        <Point>
+          <X>240</X>
+          <Y>375</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Partner_Street" ZOrder="6" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>327</X>
+          <Y>642</Y>
+        </Point>
+        <Point>
+          <X>232</X>
+          <Y>642</Y>
+        </Point>
+        <Point>
+          <X>232</X>
+          <Y>375</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Partner_TypePartner" ZOrder="5" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>327</X>
+          <Y>827</Y>
+        </Point>
+        <Point>
+          <X>224</X>
+          <Y>827</Y>
+        </Point>
+        <Point>
+          <X>224</X>
+          <Y>375</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_PartnerProducts_Partner" ZOrder="4" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>216</X>
+          <Y>375</Y>
+        </Point>
+        <Point>
+          <X>216</X>
+          <Y>1012</Y>
+        </Point>
+        <Point>
+          <X>327</X>
+          <Y>1012</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_PartnerProducts_Product" ZOrder="3" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>636</X>
+          <Y>1081</Y>
+        </Point>
+        <Point>
+          <X>566</X>
+          <Y>1081</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+    <Connector ID="DesignRelation:FK_Product_ProductType" ZOrder="2" LineWidth="11">
+      <RoutePoints>
+        <Point>
+          <X>896</X>
+          <Y>1062</Y>
+        </Point>
+        <Point>
+          <X>826</X>
+          <Y>1062</Y>
+        </Point>
+      </RoutePoints>
+    </Connector>
+  </Connectors>
+</DiagramLayout>

+ 173 - 40
СУБД Альфапол/FormManager.Designer.cs

@@ -30,12 +30,10 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormManager));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel1 = new System.Windows.Forms.Panel();
             this.lblphoto = new System.Windows.Forms.Label();
-            this.bsManager = new System.Windows.Forms.BindingSource(this.components);
-            this.alfafloorGDVDataSet1 = new СУБД_Альфапол.AlfafloorGDVDataSet();
             this.label4 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
@@ -43,21 +41,37 @@
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.label1 = new System.Windows.Forms.Label();
             this.btnExit = new System.Windows.Forms.Button();
-            this.managerTableAdapter = new СУБД_Альфапол.AlfafloorGDVDataSetTableAdapters.ManagerTableAdapter();
             this.dgvPartner = new System.Windows.Forms.DataGridView();
             this.IDPartner = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.InfoPartner = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Discount4Partner = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lblSearch = new System.Windows.Forms.Label();
+            this.tbxSearch = new System.Windows.Forms.TextBox();
+            this.tbxMinR = new System.Windows.Forms.TextBox();
+            this.tbxMaxR = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.cbxRatingSearch = new System.Windows.Forms.CheckBox();
+            this.cmbTypePartner = new System.Windows.Forms.ComboBox();
+            this.label7 = new System.Windows.Forms.Label();
+            this.bsManager = new System.Windows.Forms.BindingSource(this.components);
+            this.alfafloorGDVDataSet1 = new СУБД_Альфапол.AlfafloorGDVDataSet();
+            this.managerTableAdapter = new СУБД_Альфапол.AlfafloorGDVDataSetTableAdapters.ManagerTableAdapter();
+            this.bs4FilterTypePartner = new System.Windows.Forms.BindingSource(this.components);
+            this.type4FilterTableAdapter = new СУБД_Альфапол.AlfafloorGDVDataSetTableAdapters.Type4FilterTableAdapter();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsManager)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.alfafloorGDVDataSet1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbxProfile)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvPartner)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsManager)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.alfafloorGDVDataSet1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs4FilterTypePartner)).BeginInit();
             this.SuspendLayout();
             // 
             // panel1
             // 
+            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.panel1.BackColor = System.Drawing.Color.LightGray;
             this.panel1.Controls.Add(this.lblphoto);
             this.panel1.Controls.Add(this.label4);
@@ -66,38 +80,29 @@
             this.panel1.Controls.Add(this.pbxProfile);
             this.panel1.Controls.Add(this.pictureBox1);
             this.panel1.Controls.Add(this.label1);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(933, 136);
+            this.panel1.Size = new System.Drawing.Size(796, 136);
             this.panel1.TabIndex = 1;
             // 
             // lblphoto
             // 
+            this.lblphoto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.lblphoto.AutoSize = true;
             this.lblphoto.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsManager, "Photo", true));
-            this.lblphoto.Location = new System.Drawing.Point(679, 94);
+            this.lblphoto.Location = new System.Drawing.Point(591, 94);
             this.lblphoto.Name = "lblphoto";
             this.lblphoto.Size = new System.Drawing.Size(49, 15);
             this.lblphoto.TabIndex = 9;
             this.lblphoto.Text = "label5";
             // 
-            // bsManager
-            // 
-            this.bsManager.DataMember = "Manager";
-            this.bsManager.DataSource = this.alfafloorGDVDataSet1;
-            // 
-            // alfafloorGDVDataSet1
-            // 
-            this.alfafloorGDVDataSet1.DataSetName = "AlfafloorGDVDataSet";
-            this.alfafloorGDVDataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
             // label4
             // 
+            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.label4.AutoSize = true;
             this.label4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsManager, "Patronomyc", true));
-            this.label4.Location = new System.Drawing.Point(679, 63);
+            this.label4.Location = new System.Drawing.Point(592, 63);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(49, 15);
             this.label4.TabIndex = 8;
@@ -105,9 +110,10 @@
             // 
             // label3
             // 
+            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.label3.AutoSize = true;
             this.label3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsManager, "Name", true));
-            this.label3.Location = new System.Drawing.Point(679, 35);
+            this.label3.Location = new System.Drawing.Point(591, 35);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(49, 15);
             this.label3.TabIndex = 7;
@@ -115,9 +121,10 @@
             // 
             // label2
             // 
+            this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.label2.AutoSize = true;
             this.label2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsManager, "Surname", true));
-            this.label2.Location = new System.Drawing.Point(679, 9);
+            this.label2.Location = new System.Drawing.Point(591, 9);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(49, 15);
             this.label2.TabIndex = 6;
@@ -128,7 +135,7 @@
             this.pbxProfile.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.pbxProfile.DataBindings.Add(new System.Windows.Forms.Binding("Image", this.bsManager, "Photo", true));
             this.pbxProfile.Dock = System.Windows.Forms.DockStyle.Right;
-            this.pbxProfile.Location = new System.Drawing.Point(794, 0);
+            this.pbxProfile.Location = new System.Drawing.Point(657, 0);
             this.pbxProfile.Name = "pbxProfile";
             this.pbxProfile.Size = new System.Drawing.Size(139, 136);
             this.pbxProfile.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -151,7 +158,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("Courier New", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.label1.Location = new System.Drawing.Point(218, 52);
+            this.label1.Location = new System.Drawing.Point(165, 51);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(382, 31);
@@ -160,9 +167,11 @@
             // 
             // btnExit
             // 
+            this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
             this.btnExit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(161)))), ((int)(((byte)(99)))), ((int)(((byte)(245)))));
             this.btnExit.ForeColor = System.Drawing.Color.GhostWhite;
-            this.btnExit.Location = new System.Drawing.Point(749, 453);
+            this.btnExit.Location = new System.Drawing.Point(683, 174);
             this.btnExit.Name = "btnExit";
             this.btnExit.Size = new System.Drawing.Size(100, 36);
             this.btnExit.TabIndex = 5;
@@ -170,16 +179,15 @@
             this.btnExit.UseVisualStyleBackColor = false;
             this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
             // 
-            // managerTableAdapter
-            // 
-            this.managerTableAdapter.ClearBeforeFill = true;
-            // 
             // dgvPartner
             // 
             this.dgvPartner.AllowUserToAddRows = false;
             this.dgvPartner.AllowUserToDeleteRows = false;
+            this.dgvPartner.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.dgvPartner.BackgroundColor = System.Drawing.Color.White;
-            this.dgvPartner.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.dgvPartner.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.dgvPartner.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.SingleHorizontal;
             this.dgvPartner.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvPartner.ColumnHeadersVisible = false;
@@ -188,7 +196,7 @@
             this.InfoPartner,
             this.Discount4Partner});
             this.dgvPartner.GridColor = System.Drawing.Color.White;
-            this.dgvPartner.Location = new System.Drawing.Point(12, 142);
+            this.dgvPartner.Location = new System.Drawing.Point(12, 216);
             this.dgvPartner.MultiSelect = false;
             this.dgvPartner.Name = "dgvPartner";
             this.dgvPartner.RowHeadersVisible = false;
@@ -197,7 +205,7 @@
             this.dgvPartner.RowTemplate.DividerHeight = 10;
             this.dgvPartner.RowTemplate.Height = 70;
             this.dgvPartner.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvPartner.Size = new System.Drawing.Size(682, 349);
+            this.dgvPartner.Size = new System.Drawing.Size(771, 349);
             this.dgvPartner.TabIndex = 6;
             // 
             // IDPartner
@@ -209,42 +217,156 @@
             // InfoPartner
             // 
             this.InfoPartner.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.InfoPartner.DefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.InfoPartner.DefaultCellStyle = dataGridViewCellStyle9;
             this.InfoPartner.HeaderText = "Инфо";
             this.InfoPartner.Name = "InfoPartner";
             // 
             // Discount4Partner
             // 
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Courier New", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.Discount4Partner.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Courier New", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.Discount4Partner.DefaultCellStyle = dataGridViewCellStyle10;
             this.Discount4Partner.HeaderText = "Скидка";
             this.Discount4Partner.Name = "Discount4Partner";
             // 
+            // lblSearch
+            // 
+            this.lblSearch.AutoSize = true;
+            this.lblSearch.Location = new System.Drawing.Point(12, 158);
+            this.lblSearch.Name = "lblSearch";
+            this.lblSearch.Size = new System.Drawing.Size(245, 15);
+            this.lblSearch.TabIndex = 7;
+            this.lblSearch.Text = "Поиск по наименованию или фамилии:";
+            // 
+            // tbxSearch
+            // 
+            this.tbxSearch.Location = new System.Drawing.Point(12, 176);
+            this.tbxSearch.Name = "tbxSearch";
+            this.tbxSearch.Size = new System.Drawing.Size(245, 21);
+            this.tbxSearch.TabIndex = 8;
+            this.tbxSearch.TextChanged += new System.EventHandler(this.tbxSearch_TextChanged);
+            // 
+            // tbxMinR
+            // 
+            this.tbxMinR.Location = new System.Drawing.Point(387, 149);
+            this.tbxMinR.Name = "tbxMinR";
+            this.tbxMinR.Size = new System.Drawing.Size(100, 21);
+            this.tbxMinR.TabIndex = 9;
+            // 
+            // tbxMaxR
+            // 
+            this.tbxMaxR.Location = new System.Drawing.Point(387, 179);
+            this.tbxMaxR.Name = "tbxMaxR";
+            this.tbxMaxR.Size = new System.Drawing.Size(100, 21);
+            this.tbxMaxR.TabIndex = 10;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(276, 152);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(98, 15);
+            this.label5.TabIndex = 11;
+            this.label5.Text = "Мин. рейтинг:";
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(276, 182);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(105, 15);
+            this.label6.TabIndex = 12;
+            this.label6.Text = "Макс. рейтинг:";
+            // 
+            // cbxRatingSearch
+            // 
+            this.cbxRatingSearch.AutoSize = true;
+            this.cbxRatingSearch.Location = new System.Drawing.Point(12, 138);
+            this.cbxRatingSearch.Name = "cbxRatingSearch";
+            this.cbxRatingSearch.Size = new System.Drawing.Size(152, 19);
+            this.cbxRatingSearch.TabIndex = 13;
+            this.cbxRatingSearch.Text = "Искать по рейтингу";
+            this.cbxRatingSearch.UseVisualStyleBackColor = true;
+            this.cbxRatingSearch.CheckedChanged += new System.EventHandler(this.cbxRatingSearch_CheckedChanged);
+            // 
+            // cmbTypePartner
+            // 
+            this.cmbTypePartner.DataSource = this.bs4FilterTypePartner;
+            this.cmbTypePartner.DisplayMember = "TypePartner";
+            this.cmbTypePartner.FormattingEnabled = true;
+            this.cmbTypePartner.Location = new System.Drawing.Point(501, 179);
+            this.cmbTypePartner.Name = "cmbTypePartner";
+            this.cmbTypePartner.Size = new System.Drawing.Size(140, 23);
+            this.cmbTypePartner.TabIndex = 14;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(498, 149);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(140, 15);
+            this.label7.TabIndex = 15;
+            this.label7.Text = "Фильтрация по типу:";
+            // 
+            // bsManager
+            // 
+            this.bsManager.DataMember = "Manager";
+            this.bsManager.DataSource = this.alfafloorGDVDataSet1;
+            // 
+            // alfafloorGDVDataSet1
+            // 
+            this.alfafloorGDVDataSet1.DataSetName = "AlfafloorGDVDataSet";
+            this.alfafloorGDVDataSet1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+            // 
+            // managerTableAdapter
+            // 
+            this.managerTableAdapter.ClearBeforeFill = true;
+            // 
+            // bs4FilterTypePartner
+            // 
+            this.bs4FilterTypePartner.DataMember = "Type4Filter";
+            this.bs4FilterTypePartner.DataSource = this.alfafloorGDVDataSet1;
+            // 
+            // type4FilterTableAdapter
+            // 
+            this.type4FilterTableAdapter.ClearBeforeFill = true;
+            // 
             // FormManager
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(933, 519);
+            this.ClientSize = new System.Drawing.Size(795, 577);
+            this.Controls.Add(this.label7);
+            this.Controls.Add(this.cmbTypePartner);
+            this.Controls.Add(this.cbxRatingSearch);
+            this.Controls.Add(this.label6);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.tbxMaxR);
+            this.Controls.Add(this.tbxMinR);
+            this.Controls.Add(this.tbxSearch);
+            this.Controls.Add(this.lblSearch);
             this.Controls.Add(this.dgvPartner);
             this.Controls.Add(this.btnExit);
             this.Controls.Add(this.panel1);
             this.Font = new System.Drawing.Font("Courier New", 9F);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.MinimumSize = new System.Drawing.Size(811, 616);
             this.Name = "FormManager";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OOO \"Альфапол\"";
             this.Load += new System.EventHandler(this.FormManager_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsManager)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.alfafloorGDVDataSet1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbxProfile)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvPartner)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bsManager)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.alfafloorGDVDataSet1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs4FilterTypePartner)).EndInit();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -266,5 +388,16 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn IDPartner;
         private System.Windows.Forms.DataGridViewTextBoxColumn InfoPartner;
         private System.Windows.Forms.DataGridViewTextBoxColumn Discount4Partner;
+        private System.Windows.Forms.Label lblSearch;
+        private System.Windows.Forms.TextBox tbxSearch;
+        private System.Windows.Forms.TextBox tbxMinR;
+        private System.Windows.Forms.TextBox tbxMaxR;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.CheckBox cbxRatingSearch;
+        private System.Windows.Forms.ComboBox cmbTypePartner;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.BindingSource bs4FilterTypePartner;
+        private AlfafloorGDVDataSetTableAdapters.Type4FilterTableAdapter type4FilterTableAdapter;
     }
 }

+ 33 - 2
СУБД Альфапол/FormManager.cs

@@ -25,13 +25,28 @@ namespace СУБД_Альфапол
         {
             SqlConnection conection = new SqlConnection(FormAuthorizathion.txtcon);
             conection.Open();
+            string additional = $"Where (Namepartner like '{tbxSearch.Text}%' or Surname like '{tbxSearch.Text}%') ";//условие поиска
+            if (cbxRatingSearch.Checked && tbxMinR.Text !="" && tbxMaxR.Text != "")
+            {
+                try
+                {
+                    additional += $" and Rating >='{int.Parse(tbxMinR.Text)}' and Rating <='{int.Parse(tbxMaxR.Text)}'";
+                }
+                catch { return; }//на случай если рейтинг не число
+            }
+
             string query = @"SELECT distinct        partner.IDPartner ,partner.Namepartner, TypePartner.TypePartner, Partner.Surname, Partner.Name, Partner.Patronomyc, Partner.Phone, Partner.Rating, 
 (SELECT         sum(CountProduct) FROM            PartnerProducts  where IDPartner = partner.IDPartner group by IDPartner) as countsales
 FROM            Partner INNER JOIN
                          TypePartner ON Partner.IDTypePartner = TypePartner.IDTypePartner INNER JOIN
-                         PartnerProducts ON Partner.IDPartner = PartnerProducts.IDPartner";
+                         PartnerProducts ON Partner.IDPartner = PartnerProducts.IDPartner  " + additional;
             SqlCommand command = new SqlCommand(query, conection);
-            SqlDataReader res = command.ExecuteReader();
+            SqlDataReader res;
+            try
+            {
+                res = command.ExecuteReader();
+            }
+            catch { dgvPartner.Rows.Clear(); tbxMinR.Text = ""; tbxMaxR.Text = ""; return; }
             dgvPartner.Rows.Clear();
             while (res.Read())
             {
@@ -97,6 +112,8 @@ FROM            Partner INNER JOIN
         }
         private void FormManager_Load(object sender, EventArgs e)
         {
+            // TODO: This line of code loads data into the 'alfafloorGDVDataSet1.Type4Filter' table. You can move, or remove it, as needed.
+            this.type4FilterTableAdapter.Fill(this.alfafloorGDVDataSet1.Type4Filter);
             // TODO: This line of code loads data into the 'alfafloorGDVDataSet1.Manager' table. You can move, or remove it, as needed.
             this.managerTableAdapter.Fill(this.alfafloorGDVDataSet1.Manager);
             try
@@ -117,5 +134,19 @@ FROM            Partner INNER JOIN
         {
             this.Close();
         }
+
+        private void tbxSearch_TextChanged(object sender, EventArgs e)
+        {
+            FillPartner();
+        }
+
+        private void cbxRatingSearch_CheckedChanged(object sender, EventArgs e)
+        {
+            if (cbxRatingSearch.Checked)
+            {
+                FillPartner();
+            }
+            FillPartner();
+        }
     }
 }

+ 27 - 6
СУБД Альфапол/FormManager.resx

@@ -120,14 +120,11 @@
   <metadata name="bsManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="alfafloorGDVDataSet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>130, 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>
         iVBORw0KGgoAAAANSUhEUgAABAAAAAQACAYAAAB/HSuDAAAAIGNIUk0AAHolAACAgwAA+f8AAIDoAABS
-        CAABFVgAADqXAAAXb9daH5AAAAAJcEhZcwAACw4AAAsOAUC+4UEAAP+WSURBVHhe7P3nlx3Hdb6B3v/2
+        CAABFVgAADqXAAAXb9daH5AAAAAJcEhZcwAACwwAAAsMAT9AIsgAAP+WSURBVHhe7P3nlx3Hdb6B3v/2
         2r/rIFlpeUlLMk2Bpk2TFqlgUqZkmCRIgCAAAjiTc8455xkMcs4EmOrWs+vUYDAqiiCB6j4DvB+eNcAR
         hd6nurqn3h3/P//f5n8RYi9OCCGEEEIIse9JnfXFC0zyQ/FCkHpBCCGEEEIIIV4MUhpBPOckPxTPFamH
         XQghhBBCCCFSpDSFeE5Ifij2LakHWAghhBBCCCG+LyndIfYpyQ/FviH1gAohhBBCCCFETlLaROwDkh+K
@@ -2468,8 +2465,14 @@
         pL7r48T66f/5/8ahEBTicdBPAAAAAElFTkSuQmCC
 </value>
   </data>
-  <metadata name="managerTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>297, 17</value>
+  <metadata name="IDPartner.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="InfoPartner.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Discount4Partner.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
   </metadata>
   <metadata name="IDPartner.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -2480,6 +2483,24 @@
   <metadata name="Discount4Partner.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="bs4FilterTypePartner.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>467, 17</value>
+  </metadata>
+  <metadata name="bsManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="alfafloorGDVDataSet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>130, 17</value>
+  </metadata>
+  <metadata name="alfafloorGDVDataSet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>130, 17</value>
+  </metadata>
+  <metadata name="managerTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>297, 17</value>
+  </metadata>
+  <metadata name="type4FilterTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>627, 17</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAAAAAAAEAIAAINAAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAEAAAABAAgGAAAAXHKoZgAAM89J

BIN=BIN
СУБД Альфапол/bin/Debug/СУБД Альфапол.exe