From 67132f2ac9abf13ba96c6ba0f8c4049aa538c7e8 Mon Sep 17 00:00:00 2001
From: Digital Data - Marlon Schreiber <m.schreiber@digitaldata.works>
Date: Tue, 14 Dec 2021 11:19:43 +0100
Subject: [PATCH] MS

---
 .../frmAdmin_IDBAttribute.Designer.vb         | 15 ++++++++++++
 .../Administration/frmAdmin_IDBAttribute.resx |  3 ---
 .../Administration/frmAdmin_IDBAttribute.vb   |  7 +++---
 GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb     |  1 +
 GUIs.ZooFlow/DSIDB_Stammdaten.xsd             | 24 +++++++++----------
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb
index 585857e8..aec396c9 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb
@@ -337,8 +337,11 @@ Partial Class frmAdmin_IDBAttribute
         '
         'LayoutControlItem1
         '
+        Me.LayoutControlItem1.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LayoutControlItem1.AppearanceItemCaption.Options.UseFont = True
         Me.LayoutControlItem1.Control = Me.TextEdit1
         Me.LayoutControlItem1.CustomizationFormText = "GUID"
+        Me.LayoutControlItem1.Enabled = False
         Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControlItem1.Name = "LayoutControlItem1"
         Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
@@ -378,7 +381,10 @@ Partial Class frmAdmin_IDBAttribute
         '
         'LayoutControlItem7
         '
+        Me.LayoutControlItem7.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LayoutControlItem7.AppearanceItemCaption.Options.UseFont = True
         Me.LayoutControlItem7.Control = Me.txtAddedWho
+        Me.LayoutControlItem7.Enabled = False
         Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 238)
         Me.LayoutControlItem7.Name = "LayoutControlItem7"
         Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
@@ -409,7 +415,10 @@ Partial Class frmAdmin_IDBAttribute
         '
         'LayoutControlItem9
         '
+        Me.LayoutControlItem9.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LayoutControlItem9.AppearanceItemCaption.Options.UseFont = True
         Me.LayoutControlItem9.Control = Me.txtChangedWho
+        Me.LayoutControlItem9.Enabled = False
         Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 278)
         Me.LayoutControlItem9.Name = "LayoutControlItem9"
         Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
@@ -429,7 +438,10 @@ Partial Class frmAdmin_IDBAttribute
         '
         'LayoutControlItem8
         '
+        Me.LayoutControlItem8.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LayoutControlItem8.AppearanceItemCaption.Options.UseFont = True
         Me.LayoutControlItem8.Control = Me.txtAddedWhen
+        Me.LayoutControlItem8.Enabled = False
         Me.LayoutControlItem8.Location = New System.Drawing.Point(436, 238)
         Me.LayoutControlItem8.Name = "LayoutControlItem8"
         Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
@@ -439,7 +451,10 @@ Partial Class frmAdmin_IDBAttribute
         '
         'LayoutControlItem10
         '
+        Me.LayoutControlItem10.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.LayoutControlItem10.AppearanceItemCaption.Options.UseFont = True
         Me.LayoutControlItem10.Control = Me.txtChangedWhen
+        Me.LayoutControlItem10.Enabled = False
         Me.LayoutControlItem10.Location = New System.Drawing.Point(436, 278)
         Me.LayoutControlItem10.Name = "LayoutControlItem10"
         Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx
index 479a1577..8e679d2e 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx
+++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx
@@ -153,9 +153,6 @@
   <metadata name="TBWH_ATTRIBUTE_TYPEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 56</value>
   </metadata>
-  <metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>177, 17</value>
   </metadata>
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb
index 0b08c637..4948e287 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb
@@ -21,7 +21,10 @@
             TBWH_ATTRIBUTE_TYPETableAdapter.Fill(DSIDB_Stammdaten.TBWH_ATTRIBUTE_TYPE)
             VWIDB_BE_ATTRIBUTETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString
             VWIDB_BE_ATTRIBUTETableAdapter.FillByAttributeId(DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, PrimaryKey, 1)
-
+            If IsInsert Then
+                VWIDB_BE_ATTRIBUTEBindingSource.AddNew()
+                DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.ADDED_WHOColumn.DefaultValue = My.Application.User.UserName
+            End If
         Catch ex As Exception
             ShowErrorMessage(ex)
         End Try
@@ -29,7 +32,6 @@
 
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
         ResetMessages()
-
         If SaveData() And HasChanges Then
             ShowStatus("Attribute saved!")
         End If
@@ -82,7 +84,6 @@
                          "(TITLE, TYP_ID, VIEW_SEQUENCE, VIEW_VISIBLE, ADDED_WHO,COMMENT) " &
                          $"VALUES ('{TextEdit2.Text}',{ComboBoxEdit1.EditValue},{SpinEdit1.Value},'{CheckEdit2.Checked}','{My.Application.User.UserName}', '{TextEdit3.Text}')"
 
-
                 If My.DatabaseIDB.ExecuteNonQuery(oInsert) = True Then
                     IsInsert = False
                 Else
diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb
index 3b7f841b..5921b1e5 100644
--- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb
+++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb
@@ -2154,6 +2154,7 @@ Partial Public Class DSIDB_Stammdaten
             Me.columnTYPE_NAME.AllowDBNull = false
             Me.columnTYPE_NAME.MaxLength = 100
             Me.columnVIEW_VISIBLE.AllowDBNull = false
+            Me.columnVIEW_VISIBLE.DefaultValue = CType(true,Boolean)
             Me.columnVIEW_SEQUENCE.AllowDBNull = false
             Me.columnLANG_ID.AllowDBNull = false
             Me.columnLANG_CODE.AllowDBNull = false
diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd
index 8151d31c..bbcb32bc 100644
--- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd
+++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd
@@ -614,7 +614,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
   <xs:element name="DSIDB_Stammdaten" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSIDB_Stammdaten" msprop:Generator_UserDSName="DSIDB_Stammdaten">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBIDB_BUSINESS_ENTITY" msprop:Generator_TableClassName="TBIDB_BUSINESS_ENTITYDataTable" msprop:Generator_TableVarName="tableTBIDB_BUSINESS_ENTITY" msprop:Generator_RowChangedName="TBIDB_BUSINESS_ENTITYRowChanged" msprop:Generator_TablePropName="TBIDB_BUSINESS_ENTITY" msprop:Generator_RowDeletingName="TBIDB_BUSINESS_ENTITYRowDeleting" msprop:Generator_RowChangingName="TBIDB_BUSINESS_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_BUSINESS_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_BUSINESS_ENTITYRowDeleted" msprop:Generator_RowClassName="TBIDB_BUSINESS_ENTITYRow" msprop:Generator_UserTableName="TBIDB_BUSINESS_ENTITY" msprop:Generator_RowEvArgName="TBIDB_BUSINESS_ENTITYRowChangeEvent">
+        <xs:element name="TBIDB_BUSINESS_ENTITY" msprop:Generator_TableClassName="TBIDB_BUSINESS_ENTITYDataTable" msprop:Generator_TableVarName="tableTBIDB_BUSINESS_ENTITY" msprop:Generator_TablePropName="TBIDB_BUSINESS_ENTITY" msprop:Generator_RowDeletingName="TBIDB_BUSINESS_ENTITYRowDeleting" msprop:Generator_RowChangingName="TBIDB_BUSINESS_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_BUSINESS_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_BUSINESS_ENTITYRowDeleted" msprop:Generator_UserTableName="TBIDB_BUSINESS_ENTITY" msprop:Generator_RowChangedName="TBIDB_BUSINESS_ENTITYRowChanged" msprop:Generator_RowEvArgName="TBIDB_BUSINESS_ENTITYRowChangeEvent" msprop:Generator_RowClassName="TBIDB_BUSINESS_ENTITYRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -653,7 +653,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWIDB_BE_ATTRIBUTE" msprop:Generator_TableClassName="VWIDB_BE_ATTRIBUTEDataTable" msprop:Generator_TableVarName="tableVWIDB_BE_ATTRIBUTE" msprop:Generator_TablePropName="VWIDB_BE_ATTRIBUTE" msprop:Generator_RowDeletingName="VWIDB_BE_ATTRIBUTERowDeleting" msprop:Generator_RowChangingName="VWIDB_BE_ATTRIBUTERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_BE_ATTRIBUTERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_BE_ATTRIBUTERowDeleted" msprop:Generator_UserTableName="VWIDB_BE_ATTRIBUTE" msprop:Generator_RowChangedName="VWIDB_BE_ATTRIBUTERowChanged" msprop:Generator_RowEvArgName="VWIDB_BE_ATTRIBUTERowChangeEvent" msprop:Generator_RowClassName="VWIDB_BE_ATTRIBUTERow">
+        <xs:element name="VWIDB_BE_ATTRIBUTE" msprop:Generator_TableClassName="VWIDB_BE_ATTRIBUTEDataTable" msprop:Generator_TableVarName="tableVWIDB_BE_ATTRIBUTE" msprop:Generator_RowChangedName="VWIDB_BE_ATTRIBUTERowChanged" msprop:Generator_TablePropName="VWIDB_BE_ATTRIBUTE" msprop:Generator_RowDeletingName="VWIDB_BE_ATTRIBUTERowDeleting" msprop:Generator_RowChangingName="VWIDB_BE_ATTRIBUTERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_BE_ATTRIBUTERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_BE_ATTRIBUTERowDeleted" msprop:Generator_RowClassName="VWIDB_BE_ATTRIBUTERow" msprop:Generator_UserTableName="VWIDB_BE_ATTRIBUTE" msprop:Generator_RowEvArgName="VWIDB_BE_ATTRIBUTERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BE_ID" msprop:Generator_ColumnVarNameInTable="columnBE_ID" msprop:Generator_ColumnPropNameInRow="BE_ID" msprop:Generator_ColumnPropNameInTable="BE_IDColumn" msprop:Generator_UserColumnName="BE_ID" type="xs:int" />
@@ -681,7 +681,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="VIEW_VISIBLE" msprop:Generator_ColumnVarNameInTable="columnVIEW_VISIBLE" msprop:Generator_ColumnPropNameInRow="VIEW_VISIBLE" msprop:Generator_ColumnPropNameInTable="VIEW_VISIBLEColumn" msprop:Generator_UserColumnName="VIEW_VISIBLE" type="xs:boolean" />
+              <xs:element name="VIEW_VISIBLE" msprop:Generator_ColumnVarNameInTable="columnVIEW_VISIBLE" msprop:Generator_ColumnPropNameInRow="VIEW_VISIBLE" msprop:Generator_ColumnPropNameInTable="VIEW_VISIBLEColumn" msprop:Generator_UserColumnName="VIEW_VISIBLE" type="xs:boolean" default="true" />
               <xs:element name="VIEW_SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnVIEW_SEQUENCE" msprop:Generator_ColumnPropNameInRow="VIEW_SEQUENCE" msprop:Generator_ColumnPropNameInTable="VIEW_SEQUENCEColumn" msprop:Generator_UserColumnName="VIEW_SEQUENCE" type="xs:int" />
               <xs:element name="LANG_ID" msprop:Generator_ColumnVarNameInTable="columnLANG_ID" msprop:Generator_ColumnPropNameInRow="LANG_ID" msprop:Generator_ColumnPropNameInTable="LANG_IDColumn" msprop:Generator_UserColumnName="LANG_ID" type="xs:unsignedByte" />
               <xs:element name="LANG_CODE" msprop:Generator_ColumnVarNameInTable="columnLANG_CODE" msprop:Generator_ColumnPropNameInRow="LANG_CODE" msprop:Generator_ColumnPropNameInTable="LANG_CODEColumn" msprop:Generator_UserColumnName="LANG_CODE">
@@ -711,7 +711,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_ATTRIBUTE" msprop:Generator_TableClassName="TBIDB_ATTRIBUTEDataTable" msprop:Generator_TableVarName="tableTBIDB_ATTRIBUTE" msprop:Generator_RowChangedName="TBIDB_ATTRIBUTERowChanged" msprop:Generator_TablePropName="TBIDB_ATTRIBUTE" msprop:Generator_RowDeletingName="TBIDB_ATTRIBUTERowDeleting" msprop:Generator_RowChangingName="TBIDB_ATTRIBUTERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_ATTRIBUTERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_ATTRIBUTERowDeleted" msprop:Generator_RowClassName="TBIDB_ATTRIBUTERow" msprop:Generator_UserTableName="TBIDB_ATTRIBUTE" msprop:Generator_RowEvArgName="TBIDB_ATTRIBUTERowChangeEvent">
+        <xs:element name="TBIDB_ATTRIBUTE" msprop:Generator_TableClassName="TBIDB_ATTRIBUTEDataTable" msprop:Generator_TableVarName="tableTBIDB_ATTRIBUTE" msprop:Generator_TablePropName="TBIDB_ATTRIBUTE" msprop:Generator_RowDeletingName="TBIDB_ATTRIBUTERowDeleting" msprop:Generator_RowChangingName="TBIDB_ATTRIBUTERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_ATTRIBUTERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_ATTRIBUTERowDeleted" msprop:Generator_UserTableName="TBIDB_ATTRIBUTE" msprop:Generator_RowChangedName="TBIDB_ATTRIBUTERowChanged" msprop:Generator_RowEvArgName="TBIDB_ATTRIBUTERowChangeEvent" msprop:Generator_RowClassName="TBIDB_ATTRIBUTERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -768,7 +768,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_TableClassName="TBIDB_ATTRIBUTE_TYPEDataTable" msprop:Generator_TableVarName="tableTBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowChangedName="TBIDB_ATTRIBUTE_TYPERowChanged" msprop:Generator_TablePropName="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowDeletingName="TBIDB_ATTRIBUTE_TYPERowDeleting" msprop:Generator_RowChangingName="TBIDB_ATTRIBUTE_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_ATTRIBUTE_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_ATTRIBUTE_TYPERowDeleted" msprop:Generator_RowClassName="TBIDB_ATTRIBUTE_TYPERow" msprop:Generator_UserTableName="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowEvArgName="TBIDB_ATTRIBUTE_TYPERowChangeEvent">
+        <xs:element name="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_TableClassName="TBIDB_ATTRIBUTE_TYPEDataTable" msprop:Generator_TableVarName="tableTBIDB_ATTRIBUTE_TYPE" msprop:Generator_TablePropName="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowDeletingName="TBIDB_ATTRIBUTE_TYPERowDeleting" msprop:Generator_RowChangingName="TBIDB_ATTRIBUTE_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_ATTRIBUTE_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_ATTRIBUTE_TYPERowDeleted" msprop:Generator_UserTableName="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowChangedName="TBIDB_ATTRIBUTE_TYPERowChanged" msprop:Generator_RowEvArgName="TBIDB_ATTRIBUTE_TYPERowChangeEvent" msprop:Generator_RowClassName="TBIDB_ATTRIBUTE_TYPERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -809,7 +809,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_TableClassName="TBZF_ADMIN_SOURCE_SQLDataTable" msprop:Generator_TableVarName="tableTBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowChangedName="TBZF_ADMIN_SOURCE_SQLRowChanged" msprop:Generator_TablePropName="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowDeletingName="TBZF_ADMIN_SOURCE_SQLRowDeleting" msprop:Generator_RowChangingName="TBZF_ADMIN_SOURCE_SQLRowChanging" msprop:Generator_RowEvHandlerName="TBZF_ADMIN_SOURCE_SQLRowChangeEventHandler" msprop:Generator_RowDeletedName="TBZF_ADMIN_SOURCE_SQLRowDeleted" msprop:Generator_RowClassName="TBZF_ADMIN_SOURCE_SQLRow" msprop:Generator_UserTableName="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowEvArgName="TBZF_ADMIN_SOURCE_SQLRowChangeEvent">
+        <xs:element name="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_TableClassName="TBZF_ADMIN_SOURCE_SQLDataTable" msprop:Generator_TableVarName="tableTBZF_ADMIN_SOURCE_SQL" msprop:Generator_TablePropName="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowDeletingName="TBZF_ADMIN_SOURCE_SQLRowDeleting" msprop:Generator_RowChangingName="TBZF_ADMIN_SOURCE_SQLRowChanging" msprop:Generator_RowEvHandlerName="TBZF_ADMIN_SOURCE_SQLRowChangeEventHandler" msprop:Generator_RowDeletedName="TBZF_ADMIN_SOURCE_SQLRowDeleted" msprop:Generator_UserTableName="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowChangedName="TBZF_ADMIN_SOURCE_SQLRowChanged" msprop:Generator_RowEvArgName="TBZF_ADMIN_SOURCE_SQLRowChangeEvent" msprop:Generator_RowClassName="TBZF_ADMIN_SOURCE_SQLRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -875,7 +875,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_OBJECT_STORE" msprop:Generator_TableClassName="TBIDB_OBJECT_STOREDataTable" msprop:Generator_TableVarName="tableTBIDB_OBJECT_STORE" msprop:Generator_TablePropName="TBIDB_OBJECT_STORE" msprop:Generator_RowDeletingName="TBIDB_OBJECT_STORERowDeleting" msprop:Generator_RowChangingName="TBIDB_OBJECT_STORERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_OBJECT_STORERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_OBJECT_STORERowDeleted" msprop:Generator_UserTableName="TBIDB_OBJECT_STORE" msprop:Generator_RowChangedName="TBIDB_OBJECT_STORERowChanged" msprop:Generator_RowEvArgName="TBIDB_OBJECT_STORERowChangeEvent" msprop:Generator_RowClassName="TBIDB_OBJECT_STORERow">
+        <xs:element name="TBIDB_OBJECT_STORE" msprop:Generator_TableClassName="TBIDB_OBJECT_STOREDataTable" msprop:Generator_TableVarName="tableTBIDB_OBJECT_STORE" msprop:Generator_RowChangedName="TBIDB_OBJECT_STORERowChanged" msprop:Generator_TablePropName="TBIDB_OBJECT_STORE" msprop:Generator_RowDeletingName="TBIDB_OBJECT_STORERowDeleting" msprop:Generator_RowChangingName="TBIDB_OBJECT_STORERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_OBJECT_STORERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_OBJECT_STORERowDeleted" msprop:Generator_RowClassName="TBIDB_OBJECT_STORERow" msprop:Generator_UserTableName="TBIDB_OBJECT_STORE" msprop:Generator_RowEvArgName="TBIDB_OBJECT_STORERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -928,7 +928,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_CATALOG" msprop:Generator_TableClassName="TBIDB_CATALOGDataTable" msprop:Generator_TableVarName="tableTBIDB_CATALOG" msprop:Generator_TablePropName="TBIDB_CATALOG" msprop:Generator_RowDeletingName="TBIDB_CATALOGRowDeleting" msprop:Generator_RowChangingName="TBIDB_CATALOGRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_CATALOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_CATALOGRowDeleted" msprop:Generator_UserTableName="TBIDB_CATALOG" msprop:Generator_RowChangedName="TBIDB_CATALOGRowChanged" msprop:Generator_RowEvArgName="TBIDB_CATALOGRowChangeEvent" msprop:Generator_RowClassName="TBIDB_CATALOGRow">
+        <xs:element name="TBIDB_CATALOG" msprop:Generator_TableClassName="TBIDB_CATALOGDataTable" msprop:Generator_TableVarName="tableTBIDB_CATALOG" msprop:Generator_RowChangedName="TBIDB_CATALOGRowChanged" msprop:Generator_TablePropName="TBIDB_CATALOG" msprop:Generator_RowDeletingName="TBIDB_CATALOGRowDeleting" msprop:Generator_RowChangingName="TBIDB_CATALOGRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_CATALOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_CATALOGRowDeleted" msprop:Generator_RowClassName="TBIDB_CATALOGRow" msprop:Generator_UserTableName="TBIDB_CATALOG" msprop:Generator_RowEvArgName="TBIDB_CATALOGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -965,7 +965,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_ATTRIBUTE_TYPE" msprop:Generator_TableClassName="TBWH_ATTRIBUTE_TYPEDataTable" msprop:Generator_TableVarName="tableTBWH_ATTRIBUTE_TYPE" msprop:Generator_RowChangedName="TBWH_ATTRIBUTE_TYPERowChanged" msprop:Generator_TablePropName="TBWH_ATTRIBUTE_TYPE" msprop:Generator_RowDeletingName="TBWH_ATTRIBUTE_TYPERowDeleting" msprop:Generator_RowChangingName="TBWH_ATTRIBUTE_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBWH_ATTRIBUTE_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_ATTRIBUTE_TYPERowDeleted" msprop:Generator_RowClassName="TBWH_ATTRIBUTE_TYPERow" msprop:Generator_UserTableName="TBWH_ATTRIBUTE_TYPE" msprop:Generator_RowEvArgName="TBWH_ATTRIBUTE_TYPERowChangeEvent">
+        <xs:element name="TBWH_ATTRIBUTE_TYPE" msprop:Generator_TableClassName="TBWH_ATTRIBUTE_TYPEDataTable" msprop:Generator_TableVarName="tableTBWH_ATTRIBUTE_TYPE" msprop:Generator_TablePropName="TBWH_ATTRIBUTE_TYPE" msprop:Generator_RowDeletingName="TBWH_ATTRIBUTE_TYPERowDeleting" msprop:Generator_RowChangingName="TBWH_ATTRIBUTE_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBWH_ATTRIBUTE_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_ATTRIBUTE_TYPERowDeleted" msprop:Generator_UserTableName="TBWH_ATTRIBUTE_TYPE" msprop:Generator_RowChangedName="TBWH_ATTRIBUTE_TYPERowChanged" msprop:Generator_RowEvArgName="TBWH_ATTRIBUTE_TYPERowChangeEvent" msprop:Generator_RowClassName="TBWH_ATTRIBUTE_TYPERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -979,7 +979,7 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWIDB_OBJECT_STORE" msprop:Generator_TableClassName="VWIDB_OBJECT_STOREDataTable" msprop:Generator_TableVarName="tableVWIDB_OBJECT_STORE" msprop:Generator_TablePropName="VWIDB_OBJECT_STORE" msprop:Generator_RowDeletingName="VWIDB_OBJECT_STORERowDeleting" msprop:Generator_RowChangingName="VWIDB_OBJECT_STORERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_OBJECT_STORERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_OBJECT_STORERowDeleted" msprop:Generator_UserTableName="VWIDB_OBJECT_STORE" msprop:Generator_RowChangedName="VWIDB_OBJECT_STORERowChanged" msprop:Generator_RowEvArgName="VWIDB_OBJECT_STORERowChangeEvent" msprop:Generator_RowClassName="VWIDB_OBJECT_STORERow">
+        <xs:element name="VWIDB_OBJECT_STORE" msprop:Generator_TableClassName="VWIDB_OBJECT_STOREDataTable" msprop:Generator_TableVarName="tableVWIDB_OBJECT_STORE" msprop:Generator_RowChangedName="VWIDB_OBJECT_STORERowChanged" msprop:Generator_TablePropName="VWIDB_OBJECT_STORE" msprop:Generator_RowDeletingName="VWIDB_OBJECT_STORERowDeleting" msprop:Generator_RowChangingName="VWIDB_OBJECT_STORERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_OBJECT_STORERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_OBJECT_STORERowDeleted" msprop:Generator_RowClassName="VWIDB_OBJECT_STORERow" msprop:Generator_UserTableName="VWIDB_OBJECT_STORE" msprop:Generator_RowEvArgName="VWIDB_OBJECT_STORERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1054,8 +1054,8 @@ FROM            TBIDB_ATTRIBUTE_TYPE</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TYP_ID" msdata:parent="TBIDB_ATTRIBUTE_TYPE" msdata:child="TBIDB_ATTRIBUTE" msdata:parentkey="GUID" msdata:childkey="TYP_ID" msprop:Generator_UserChildTable="TBIDB_ATTRIBUTE" msprop:Generator_ChildPropName="GetTBIDB_ATTRIBUTERows" msprop:Generator_UserRelationName="FK_TYP_ID" msprop:Generator_ParentPropName="TBIDB_ATTRIBUTE_TYPERow" msprop:Generator_RelationVarName="relationFK_TYP_ID" msprop:Generator_UserParentTable="TBIDB_ATTRIBUTE_TYPE" />
-      <msdata:Relationship name="FK_OS_CAT_ID" msdata:parent="TBIDB_CATALOG" msdata:child="TBIDB_OBJECT_STORE" msdata:parentkey="GUID" msdata:childkey="CAT_ID" msprop:Generator_UserChildTable="TBIDB_OBJECT_STORE" msprop:Generator_ChildPropName="GetTBIDB_OBJECT_STORERows" msprop:Generator_UserRelationName="FK_OS_CAT_ID" msprop:Generator_RelationVarName="relationFK_OS_CAT_ID" msprop:Generator_UserParentTable="TBIDB_CATALOG" msprop:Generator_ParentPropName="TBIDB_CATALOGRow" />
+      <msdata:Relationship name="FK_TYP_ID" msdata:parent="TBIDB_ATTRIBUTE_TYPE" msdata:child="TBIDB_ATTRIBUTE" msdata:parentkey="GUID" msdata:childkey="TYP_ID" msprop:Generator_UserChildTable="TBIDB_ATTRIBUTE" msprop:Generator_ChildPropName="GetTBIDB_ATTRIBUTERows" msprop:Generator_UserRelationName="FK_TYP_ID" msprop:Generator_RelationVarName="relationFK_TYP_ID" msprop:Generator_UserParentTable="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_ParentPropName="TBIDB_ATTRIBUTE_TYPERow" />
+      <msdata:Relationship name="FK_OS_CAT_ID" msdata:parent="TBIDB_CATALOG" msdata:child="TBIDB_OBJECT_STORE" msdata:parentkey="GUID" msdata:childkey="CAT_ID" msprop:Generator_UserChildTable="TBIDB_OBJECT_STORE" msprop:Generator_ChildPropName="GetTBIDB_OBJECT_STORERows" msprop:Generator_UserRelationName="FK_OS_CAT_ID" msprop:Generator_ParentPropName="TBIDB_CATALOGRow" msprop:Generator_RelationVarName="relationFK_OS_CAT_ID" msprop:Generator_UserParentTable="TBIDB_CATALOG" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file