From 838b1cb61ee595f5368a320291a866e4b8bbc0fd Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 4 Mar 2021 09:10:39 +0100 Subject: [PATCH] MS --- DDMonorepo.sln | 7 ----- .../Administration/frmAdmin_CWProfile.vb | 2 +- .../Administration/frmAdmin_IDBAttribute.vb | 5 ++++ GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb | 13 ++++++++++ GUIs.ZooFlow/DSIDB_Stammdaten.xsd | 26 +++++++++++++++---- GUIs.ZooFlow/MyApplication.vb | 2 +- GUIs.ZooFlow/Search/frmFlowSearch.vb | 8 ++++-- GUIs.ZooFlow/frmFlowForm.vb | 2 +- 8 files changed, 48 insertions(+), 17 deletions(-) diff --git a/DDMonorepo.sln b/DDMonorepo.sln index d7acf4ca..5953a56e 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -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} diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb index f44eb2ab..536fb035 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.vb @@ -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 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb index f82a07c4..a8306054 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb @@ -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 \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index b892417e..73bf1ba1 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -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"& _ diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 967d3582..54f60364 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -77,6 +77,22 @@ SELECT GUID, PARENT_ENT_ID, TITLE, INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO, ADDE + + + 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) + + + + + + + + + + + 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 - + @@ -365,7 +381,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE - + @@ -422,7 +438,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE - + @@ -463,7 +479,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE - + @@ -535,7 +551,7 @@ SELECT GUID, ENTITY_TITLE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHE - + \ No newline at end of file diff --git a/GUIs.ZooFlow/MyApplication.vb b/GUIs.ZooFlow/MyApplication.vb index 772a1274..f7892be2 100644 --- a/GUIs.ZooFlow/MyApplication.vb +++ b/GUIs.ZooFlow/MyApplication.vb @@ -2,7 +2,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Database Imports DigitalData.Modules.ZooFlow -Imports ZooFlow.State + Namespace My ''' diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb index 79400573..97c291df 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb @@ -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() diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 121655d5..d29da9ac 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -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