diff --git a/GUIs.ZooFlow/Administration/ClassDetailForm.vb b/GUIs.ZooFlow/Administration/ClassDetailForm.vb index 44595a9a..994a30d6 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -148,7 +148,6 @@ Public Class ClassDetailForm Public Property Entity As String Public Property Scope As String Public Property PrimaryKey As String - Public Property ForeignKey As String Public Property SQLCommand As String Public Property SQLResult As DataTable End Class diff --git a/GUIs.ZooFlow/Administration/ClassDetailPage.vb b/GUIs.ZooFlow/Administration/ClassDetailPage.vb index f7c316fa..aab3eb75 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailPage.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailPage.vb @@ -39,18 +39,18 @@ Public Class ClassDetailPages End Class Public Class DetailPage - Public IsPrimary As Boolean = False - Public IsInsert As Boolean = False - Public TabPage As XtraTabPage - Public Name As String + Public Property IsPrimary As Boolean = False + Public Property IsInsert As Boolean = False + Public Property TabPage As XtraTabPage + Public Property Name As String - Public BindingSource As BindingSource + Public Property BindingSource As BindingSource - Public DataTable As DataTable + Public Property DataTable As DataTable - Public AddedWhoEdit As TextEdit + Public Property AddedWhoEdit As TextEdit - Public ChangedWhoEdit As TextEdit + Public Property ChangedWhoEdit As TextEdit End Class ''' @@ -100,7 +100,11 @@ Public Class ClassDetailPages ''' Add a new DetailPage or a new PrimaryPage ''' Public Sub Add(Page As DetailPage) - Items.Add(Page.TabPage.Name, Page) + If Page.TabPage Is Nothing Then + Items.Add("Primary", Page) + Else + Items.Add(Page.TabPage.Name, Page) + End If AddHandler Page.BindingSource.AddingNew, Sub(sender As Object, e As EventArgs) RaiseChangedEvents = False diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb index 565dd2a9..a96685a2 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb @@ -73,10 +73,6 @@ Public Class frmAdmin_Globix End Try End Function - Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click - - End Sub - Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData Throw New NotImplementedException() End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 769daec3..b332d2b9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -139,7 +139,7 @@ Partial Class frmAdmin_Start Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1077, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1077, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -381,10 +381,10 @@ Partial Class frmAdmin_Start ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 652) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 654) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 22) ' 'RibbonPage2 ' @@ -406,9 +406,9 @@ Partial Class frmAdmin_Start Me.TreeListMenu.AppendNode(New Object() {"IDB"}, -1, "") Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") Me.TreeListMenu.AppendNode(New Object() {"Business Entities"}, 0, 1, 1, -1, "IDB_BUSINESS_ENTITIES") - Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, "") + Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, 6, 6, -1, "") Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 3, 4, 4, -1, "GLOBIX_PROFILES") - Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, "") + Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, 7, 7, -1, "") Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 5, 4, 4, -1, "CW_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1) Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 7, 3, 3, -1, "META_SOURCE_SQL") @@ -419,7 +419,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.OptionsView.ShowIndicator = False Me.TreeListMenu.OptionsView.ShowVertLines = False Me.TreeListMenu.SelectImageList = Me.MainTreeImages - Me.TreeListMenu.Size = New System.Drawing.Size(193, 465) + Me.TreeListMenu.Size = New System.Drawing.Size(193, 446) Me.TreeListMenu.TabIndex = 8 ' 'TreeListColumn1 @@ -438,6 +438,8 @@ Partial Class frmAdmin_Start Me.MainTreeImages.Add("managedatasource", "image://svgimages/spreadsheet/managedatasource.svg") Me.MainTreeImages.Add("grandtotals", "image://svgimages/dashboards/grandtotals.svg") Me.MainTreeImages.Add("allowuserstoeditranges", "image://svgimages/spreadsheet/allowuserstoeditranges.svg") + Me.MainTreeImages.Add("ZooFlow_G_DevExpress", "ZooFlow_G_DevExpress", GetType(DigitalData.GUIs.ZooFlow.My.Resources.Resources)) + Me.MainTreeImages.Add("ZooFlow_CW_DevExpress", "ZooFlow_CW_DevExpress", GetType(DigitalData.GUIs.ZooFlow.My.Resources.Resources)) ' 'DockManager1 ' @@ -450,18 +452,18 @@ Partial Class frmAdmin_Start Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799") - Me.DockPanel1.Location = New System.Drawing.Point(0, 158) + Me.DockPanel1.Location = New System.Drawing.Point(0, 159) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(200, 494) + Me.DockPanel1.Size = New System.Drawing.Size(200, 495) Me.DockPanel1.Text = "Übersicht" ' 'DockPanel1_Container ' Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu) - Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26) + Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 465) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 446) Me.DockPanel1_Container.TabIndex = 0 ' 'TBIDB_ATTRIBUTEBindingSource @@ -511,7 +513,7 @@ Partial Class frmAdmin_Start ' Me.Panel1.Controls.Add(Me.labelTitle) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(200, 158) + Me.Panel1.Location = New System.Drawing.Point(200, 159) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(877, 40) Me.Panel1.TabIndex = 8 @@ -714,11 +716,11 @@ Partial Class frmAdmin_Start 'GridControl1 ' Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl1.Location = New System.Drawing.Point(200, 198) + Me.GridControl1.Location = New System.Drawing.Point(200, 199) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(877, 454) + Me.GridControl1.Size = New System.Drawing.Size(877, 455) Me.GridControl1.TabIndex = 12 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index f24de442..517b2b0c 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -32,6 +32,8 @@ Public Class frmAdmin_Start End Sub Private Function Handle_LoadPage(Page As String) As Boolean + Dim oKey = $"{Page}-OVERVIEW" + If DetailForm.DetailSettingsList.ContainsKey(Page) Then Dim oNode = DetailForm.DetailSettingsList.Item(Page) CurrentModule = oNode.Module @@ -43,8 +45,11 @@ Public Class frmAdmin_Start Return False End If - If DetailForm.DetailDataList.ContainsKey(Page) Then - Dim oItem = DetailForm.DetailDataList.Item(Page) + ' This dictionary can contain the same entity multiple times to save + ' OVERVIEW, INSERT, UPDATE, etc. data records, so we specifically look for the overview key + If DetailForm.DetailDataList.ContainsKey(oKey) Then + + Dim oItem = DetailForm.DetailDataList.Item(oKey) Load_GridData(oItem) CurrentItem = oItem Else @@ -68,8 +73,7 @@ Public Class frmAdmin_Start .Entity = oRow.Item("ENTITY_TITLE").ToString, .Scope = oRow.Item("SCOPE").ToString, .SQLCommand = oRow.Item("SQL_COMMAND").ToString, - .PrimaryKey = NotNull(oRow.Item("PK_COLUMN"), String.Empty), - .ForeignKey = NotNull(oRow.Item("FK_COLUMN"), String.Empty) + .PrimaryKey = NotNull(oRow.Item("PK_COLUMN"), String.Empty) } Try @@ -79,12 +83,13 @@ Public Class frmAdmin_Start Logger.Error(ex) End Try - DetailForm.DetailDataList.Add(oItem.Entity, oItem) + Dim oKey As String = oItem.Entity & "-" & oItem.Scope + DetailForm.DetailDataList.Add(oKey, oItem) Next Return True Catch ex As Exception - Logger.Error(ex) + ShowErrorMessage(ex) Return False End Try End Function diff --git a/GUIs.ZooFlow/App.config b/GUIs.ZooFlow/App.config index 4668eed0..e90365a3 100644 --- a/GUIs.ZooFlow/App.config +++ b/GUIs.ZooFlow/App.config @@ -10,9 +10,17 @@ - - - + + + + diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb b/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb index 0e36e85a..7d5ad4d0 100644 --- a/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb @@ -3401,7 +3401,7 @@ Namespace DBCW_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub - + - + DELETE FROM [dbo].[TBCW_PROFILES] WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([REGEX_EXPRESSION] = @Original_REGEX_EXPRESSION) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([ACTIVE] = @Original_ACTIVE) AND ([PROFILE_TYPE] = @Original_PROFILE_TYPE)) @@ -52,7 +52,7 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, PROFILE_TYPE FROM dbo.TBCW_PROFILES WHERE GUID = @GUID - + @@ -84,7 +84,7 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO - + @@ -106,7 +106,7 @@ SELECT GUID, NAME, COMMENT, REGEX_EXPRESSION, ADDED_WHO, ADDED_WHEN, CHANGED_WHO - + DELETE FROM [TBCW_PROF_DOC_SEARCH] WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX] = @Original_TAB_INDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @Original_TAB_TITLE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))) @@ -151,7 +151,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD SELECT TBCW_PROF_DOC_SEARCH.* FROM TBCW_PROF_DOC_SEARCH WHERE PROFILE_ID = @PROFILE_ID - + @@ -184,7 +184,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + @@ -208,7 +208,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + DELETE FROM [TBCW_PROF_DATA_SEARCH] WHERE (([GUID] = @Original_GUID) AND ([PROFILE_ID] = @Original_PROFILE_ID) AND ([CONN_ID] = @Original_CONN_ID) AND ([TAB_INDEX] = @Original_TAB_INDEX) AND ([ACTIVE] = @Original_ACTIVE) AND ([TAB_TITLE] = @Original_TAB_TITLE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))) @@ -254,7 +254,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD FROM TBCW_PROF_DATA_SEARCH WHERE (PROFILE_ID = @PROFILE_ID) - + @@ -287,7 +287,7 @@ SELECT GUID, PROFILE_ID, CONN_ID, SQL_COMMAND, TAB_INDEX, ACTIVE, TAB_TITLE, ADD - + diff --git a/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb index b6cab462..de110aad 100644 --- a/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb @@ -1331,7 +1331,7 @@ Namespace DSDD_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub - + - + DELETE FROM [TBDD_CONNECTION] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_BEZEICHNUNG = 1 AND [BEZEICHNUNG] IS NULL) OR ([BEZEICHNUNG] = @Original_BEZEICHNUNG)) AND ((@IsNull_SQL_PROVIDER = 1 AND [SQL_PROVIDER] IS NULL) OR ([SQL_PROVIDER] = @Original_SQL_PROVIDER)) AND ((@IsNull_SERVER = 1 AND [SERVER] IS NULL) OR ([SERVER] = @Original_SERVER)) AND ((@IsNull_DATENBANK = 1 AND [DATENBANK] IS NULL) OR ([DATENBANK] = @Original_DATENBANK)) AND ((@IsNull_USERNAME = 1 AND [USERNAME] IS NULL) OR ([USERNAME] = @Original_USERNAME)) AND ((@IsNull_PASSWORD = 1 AND [PASSWORD] IS NULL) OR ([PASSWORD] = @Original_PASSWORD)) AND ((@IsNull_BEMERKUNG = 1 AND [BEMERKUNG] IS NULL) OR ([BEMERKUNG] = @Original_BEMERKUNG)) AND ([AKTIV] = @Original_AKTIV) AND ([ERSTELLTWER] = @Original_ERSTELLTWER) AND ((@IsNull_ERSTELLTWANN = 1 AND [ERSTELLTWANN] IS NULL) OR ([ERSTELLTWANN] = @Original_ERSTELLTWANN)) AND ((@IsNull_GEANDERTWER = 1 AND [GEANDERTWER] IS NULL) OR ([GEANDERTWER] = @Original_GEANDERTWER)) AND ((@IsNull_GEAENDERTWANN = 1 AND [GEAENDERTWANN] IS NULL) OR ([GEAENDERTWANN] = @Original_GEAENDERTWANN)) AND ([SYS_CONNECTION] = @Original_SYS_CONNECTION)) @@ -77,21 +77,21 @@ SET BEZEICHNUNG = @BEZEICHNUNG, SQL_PROVIDER = @SQL_PROVIDER, SER WHERE (GUID = @Original_GUID); SELECT GUID, BEZEICHNUNG, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, BEMERKUNG, AKTIV, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, SYS_CONNECTION FROM TBDD_CONNECTION WHERE (GUID = @GUID) - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index c6c16572..3cc988e4 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -5415,7 +5415,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub - + @@ -284,13 +284,13 @@ FROM VWIDB_BE_ATTRIBUTE WHERE ATTR_ID = @ATTRIBUTE_ID AND LANG_ID = @ - + DELETE FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = @Original_GUID) - + @@ -318,7 +318,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD SELECT TBZF_ADMIN_SOURCE_SQL.* FROM TBZF_ADMIN_SOURCE_SQL WHERE GUID = @GUID - + @@ -355,7 +355,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + diff --git a/GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb b/GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb index fad7ca74..a9960775 100644 --- a/GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb +++ b/GUIs.ZooFlow/Globix/GlobixDataset.Designer.vb @@ -3656,7 +3656,7 @@ Namespace GlobixDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub - + - + DELETE FROM TBDD_DOKUMENTART @@ -49,7 +49,7 @@ SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHR FROM TBDD_DOKUMENTART WHERE (GUID = @GUID) - + @@ -103,7 +103,7 @@ SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHR - + SELECT TBDD_DOKUMENTART.GUID, TBDD_DOKUMENTART.BEZEICHNUNG, TBDD_DOKUMENTART.OBJEKTTYP, TBDD_DOKUMENTART.EINGANGSART_ID, TBDD_DOKUMENTART.KURZNAME, TBDD_DOKUMENTART.ZIEL_PFAD, @@ -123,13 +123,13 @@ ORDER BY TBDD_DOKUMENTART.BEZEICHNUNG - + DELETE FROM TBDD_INDEX_MAN WHERE (GUID = @Original_GUID) - + @@ -141,24 +141,24 @@ WHERE (GUID = @Original_GUID) VALUES (@DOK_ID,@NAME,@WD_INDEX,@COMMENT,@DATATYPE,@SUGGESTION,@DEFAULT_VALUE,@CONNECTION_ID,@SEQUENCE,@SQL_RESULT,@SQL_CHECK,@OPTIONAL,@SAVE_VALUE,@ACTIVE,@ADDED_WHO,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES); SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, OPTIONAL, SAVE_VALUE, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES FROM TBDD_INDEX_MAN WHERE (GUID = SCOPE_IDENTITY()) ORDER BY SEQUENCE - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -170,7 +170,7 @@ FROM TBDD_INDEX_MAN WHERE (DOK_ID = @DOKID) ORDER BY SEQUENCE - + @@ -183,26 +183,26 @@ SET DOK_ID = @DOK_ID, NAME = @NAME, WD_INDEX = @WD_INDEX, COMMENT WHERE (GUID = @Original_GUID); SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALUE, CONNECTION_ID, SEQUENCE, SQL_RESULT, SQL_CHECK, OPTIONAL, SAVE_VALUE, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES FROM TBDD_INDEX_MAN WHERE (GUID = @GUID) ORDER BY SEQUENCE - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -236,13 +236,13 @@ SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALU - + DELETE FROM TBDD_INDEX_AUTOM WHERE (GUID = @Original_GUID) - + @@ -253,17 +253,17 @@ WHERE (GUID = @Original_GUID) VALUES (@DOCTYPE_ID,@ENTITY_ID,@INDEXNAME,@VALUE,@CONNECTION_ID,@SQL_RESULT,@SQL_ACTIVE,@COMMENT,@ACTIVE,@SEQUENCE,@ADDED_WHO); SELECT GUID, DOCTYPE_ID, ENTITY_ID, INDEXNAME, VALUE, CONNECTION_ID, SQL_RESULT, SQL_ACTIVE, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOPE_IDENTITY()) ORDER BY SEQUENCE - - - - - - - - - - - + + + + + + + + + + + @@ -274,7 +274,7 @@ FROM TBDD_INDEX_AUTOM WHERE (DOCTYPE_ID = @DOKID) ORDER BY SEQUENCE - + @@ -286,19 +286,19 @@ SET DOCTYPE_ID = @DOCTYPE_ID, ENTITY_ID = @ENTITY_ID, INDEXNAME = WHERE (GUID = @Original_GUID); SELECT GUID, DOCTYPE_ID, ENTITY_ID, INDEXNAME, VALUE, CONNECTION_ID, SQL_RESULT, SQL_ACTIVE, COMMENT, ACTIVE, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_INDEX_AUTOM WHERE (GUID = @GUID) ORDER BY SEQUENCE - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb b/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb index 4a655eab..60e41114 100644 --- a/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb +++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmGlobix_Index Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,14 +20,14 @@ Partial Class frmGlobix_Index 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobix_Index)) - Dim EditorButtonImageOptions2 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() - Dim SerializableAppearanceObject5 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject6 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject7 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject8 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim EditorButtonImageOptions1 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject1 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject2 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject3 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() @@ -45,7 +45,6 @@ Partial Class frmGlobix_Index Me.BarHeaderItem1 = New DevExpress.XtraBars.BarHeaderItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroupMultiIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() @@ -168,7 +167,7 @@ Partial Class frmGlobix_Index ' 'chkMultiindexing ' - Me.chkMultiindexing.Caption = "Inaktiv" + Me.chkMultiindexing.Caption = "Multi Indexing" Me.chkMultiindexing.Id = 13 Me.chkMultiindexing.ImageOptions.SvgImage = CType(resources.GetObject("chkMultiindexing.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.chkMultiindexing.ItemInMenuAppearance.Pressed.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) @@ -193,7 +192,7 @@ Partial Class frmGlobix_Index ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupMultiIndex, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -203,18 +202,13 @@ Partial Class frmGlobix_Index Me.RibbonPageGroup1.ItemLinks.Add(Me.checkItemPreselection) Me.RibbonPageGroup1.ItemLinks.Add(Me.SkipItem) Me.RibbonPageGroup1.ItemLinks.Add(Me.PreviewItem) + Me.RibbonPageGroup1.ItemLinks.Add(Me.chkMultiindexing) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Indexierung" ' - 'RibbonPageGroupMultiIndex - ' - Me.RibbonPageGroupMultiIndex.AllowTextClipping = False - Me.RibbonPageGroupMultiIndex.ItemLinks.Add(Me.chkMultiindexing) - Me.RibbonPageGroupMultiIndex.Name = "RibbonPageGroupMultiIndex" - Me.RibbonPageGroupMultiIndex.Text = "Multi-Indexing" - ' 'RibbonPageGroup2 ' + Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup2.ItemLinks.Add(Me.checkItemTopMost) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Fenster" @@ -259,7 +253,7 @@ Partial Class frmGlobix_Index ' 'pnlIndex ' - Me.pnlIndex.BackColor = System.Drawing.Color.Silver + Me.pnlIndex.BackColor = System.Drawing.SystemColors.Control Me.pnlIndex.Dock = System.Windows.Forms.DockStyle.Fill Me.pnlIndex.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.pnlIndex.ForeColor = System.Drawing.Color.White @@ -308,9 +302,9 @@ Partial Class frmGlobix_Index Me.ComboBoxEdit1.Location = New System.Drawing.Point(0, 0) Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 Me.ComboBoxEdit1.Name = "ComboBoxEdit1" - SerializableAppearanceObject5.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) - SerializableAppearanceObject5.Options.UseBackColor = True - Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo, "", 20, True, True, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + SerializableAppearanceObject1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + SerializableAppearanceObject1.Options.UseBackColor = True + Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo, "", 20, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) Me.ComboBoxEdit1.Properties.ButtonsStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat Me.ComboBoxEdit1.Properties.NullText = "Bitte wählen Sie ein Profil" Me.ComboBoxEdit1.Properties.Padding = New System.Windows.Forms.Padding(5) @@ -340,7 +334,6 @@ Partial Class frmGlobix_Index Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_G_DevExpress - Me.IconOptions.SvgImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.Full Me.Name = "frmGlobix_Index" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 @@ -378,7 +371,6 @@ Partial Class frmGlobix_Index Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem Friend WithEvents labelNotice As DevExpress.XtraBars.BarStaticItem Friend WithEvents chkMultiindexing As DevExpress.XtraBars.BarCheckItem - Friend WithEvents RibbonPageGroupMultiIndex As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents Panel1 As Panel diff --git a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb index ea93169e..c9469b38 100644 --- a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb @@ -41,6 +41,8 @@ Public Class frmGlobix_Index Private _idbdata As ClassIDBData Private _Patterns As GlobixPatterns Private _Controls As DigitalData.GUIs.GlobalIndexer.ControlCreator + Private _FileEx As DigitalData.Modules.Filesystem.File + Public Class DocType Public Property Guid Public Property Name @@ -69,11 +71,14 @@ Public Class frmGlobix_Index clsPostProcessing = New GlobixPostprocessing(LogConfig) _idbdata = New ClassIDBData(LogConfig) _Patterns = New GlobixPatterns(LogConfig) + _FileEx = New Modules.Filesystem.File(LogConfig) Localizer.Active = New LookupGridLocalizer() End Sub Private Sub frmGlobix_Index_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Me.ColorizeInactiveIcon = False + ' Abbruchzähler zurücksetzen CancelAttempts = 0 @@ -174,16 +179,15 @@ Public Class frmGlobix_Index My.Application.Globix.MULTIINDEXING_ACTIVE = False If MULTIFILES > 0 Then If My.Application.User.Language = "de-DE" Then - RibbonPageGroupMultiIndex.Text = "Alle nachfolgenden Dateien (" & MULTIFILES & ") identisch indexieren" + chkMultiindexing.Caption = "Alle nachfolgenden Dateien (" & MULTIFILES & ") identisch indexieren" Else - RibbonPageGroupMultiIndex.Text = "All following files (" & MULTIFILES & ") will be indexed identically" + chkMultiindexing.Caption = "All following files (" & MULTIFILES & ") will be indexed identically" End If chkMultiindexing.Checked = False chkMultiindexing.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Else - chkMultiindexing.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If @@ -223,19 +227,6 @@ Public Class frmGlobix_Index End If End Sub - Private Sub BarCheckItem5_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles PreviewItem.CheckedChanged - - End Sub - - Private Sub SourceDeleteItem_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SourceDeleteItem.CheckedChanged - - End Sub - - 'Private Sub SaveProfileItem_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SaveProfileItem.CheckedChanged - ' My.UIConfig.Globix.ProfilePreselection = SaveProfileItem.Checked - ' My.SystemConfigManager.Save() - 'End Sub - Private Sub SkipItem_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SkipItem.ItemClick My.Database.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE GUID = {My.Application.Globix.CURRENT_WORKFILE_GUID}") CancelAttempts = 2 @@ -314,12 +305,7 @@ Public Class frmGlobix_Index Dim oSql = String.Format("select * from VWGI_DOCTYPE where UPPER(USERNAME) = UPPER('{0}') ORDER BY SEQUENCE", My.Application.User.UserName) Dim oFilter = $"USERNAME like '%{My.Application.User.UserName}%'" DT_DOKART = _DataASorDB.GetDatatable("DD_ECM", oSql, "VWGI_DOCTYPE", oFilter, "SEQUENCE") - 'cmbDoctype.DataSource = DT_DOKART - 'cmbDoctype.ValueMember = DT_DOKART.Columns("DOCTYPE_ID").ColumnName - 'cmbDoctype.DisplayMember = DT_DOKART.Columns("DOCTYPE").ColumnName - 'cmbDoctype.AutoCompleteMode = AutoCompleteMode.Suggest - 'cmbDoctype.AutoCompleteSource = AutoCompleteSource.ListItems - 'cmbDoctype.SelectedIndex = -1 + For Each oRow As DataRow In DT_DOKART.Rows ComboBoxEdit1.Properties.Items.Add(New DocType With { .Guid = oRow.Item("DOCTYPE_ID"), @@ -871,7 +857,7 @@ Public Class frmGlobix_Index Dim oDokart As DocType = ComboBoxEdit1.SelectedItem My.Application.Globix.CURRENT_DOCTYPE_ID = oDokart.Guid - If CheckWrite_IndexeMan(ComboBoxEdit1.SelectedItem) = True Then + If CheckWrite_IndexeMan(oDokart.Guid) = True Then '##### Manuelle Indexe indexiert ##### _Logger.Info("Datei [" & My.Application.Globix.CURRENT_WORKFILE & "] wird nun indexiert...") If FillIndexe_Autom(oDokart.Guid) = True Then @@ -1249,29 +1235,12 @@ Public Class frmGlobix_Index End Function Function Move_File(Quelle As String, _NewFilename As String, extension As String, _versionTz As String) As Boolean 'Überprüfen ob File existiert - If File.Exists(_NewFilename) = False Then - My.Application.Globix.CURRENT_NEWFILENAME = _NewFilename - Else - 'Versionieren - Dim version As Integer = 1 - Dim Stammname As String = _NewFilename - Dim neuername As String = _NewFilename - Do While File.Exists(neuername) - version = version + 1 - neuername = Stammname.Replace(extension, "") & _versionTz & version & extension - My.Application.Globix.CURRENT_NEWFILENAME = neuername - Loop - End If + My.Application.Globix.CURRENT_NEWFILENAME = _FileEx.GetVersionedFilename(_NewFilename) + Dim opath = Path.GetDirectoryName(My.Application.Globix.CURRENT_NEWFILENAME) If Directory.Exists(opath) = False Then Directory.CreateDirectory(opath) End If - ''Die Datei wird nun verschoben - 'If My.Application.Globix.CURR_DELETE_ORIGIN = True Then - ' My.Computer.FileSystem.MoveFile(My.Application.Globix.CURRENT_WORKFILE, My.Application.Globix.CURRENT_NEWFILENAME) - 'Else - ' My.Computer.FileSystem.CopyFile(My.Application.Globix.CURRENT_WORKFILE, My.Application.Globix.CURRENT_NEWFILENAME) - 'End If 'Die Datei wird nun an den neuen Ort kopiert My.Computer.FileSystem.MoveFile(My.Application.Globix.CURRENT_WORKFILE, My.Application.Globix.CURRENT_NEWFILENAME) @@ -2436,8 +2405,4 @@ Public Class frmGlobix_Index Return userEmail End Function - - Private Sub PictureEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEdit1.EditValueChanged - - End Sub End Class diff --git a/GUIs.ZooFlow/ModuleHelpers.vb b/GUIs.ZooFlow/ModuleHelpers.vb index d3bf200f..3f9c710b 100644 --- a/GUIs.ZooFlow/ModuleHelpers.vb +++ b/GUIs.ZooFlow/ModuleHelpers.vb @@ -85,29 +85,27 @@ Module ModuleHelpers End Try Return connectionString End Function - Public Function FilterDatatable(myDatatable As DataTable, myFilter As String, mycheckColumn As String, pSortString As String, returnDT As Boolean) As Object + + Public Function FilterDatatable(pDatatable As DataTable, pFilterString As String, pCheckColumn As String, pSortString As String, pReturnDataTable As Boolean) As Object Try - If myDatatable.Rows.Count = 0 Then + If pDatatable.Rows.Count = 0 Then Return Nothing End If - Dim dv As DataView = myDatatable.DefaultView - dv.RowFilter = myFilter - If dv.Count = 1 And returnDT = False Then - For Each rowView As DataRowView In dv - Dim row As DataRow = rowView.Row - Return row.Item(mycheckColumn) - Next + Dim oDataView As DataView = pDatatable.DefaultView + oDataView.RowFilter = pFilterString + If oDataView.Count = 1 And pReturnDataTable = False Then + Dim oView As DataRowView = oDataView.Item(0) + Dim oRow As DataRow = oView.Row + Return oRow.Item(pCheckColumn) Else - Dim dt_copy As DataTable = New DataTable() - dt_copy = myDatatable.Select(myFilter, pSortString).CopyToDataTable() + Dim oDataTableCopy As DataTable = New DataTable() + oDataTableCopy = pDatatable.Select(pFilterString, pSortString).CopyToDataTable() - Return dt_copy + Return oDataTableCopy End If Catch ex As Exception - MsgBox("Unexpected error in FilterDatatable: " + ex.Message, MsgBoxStyle.Critical) + MsgBox("Unexpected Error in FilterDatatable: " + ex.Message, MsgBoxStyle.Critical) Return Nothing End Try - End Function - End Module diff --git a/GUIs.ZooFlow/My Project/Settings.Designer.vb b/GUIs.ZooFlow/My Project/Settings.Designer.vb index 1f07a27d..b29d6851 100644 --- a/GUIs.ZooFlow/My Project/Settings.Designer.vb +++ b/GUIs.ZooFlow/My Project/Settings.Designer.vb @@ -76,8 +76,7 @@ Partial Friend NotInheritable Class Settings _ + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=DD-VMP02-DB01;Initial Catalog=DD_ECM;User ID=sa;Password=dd")> _ Public ReadOnly Property ECMConnectionStringDEFAULT() As String Get Return CType(Me("ECMConnectionStringDEFAULT"),String) @@ -87,11 +86,10 @@ Partial Friend NotInheritable Class Settings _ - Public ReadOnly Property DD_ECM_TESTConnectionString() As String + Global.System.Configuration.DefaultSettingValueAttribute("Data Source=DD-VMP02-DB01;Initial Catalog=DD_ECM;User ID=sa;Password=dd")> _ + Public ReadOnly Property DD_ECMConnectionString() As String Get - Return CType(Me("DD_ECM_TESTConnectionString"),String) + Return CType(Me("DD_ECMConnectionString"),String) End Get End Property @@ -106,6 +104,16 @@ Partial Friend NotInheritable Class Settings Me("IDBOBJID") = value End Set End Property + + _ + Public ReadOnly Property DD_ECMConnectionString1() As String + Get + Return CType(Me("DD_ECMConnectionString1"),String) + End Get + End Property End Class Namespace My diff --git a/GUIs.ZooFlow/My Project/Settings.settings b/GUIs.ZooFlow/My Project/Settings.settings index 3c2ac50d..5d8d9e97 100644 --- a/GUIs.ZooFlow/My Project/Settings.settings +++ b/GUIs.ZooFlow/My Project/Settings.settings @@ -16,20 +16,28 @@ <?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;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> + <ConnectionString>Data Source=DD-VMP02-DB01;Initial Catalog=DD_ECM;User ID=sa;Password=dd</ConnectionString> </SerializableConnectionString> - Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd + Data Source=DD-VMP02-DB01;Initial Catalog=DD_ECM;User ID=sa;Password=dd - + <?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=dd</ConnectionString> + <ConnectionString>Data Source=DD-VMP02-DB01;Initial Catalog=DD_ECM;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=dd + Data Source=DD-VMP02-DB01;Initial Catalog=DD_ECM;User ID=sa;Password=dd 17255 + + <?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=DD-VMP02-DB01;Initial Catalog=DD_ECM;User ID=sa;Password=dd</ConnectionString> + <ProviderName>System.Data.SqlClient</ProviderName> +</SerializableConnectionString> + Data Source=DD-VMP02-DB01;Initial Catalog=DD_ECM;User ID=sa;Password=dd + \ No newline at end of file diff --git a/GUIs.ZooFlow/MyDataset.Designer.vb b/GUIs.ZooFlow/MyDataset.Designer.vb index aea9c8b9..0ddc0859 100644 --- a/GUIs.ZooFlow/MyDataset.Designer.vb +++ b/GUIs.ZooFlow/MyDataset.Designer.vb @@ -22,7 +22,7 @@ Option Explicit On Global.System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedDataSetSchema"), _ Global.System.Xml.Serialization.XmlRootAttribute("DSClipboardWatcher"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.DataSet")> _ -Partial Public Class MyDataset +Partial Public Class DSClipboardWatcher Inherits Global.System.Data.DataSet Private tableVWCW_USER_PROFILE As VWCW_USER_PROFILEDataTable @@ -143,7 +143,7 @@ Partial Public Class MyDataset _ Public Overrides Function Clone() As Global.System.Data.DataSet - Dim cln As MyDataset = CType(MyBase.Clone,MyDataset) + Dim cln As DSClipboardWatcher = CType(MyBase.Clone,DSClipboardWatcher) cln.InitVars cln.SchemaSerializationMode = Me.SchemaSerializationMode Return cln @@ -257,7 +257,7 @@ Partial Public Class MyDataset _ Public Shared Function GetTypedDataSetSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType - Dim ds As MyDataset = New MyDataset() + Dim ds As DSClipboardWatcher = New DSClipboardWatcher() Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() Dim any As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() @@ -621,7 +621,7 @@ Partial Public Class MyDataset Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() - Dim ds As MyDataset = New MyDataset() + Dim ds As DSClipboardWatcher = New DSClipboardWatcher() Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() any1.Namespace = "http://www.w3.org/2001/XMLSchema" any1.MinOccurs = New Decimal(0) @@ -1013,7 +1013,7 @@ Partial Public Class MyDataset Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() - Dim ds As MyDataset = New MyDataset() + Dim ds As DSClipboardWatcher = New DSClipboardWatcher() Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() any1.Namespace = "http://www.w3.org/2001/XMLSchema" any1.MinOccurs = New Decimal(0) @@ -1662,7 +1662,7 @@ Namespace DSClipboardWatcherTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub _ - Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.VWCW_USER_PROFILEDataTable) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DSClipboardWatcher.VWCW_USER_PROFILEDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (Me.ClearBeforeFill = true) Then dataTable.Clear @@ -1693,9 +1693,9 @@ Namespace DSClipboardWatcherTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData() As MyDataset.VWCW_USER_PROFILEDataTable + Public Overloads Overridable Function GetData() As DSClipboardWatcher.VWCW_USER_PROFILEDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As MyDataset.VWCW_USER_PROFILEDataTable = New MyDataset.VWCW_USER_PROFILEDataTable() + Dim dataTable As DSClipboardWatcher.VWCW_USER_PROFILEDataTable = New DSClipboardWatcher.VWCW_USER_PROFILEDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -1930,7 +1930,7 @@ Namespace DSClipboardWatcherTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECM_TESTConnectionString + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString End Sub _ - Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBCW_PROFILESDataTable) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DSClipboardWatcher.TBCW_PROFILESDataTable) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (Me.ClearBeforeFill = true) Then dataTable.Clear @@ -1961,9 +1961,9 @@ Namespace DSClipboardWatcherTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData() As MyDataset.TBCW_PROFILESDataTable + Public Overloads Overridable Function GetData() As DSClipboardWatcher.TBCW_PROFILESDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As MyDataset.TBCW_PROFILESDataTable = New MyDataset.TBCW_PROFILESDataTable() + Dim dataTable As DSClipboardWatcher.TBCW_PROFILESDataTable = New DSClipboardWatcher.TBCW_PROFILESDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -1971,14 +1971,14 @@ Namespace DSClipboardWatcherTableAdapters _ - Public Overloads Overridable Function Update(ByVal dataTable As MyDataset.TBCW_PROFILESDataTable) As Integer + Public Overloads Overridable Function Update(ByVal dataTable As DSClipboardWatcher.TBCW_PROFILESDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function _ - Public Overloads Overridable Function Update(ByVal dataSet As MyDataset) As Integer + Public Overloads Overridable Function Update(ByVal dataSet As DSClipboardWatcher) As Integer Return Me.Adapter.Update(dataSet, "TBCW_PROFILES") End Function @@ -2363,7 +2363,7 @@ Namespace DSClipboardWatcherTableAdapters ''' _ - Private Function UpdateUpdatedRows(ByVal dataSet As MyDataset, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer + Private Function UpdateUpdatedRows(ByVal dataSet As DSClipboardWatcher, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow), ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) @@ -2382,7 +2382,7 @@ Namespace DSClipboardWatcherTableAdapters ''' _ - Private Function UpdateInsertedRows(ByVal dataSet As MyDataset, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer + Private Function UpdateInsertedRows(ByVal dataSet As DSClipboardWatcher, ByVal allAddedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) @@ -2400,7 +2400,7 @@ Namespace DSClipboardWatcherTableAdapters ''' _ - Private Function UpdateDeletedRows(ByVal dataSet As MyDataset, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer + Private Function UpdateDeletedRows(ByVal dataSet As DSClipboardWatcher, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 If (Not (Me._tBCW_PROFILESTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBCW_PROFILES.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) @@ -2444,7 +2444,7 @@ Namespace DSClipboardWatcherTableAdapters ''' _ - Public Overridable Function UpdateAll(ByVal dataSet As MyDataset) As Integer + Public Overridable Function UpdateAll(ByVal dataSet As DSClipboardWatcher) As Integer If (dataSet Is Nothing) Then Throw New Global.System.ArgumentNullException("dataSet") End If diff --git a/GUIs.ZooFlow/MyDataset.xsd b/GUIs.ZooFlow/MyDataset.xsd index f4502cb0..8fc9f632 100644 --- a/GUIs.ZooFlow/MyDataset.xsd +++ b/GUIs.ZooFlow/MyDataset.xsd @@ -4,12 +4,12 @@ - + - + SELECT GUID, NAME, REGEX_EXPRESSION, COMMENT, ACTIVE, PROFILE_TYPE, PROC_NAME, USER_ID, GROUP_ID FROM dbo.VWCW_USER_PROFILE @@ -33,7 +33,7 @@ - + DELETE FROM [dbo].[TBCW_PROFILES] WHERE (([GUID] = @Original_GUID) AND ([NAME] = @Original_NAME) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([REGEX_EXPRESSION] = @Original_REGEX_EXPRESSION) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([ACTIVE] = @Original_ACTIVE) AND ([PROFILE_TYPE] = @Original_PROFILE_TYPE)) diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index ecc0256b..f7919af8 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -16,6 +16,7 @@ Binary Off On + false publish\ true Disk @@ -28,7 +29,6 @@ true 0 1.0.0.%2a - false false true