This commit is contained in:
SchreiberM 2021-03-04 09:10:39 +01:00
parent 902add9d31
commit 838b1cb61e
8 changed files with 48 additions and 17 deletions

View File

@ -116,8 +116,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatClient", "ChatClient\Ch
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatControl", "Controls.ChatControl\ChatControl.vbproj", "{1F278760-4F6B-42E8-B82D-01D4C8618340}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatTest", "ChatTest\ChatTest.vbproj", "{4A726345-FD6B-4E1C-9E5D-18C9043D7714}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatNewConv", "Controls.ChatNewConv\ChatNewConv.vbproj", "{86D27FFA-480F-481D-8D23-26DEAE92FE6C}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ChatAddUser", "Controls.ChatAddUser\ChatAddUser.vbproj", "{F0A807CC-BE14-4B5B-9200-27C16156BD8A}"
@ -310,10 +308,6 @@ Global
{1F278760-4F6B-42E8-B82D-01D4C8618340}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F278760-4F6B-42E8-B82D-01D4C8618340}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F278760-4F6B-42E8-B82D-01D4C8618340}.Release|Any CPU.Build.0 = Release|Any CPU
{4A726345-FD6B-4E1C-9E5D-18C9043D7714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A726345-FD6B-4E1C-9E5D-18C9043D7714}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A726345-FD6B-4E1C-9E5D-18C9043D7714}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A726345-FD6B-4E1C-9E5D-18C9043D7714}.Release|Any CPU.Build.0 = Release|Any CPU
{86D27FFA-480F-481D-8D23-26DEAE92FE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{86D27FFA-480F-481D-8D23-26DEAE92FE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86D27FFA-480F-481D-8D23-26DEAE92FE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -376,7 +370,6 @@ Global
{C8F9C3DD-9328-49E3-8530-48E6A4C82CAF} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
{9713484C-6EE3-4D7E-B6E6-F32CF6B6BB6C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
{1F278760-4F6B-42E8-B82D-01D4C8618340} = {F98C0329-C004-417F-B2AB-7466E88D8220}
{4A726345-FD6B-4E1C-9E5D-18C9043D7714} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
{86D27FFA-480F-481D-8D23-26DEAE92FE6C} = {F98C0329-C004-417F-B2AB-7466E88D8220}
{F0A807CC-BE14-4B5B-9200-27C16156BD8A} = {F98C0329-C004-417F-B2AB-7466E88D8220}
{83795524-2512-4C04-BD57-4847230943A7} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}

View File

@ -1,7 +1,7 @@
Imports DigitalData.Modules.Logging
Public Class frmAdmin_CWProfile
Inherits frmAdmin_Base
'Inherits frmAdmin_Base
Implements frmAdmin_Interface
Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey

View File

@ -75,4 +75,9 @@ Public Class frmAdmin_IDBAttribute
Return False
End Try
End Function
Private Sub Update_Datasource()
Dim oupdate = $"UPDATE TBIDB_ATTRIBUTE
SET TITLE = '@TITLE', TYP_ID = @TYP_ID, MULTI_CONTEXT = @MULTI_CONTEXT, VIEW_SEQUENCE = @VIEW_SEQUENCE, VIEW_VISIBLE = @VIEW_VISIBLE, COMMENT = @COMMENT
WHERE (GUID = @GUID)"
End Sub
End Class

View File

@ -3507,6 +3507,19 @@ Namespace DSIDB_StammdatenTableAdapters
tableMapping.ColumnMappings.Add("DELETED_WHEN", "DELETED_WHEN")
tableMapping.ColumnMappings.Add("ATTR_TYPE", "ATTR_TYPE")
Me._adapter.TableMappings.Add(tableMapping)
Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
Me._adapter.InsertCommand.Connection = Me.Connection
Me._adapter.InsertCommand.CommandText = "INSERT INTO TBIDB_ATTRIBUTE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (TITLE, TYP_ID, MULTI_CONTE"& _
"XT, VIEW_SEQUENCE, VIEW_VISIBLE, COMMENT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@TITLE,@TYP"& _
"_ID,@MULTI_CONTEXT,@VIEW_SEQUENCE,@VIEW_VISIBLE,@COMMENT,@ADDED_WHO)"
Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYP_ID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "TYP_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MULTI_CONTEXT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "MULTI_CONTEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VIEW_SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "VIEW_SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VIEW_VISIBLE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VIEW_VISIBLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
Me._adapter.UpdateCommand.Connection = Me.Connection
Me._adapter.UpdateCommand.CommandText = "UPDATE TBIDB_ATTRIBUTE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET TITLE = @TITLE, TYP_ID = @TYP_ID"& _

View File

@ -77,6 +77,22 @@ SELECT GUID, PARENT_ENT_ID, TITLE, INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO, ADDE
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBIDB_ATTRIBUTETableAdapter" GeneratorDataComponentClassName="TBIDB_ATTRIBUTETableAdapter" Name="TBIDB_ATTRIBUTE" UserDataComponentName="TBIDB_ATTRIBUTETableAdapter">
<MainSource>
<DbSource ConnectionRef="IDBConnectionStringDEFAULT (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="false" UserGetMethodName="GetData" UserSourceName="Fill">
<InsertCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>INSERT INTO TBIDB_ATTRIBUTE
(TITLE, TYP_ID, MULTI_CONTEXT, VIEW_SEQUENCE, VIEW_VISIBLE, COMMENT, ADDED_WHO)
VALUES (@TITLE,@TYP_ID,@MULTI_CONTEXT,@VIEW_SEQUENCE,@VIEW_VISIBLE,@COMMENT,@ADDED_WHO)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="TITLE" ColumnName="TITLE" DataSourceName="IDB_TEST.dbo.TBIDB_ATTRIBUTE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TITLE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TITLE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="TYP_ID" ColumnName="TYP_ID" DataSourceName="IDB_TEST.dbo.TBIDB_ATTRIBUTE" DataTypeServer="tinyint" DbType="Byte" Direction="Input" ParameterName="@TYP_ID" Precision="0" ProviderType="TinyInt" Scale="0" Size="1" SourceColumn="TYP_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="MULTI_CONTEXT" ColumnName="MULTI_CONTEXT" DataSourceName="IDB_TEST.dbo.TBIDB_ATTRIBUTE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@MULTI_CONTEXT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="MULTI_CONTEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="VIEW_SEQUENCE" ColumnName="VIEW_SEQUENCE" DataSourceName="IDB_TEST.dbo.TBIDB_ATTRIBUTE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@VIEW_SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="VIEW_SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="VIEW_VISIBLE" ColumnName="VIEW_VISIBLE" DataSourceName="IDB_TEST.dbo.TBIDB_ATTRIBUTE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VIEW_VISIBLE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VIEW_VISIBLE" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="IDB_TEST.dbo.TBIDB_ATTRIBUTE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="IDB_TEST.dbo.TBIDB_ATTRIBUTE" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT TBIDB_ATTRIBUTE.GUID, TBIDB_ATTRIBUTE.TITLE, TBIDB_ATTRIBUTE.TYP_ID, TBIDB_ATTRIBUTE.MULTI_CONTEXT, TBIDB_ATTRIBUTE.VIEW_SEQUENCE, TBIDB_ATTRIBUTE.VIEW_VISIBLE, TBIDB_ATTRIBUTE.COMMENT,
@ -326,7 +342,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE
<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_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: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: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" />
@ -365,7 +381,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE
</xs:sequence>
</xs:complexType>
</xs:element>
<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: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: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" />
@ -422,7 +438,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE
</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_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: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: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" />
@ -463,7 +479,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE
</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" />
@ -535,7 +551,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE
</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_RelationVarName="relationFK_TYP_ID" msprop:Generator_UserParentTable="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_ParentPropName="TBIDB_ATTRIBUTE_TYPERow" />
<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" />
</xs:appinfo>
</xs:annotation>
</xs:schema>

View File

@ -2,7 +2,7 @@
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.ZooFlow
Imports ZooFlow.State
Namespace My
''' <summary>

View File

@ -42,8 +42,8 @@ Public Class frmFlowSearch
Try
RibbonControl1.Minimized = True
TileControlMatch.Groups.Clear()
Dim oDTCategory As DataTable = ASorDB.GetDatatable("IDB", $"SELECT 'NONE' as CATEGORY", "VWAPPSERV_CATEGORIES", "", "CATEGORY")
Dim oSQL = "select DISTINCT TERM_VALUE AS CATEGORY ,ATTRIBUTE_ID from VWIDB_CATEGORIES_PER_OBJECT_AND_LANGUAGE WHERE LANGUAGE_ID = @LANGUAGE_ID ORDER BY TERM_VALUE"
Dim oDTCategory As DataTable = ASorDB.GetDatatable("IDB", $"SELECT 'NONE' as CATEGORY", "VWIDB_CATEGORIES_PER_OBJECT_AND_LANGUAGE", "", "CATEGORY")
If Not IsNothing(oDTCategory) Then
CheckedListBoxCategories.DataSource = oDTCategory
CheckedListBoxCategories.DisplayMember = "CATEGORY"
@ -112,6 +112,10 @@ Public Class frmFlowSearch
oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
oSQL = oSQL.Replace("--INNER JOIN VWIDB_GROUP_DATA_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE")
End If
If CATEGORIES_SELECTED <> String.Empty Then
oSQL = oSQL.Replace("--AND ATTR.TITLE IN ('')", $"AND ATTR.TITLE IN ({CATEGORIES_SELECTED})")
End If
Dim oResultCountAttributes As Integer = 0
TileControlMatch.Groups.Clear()

View File

@ -996,7 +996,7 @@ Public Class frmFlowForm
Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles TestToolStripMenuItem.Click
frmtest.Show()
End Sub
End Class