diff --git a/app/DD-Record-Organizer/App.config b/app/DD-Record-Organizer/App.config index 4cff579..5eaa86f 100644 --- a/app/DD-Record-Organizer/App.config +++ b/app/DD-Record-Organizer/App.config @@ -10,7 +10,7 @@ diff --git a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj index 3d69511..5702d8b 100644 --- a/app/DD-Record-Organizer/DD-Record-Organizer.vbproj +++ b/app/DD-Record-Organizer/DD-Record-Organizer.vbproj @@ -215,7 +215,9 @@ True - + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll + diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.Designer.vb b/app/DD-Record-Organizer/DD_DMSDataSet.Designer.vb index 8a6e303..806093e 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.Designer.vb +++ b/app/DD-Record-Organizer/DD_DMSDataSet.Designer.vb @@ -20658,13 +20658,16 @@ Partial Public Class DD_DMSDataSet Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true Me.columnENTITY_ID.AllowDBNull = false + Me.columnENTITY_ID.DefaultValue = CType(0,Integer) Me.columnTYPE_NODE.AllowDBNull = false + Me.columnTYPE_NODE.DefaultValue = CType(0,Short) Me.columnCREATE_RECORD.AllowDBNull = false Me.columnCREATE_RECORD.DefaultValue = CType(false,Boolean) Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 50 Me.columnCHANGED_WHO.MaxLength = 50 Me.columnNAME.AllowDBNull = false + Me.columnNAME.DefaultValue = CType("",String) Me.columnNAME.MaxLength = 50 Me.columnCOMMENT.MaxLength = 200 Me.columnPARENT_NODE.AllowDBNull = false @@ -51882,16 +51885,28 @@ Namespace DD_DMSDataSetTableAdapters "UID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPMO_STRUCTURE_NODES_CONFIGURATION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (NAME, "& _ + "ENTITY_ID, TYPE_NODE, CREATE_RECORD, COMMENT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@"& _ + "ENTITY_ID,@TYPE_NODE,@CREATE_RECORD,@COMMENT,@ADDED_WHO)" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_NODE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_NODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CREATE_RECORD", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "CREATE_RECORD", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 300, 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, 50, 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 TBPMO_STRUCTURE_NODES_CONFIGURATION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET ENTITY_ID = "& _ "@ENTITY_ID, TYPE_NODE = @TYPE_NODE, NODE_IMAGE = @NODE_IMAGE, CREATE_RECORD = @C"& _ "REATE_RECORD, CHANGED_WHO = @CHANGED_WHO, NAME = @NAME, COMMENT = @COMMENT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " PARENT_NODE = @PARENT_NODE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Origina"& _ - "l_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_W"& _ - "HO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, COMMENT, PARENT_NODE FROM TBPMO"& _ - "_STRUCTURE_NODES_CONFIGURATION WHERE (GUID = @GUID) ORDER BY ENTITY_ID, TYPE_NOD"& _ - "E" + "l_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_"& _ + "WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, COMMENT, PARENT_NODE FROM TBPM"& _ + "O_STRUCTURE_NODES_CONFIGURATION WHERE (GUID = @GUID) ORDER BY ENTITY_ID, TYPE_NO"& _ + "DE" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_NODE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_NODE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -52035,6 +52050,44 @@ Namespace DD_DMSDataSetTableAdapters End Try End Function + _ + Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal ENTITY_ID As Integer, ByVal TYPE_NODE As Short, ByVal CREATE_RECORD As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer + If (NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("NAME") + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(NAME,String) + End If + Me.Adapter.InsertCommand.Parameters(1).Value = CType(ENTITY_ID,Integer) + Me.Adapter.InsertCommand.Parameters(2).Value = CType(TYPE_NODE,Short) + Me.Adapter.InsertCommand.Parameters(3).Value = CType(CREATE_RECORD,Boolean) + If (COMMENT Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(4).Value = CType(COMMENT,String) + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHO,String) + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + + + INSERT INTO TBPMO_STRUCTURE_NODES_CONFIGURATION + (NAME, ENTITY_ID, TYPE_NODE, CREATE_RECORD, COMMENT, ADDED_WHO) +VALUES (@NAME,@ENTITY_ID,@TYPE_NODE,@CREATE_RECORD,@COMMENT,@ADDED_WHO) + + + + + + + + + + SELECT GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, COMMENT, PARENT_NODE @@ -3150,19 +3165,19 @@ ORDER BY ENTITY_ID, TYPE_NODE UPDATE TBPMO_STRUCTURE_NODES_CONFIGURATION SET ENTITY_ID = @ENTITY_ID, TYPE_NODE = @TYPE_NODE, NODE_IMAGE = @NODE_IMAGE, CREATE_RECORD = @CREATE_RECORD, CHANGED_WHO = @CHANGED_WHO, NAME = @NAME, COMMENT = @COMMENT, PARENT_NODE = @PARENT_NODE -WHERE (GUID = @Original_GUID); +WHERE (GUID = @Original_GUID); SELECT GUID, ENTITY_ID, TYPE_NODE, NODE_IMAGE, CREATE_RECORD, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, NAME, COMMENT, PARENT_NODE FROM TBPMO_STRUCTURE_NODES_CONFIGURATION WHERE (GUID = @GUID) ORDER BY ENTITY_ID, TYPE_NODE - - - - - - - - - - + + + + + + + + + + @@ -3553,7 +3568,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3594,7 +3609,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3672,7 +3687,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3767,7 +3782,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3790,7 +3805,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3835,7 +3850,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3873,7 +3888,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3908,7 +3923,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3952,7 +3967,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -3973,7 +3988,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4010,7 +4025,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4055,7 +4070,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4122,7 +4137,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4159,7 +4174,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4215,7 +4230,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4254,7 +4269,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4378,7 +4393,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4475,7 +4490,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4505,7 +4520,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4542,7 +4557,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4579,7 +4594,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4611,7 +4626,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4631,7 +4646,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4677,7 +4692,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4721,7 +4736,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4878,7 +4893,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4903,7 +4918,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4938,7 +4953,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -4967,7 +4982,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5027,7 +5042,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5100,7 +5115,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5165,7 +5180,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5259,7 +5274,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5298,7 +5313,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5316,7 +5331,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5362,7 +5377,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5376,7 +5391,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5428,7 +5443,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5472,7 +5487,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5504,7 +5519,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5586,7 +5601,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5638,7 +5653,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5729,7 +5744,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5760,7 +5775,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5798,12 +5813,12 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + - - + + @@ -5822,7 +5837,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5840,7 +5855,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5854,7 +5869,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5883,7 +5898,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5921,7 +5936,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5939,7 +5954,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -5977,7 +5992,7 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - + @@ -6228,27 +6243,27 @@ SELECT UniqueID, Type, StartDate, EndDate, AllDay, Subject, Location, Descriptio - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/DD_DMSDataSet.xss b/app/DD-Record-Organizer/DD_DMSDataSet.xss index e4ba13f..9f68694 100644 --- a/app/DD-Record-Organizer/DD_DMSDataSet.xss +++ b/app/DD-Record-Organizer/DD_DMSDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/app/DD-Record-Organizer/My Project/Settings.Designer.vb b/app/DD-Record-Organizer/My Project/Settings.Designer.vb index 2b924e1..3110a62 100644 --- a/app/DD-Record-Organizer/My Project/Settings.Designer.vb +++ b/app/DD-Record-Organizer/My Project/Settings.Designer.vb @@ -57,8 +57,8 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True"& _ + ";User ID=sa;Password=dd")> _ Public ReadOnly Property DD_DMSConnectionString() As String Get Return CType(Me("DD_DMSConnectionString"),String) diff --git a/app/DD-Record-Organizer/My Project/Settings.Settings b/app/DD-Record-Organizer/My Project/Settings.Settings index f9f8688..d502010 100644 --- a/app/DD-Record-Organizer/My Project/Settings.Settings +++ b/app/DD-Record-Organizer/My Project/Settings.Settings @@ -5,10 +5,10 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=ddd</ConnectionString> + <ConnectionString>Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=ddd + Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd *.db diff --git a/app/DD-Record-Organizer/frmGlobalSearch.vb b/app/DD-Record-Organizer/frmGlobalSearch.vb index 2be228d..8bb67a1 100644 --- a/app/DD-Record-Organizer/frmGlobalSearch.vb +++ b/app/DD-Record-Organizer/frmGlobalSearch.vb @@ -77,8 +77,12 @@ Public Class frmGlobalSearch End If End Sub Sub PREPARE_FT_SQL() + Dim oFTSearchtext = txtSearch.Text + If oFTSearchtext.Contains(" ") Then + oFTSearchtext = oFTSearchtext.Replace(" ", "%") + End If Dim sqlft = SQL_FULLTEXT - sqlft = sqlft.Replace("@FULLTEXT", txtSearch.Text) + sqlft = sqlft.Replace("@FULLTEXT", oFTSearchtext) 'Dim selDoc = String.Format("SELECT T.[DocID],T.[FULL_FILENAME],T.[Filename],T.[DISPLAY_NAME],T.[Doctype],T.[Creation_DateTime] As CreatedWhen,T.[Change_DateTime] as ChangedWhen,T.[IN_WORK] as [InWork?] " & ' "FROM VWPMO_DOC_SEARCH T INNER JOIN ( " & vbNewLine & ' "{0}) Y ON T.DocID = Y.dwDocID " & vbNewLine & diff --git a/app/DD-Record-Organizer/frmStructureNodeConfig.Designer.vb b/app/DD-Record-Organizer/frmStructureNodeConfig.Designer.vb index cf67946..d78ab01 100644 --- a/app/DD-Record-Organizer/frmStructureNodeConfig.Designer.vb +++ b/app/DD-Record-Organizer/frmStructureNodeConfig.Designer.vb @@ -57,7 +57,7 @@ Partial Class frmStructureNodeConfig Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() Me.lblSave = New System.Windows.Forms.Label() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.GroupBoxNodeIcon = New System.Windows.Forms.GroupBox() Me.btnResetBackground = New System.Windows.Forms.Button() Me.btnSelectBackground = New System.Windows.Forms.Button() Me.pbBackground = New System.Windows.Forms.PictureBox() @@ -71,8 +71,8 @@ Partial Class frmStructureNodeConfig Me.TableAdapterManager = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TBWH_ENTITYTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBWH_ENTITYTableAdapter() Me.cmbEntity = New System.Windows.Forms.ComboBox() - Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin() Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin() Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter() Me.TableAdapterManager1 = New DD_Record_Organizer.DD_ECMAdminTableAdapters.TableAdapterManager() GUIDLabel = New System.Windows.Forms.Label() @@ -90,11 +90,11 @@ Partial Class frmStructureNodeConfig CType(Me.TBPMO_STRUCTURE_NODES_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TYPE_NODENumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() - Me.GroupBox3.SuspendLayout() + Me.GroupBoxNodeIcon.SuspendLayout() CType(Me.pbBackground, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWH_ENTITYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GUIDLabel @@ -121,7 +121,7 @@ Partial Class frmStructureNodeConfig TYPE_NODELabel.AutoSize = True TYPE_NODELabel.Location = New System.Drawing.Point(656, 135) TYPE_NODELabel.Name = "TYPE_NODELabel" - TYPE_NODELabel.Size = New System.Drawing.Size(92, 13) + TYPE_NODELabel.Size = New System.Drawing.Size(93, 13) TYPE_NODELabel.TabIndex = 5 TYPE_NODELabel.Text = "Node Type/Level:" ' @@ -273,6 +273,7 @@ Partial Class frmStructureNodeConfig ' Me.BindingNavigatorPositionItem.AccessibleName = "Position" Me.BindingNavigatorPositionItem.AutoSize = False + Me.BindingNavigatorPositionItem.Font = New System.Drawing.Font("Segoe UI", 9.0!) Me.BindingNavigatorPositionItem.Name = "BindingNavigatorPositionItem" Me.BindingNavigatorPositionItem.Size = New System.Drawing.Size(50, 23) Me.BindingNavigatorPositionItem.Text = "0" @@ -405,17 +406,17 @@ Partial Class frmStructureNodeConfig Me.lblSave.TabIndex = 45 Me.lblSave.Text = "Successfully saved" ' - 'GroupBox3 + 'GroupBoxNodeIcon ' - Me.GroupBox3.Controls.Add(Me.btnResetBackground) - Me.GroupBox3.Controls.Add(Me.btnSelectBackground) - Me.GroupBox3.Controls.Add(Me.pbBackground) - Me.GroupBox3.Location = New System.Drawing.Point(401, 179) - Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(248, 78) - Me.GroupBox3.TabIndex = 82 - Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "Node Icon" + Me.GroupBoxNodeIcon.Controls.Add(Me.btnResetBackground) + Me.GroupBoxNodeIcon.Controls.Add(Me.btnSelectBackground) + Me.GroupBoxNodeIcon.Controls.Add(Me.pbBackground) + Me.GroupBoxNodeIcon.Location = New System.Drawing.Point(401, 179) + Me.GroupBoxNodeIcon.Name = "GroupBoxNodeIcon" + Me.GroupBoxNodeIcon.Size = New System.Drawing.Size(248, 78) + Me.GroupBoxNodeIcon.TabIndex = 82 + Me.GroupBoxNodeIcon.TabStop = False + Me.GroupBoxNodeIcon.Text = "Node Icon" ' 'btnResetBackground ' @@ -553,16 +554,16 @@ Partial Class frmStructureNodeConfig Me.cmbEntity.TabIndex = 92 Me.cmbEntity.ValueMember = "GUID" ' - 'DD_ECMAdmin - ' - Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" - Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'TBPMO_FORM_CONSTRUCTORBindingSource ' Me.TBPMO_FORM_CONSTRUCTORBindingSource.DataMember = "TBPMO_FORM_CONSTRUCTOR" Me.TBPMO_FORM_CONSTRUCTORBindingSource.DataSource = Me.DD_ECMAdmin ' + 'DD_ECMAdmin + ' + Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" + Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' 'TBPMO_FORM_CONSTRUCTORTableAdapter ' Me.TBPMO_FORM_CONSTRUCTORTableAdapter.ClearBeforeFill = True @@ -571,6 +572,7 @@ Partial Class frmStructureNodeConfig ' Me.TableAdapterManager1.BackupDataSetBeforeUpdate = False Me.TableAdapterManager1.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager1.TBDD_GROUPSTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing @@ -592,7 +594,7 @@ Partial Class frmStructureNodeConfig Me.Controls.Add(NAMELabel) Me.Controls.Add(Me.NAMETextBox) Me.Controls.Add(Me.ComboBox1) - Me.Controls.Add(Me.GroupBox3) + Me.Controls.Add(Me.GroupBoxNodeIcon) Me.Controls.Add(Me.lblSave) Me.Controls.Add(GUIDLabel) Me.Controls.Add(Me.GUIDTextBox) @@ -621,11 +623,11 @@ Partial Class frmStructureNodeConfig CType(Me.TBPMO_STRUCTURE_NODES_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TYPE_NODENumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() - Me.GroupBox3.ResumeLayout(False) + Me.GroupBoxNodeIcon.ResumeLayout(False) CType(Me.pbBackground, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBWH_ENTITYBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -655,7 +657,7 @@ Partial Class frmStructureNodeConfig Friend WithEvents CHANGED_WHOTextBox As System.Windows.Forms.TextBox Friend WithEvents CHANGED_WHENTextBox As System.Windows.Forms.TextBox Friend WithEvents lblSave As System.Windows.Forms.Label - Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox + Friend WithEvents GroupBoxNodeIcon As System.Windows.Forms.GroupBox Friend WithEvents btnResetBackground As System.Windows.Forms.Button Friend WithEvents btnSelectBackground As System.Windows.Forms.Button Friend WithEvents pbBackground As System.Windows.Forms.PictureBox diff --git a/app/DD-Record-Organizer/frmStructureNodeConfig.resx b/app/DD-Record-Organizer/frmStructureNodeConfig.resx index 211c9de..7e01c8a 100644 --- a/app/DD-Record-Organizer/frmStructureNodeConfig.resx +++ b/app/DD-Record-Organizer/frmStructureNodeConfig.resx @@ -228,18 +228,12 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - 17, 17 - 422, 56 564, 56 - - 564, 56 - 548, 17 diff --git a/app/DD-Record-Organizer/frmStructureNodeConfig.vb b/app/DD-Record-Organizer/frmStructureNodeConfig.vb index f323bcb..4d25b49 100644 --- a/app/DD-Record-Organizer/frmStructureNodeConfig.vb +++ b/app/DD-Record-Organizer/frmStructureNodeConfig.vb @@ -306,6 +306,7 @@ TBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter.Update(DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATION) lblSave.Text = "Successfully saved - " & Now lblSave.Visible = True + GroupBoxNodeIcon.Enabled = True Else lblSave.Visible = False End If @@ -420,7 +421,20 @@ Private Sub cmbEntity_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbEntity.SelectedIndexChanged If cmbEntity.SelectedIndex <> -1 Then Me.TBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATION, cmbEntity.SelectedValue) - Load_TreeView() + If DD_DMSDataSet.TBPMO_STRUCTURE_NODES_CONFIGURATION.Rows.Count > 0 Then + Load_TreeView() + End If + End If End Sub + + Private Sub BindingNavigatorAddNewItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorAddNewItem.Click + Try + TBPMO_STRUCTURE_NODES_CONFIGURATIONBindingSource.AddNew() + GroupBoxNodeIcon.Enabled = False + Catch ex As Exception + MsgBox("Error in AddNode:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + + End Sub End Class \ No newline at end of file