diff --git a/cubesql-webadmin.xojo_project b/cubesql-webadmin.xojo_project index 485c615..41bd7b2 100644 --- a/cubesql-webadmin.xojo_project +++ b/cubesql-webadmin.xojo_project @@ -113,7 +113,7 @@ WebLaunchBrowser=True WebLivePort=80 WebSecurePort=443 WebProtocol=1 -WebHTMLHeader= +WebHTMLHeader= WebHostingIdentifier= WebHostingAppName=cubeSQLWebAdmin WebHostingDomain= diff --git a/webapp/containers/base/cntDatasourceBase.xojo_code b/webapp/containers/base/cntDatasourceBase.xojo_code index 7a36143..40bf759 100644 --- a/webapp/containers/base/cntDatasourceBase.xojo_code +++ b/webapp/containers/base/cntDatasourceBase.xojo_code @@ -160,6 +160,7 @@ Implements WebDataSource Finally ebNeedsLoadDatasource = False + me.TableDatasourceLoaded() End Try End Sub @@ -333,6 +334,12 @@ Implements WebDataSource End Function #tag EndMethod + #tag Method, Flags = &h1 + Protected Sub TableDatasourceLoaded() + + End Sub + #tag EndMethod + #tag Method, Flags = &h1 Protected Sub TableInitColumns() Redim Me.Columns(-1) diff --git a/webapp/containers/data/cntDatabases.xojo_code b/webapp/containers/data/cntDatabases.xojo_code index 2078d88..60f7ecc 100644 --- a/webapp/containers/data/cntDatabases.xojo_code +++ b/webapp/containers/data/cntDatabases.xojo_code @@ -3,6 +3,7 @@ Begin cntDatasourceBase cntDatabases Compatibility = "" ControlCount = 0 ControlID = "" + CSSClasses = "" Enabled = True Height = 500 Indicator = 0 @@ -15,6 +16,7 @@ Begin cntDatasourceBase cntDatabases LockRight = False LockTop = True LockVertical = False + PanelIndex = 0 ScrollDirection = 0 TabIndex = 0 Top = 0 @@ -22,13 +24,19 @@ Begin cntDatasourceBase cntDatabases Width = 750 _mDesignHeight = 0 _mDesignWidth = 0 + _mName = "" _mPanelIndex = -1 Begin WebListBox lstInfos ColumnCount = 1 ColumnWidths = "" ControlID = "" + CSSClasses = "lstDatabases" + DefaultRowHeight= 49 Enabled = True + GridLineStyle = 3 + HasBorder = True HasHeader = True + HeaderHeight = 0 Height = 380 HighlightSortedColumn= True Index = -2147483648 @@ -46,6 +54,7 @@ Begin cntDatasourceBase cntDatabases LockTop = True LockVertical = False NoRowsMessage = "No Databases" + PanelIndex = 0 ProcessingMessage= "" RowCount = 0 RowSelectionType= 1 @@ -66,6 +75,7 @@ Begin cntDatasourceBase cntDatabases Cancel = False Caption = "Drop" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -79,6 +89,8 @@ Begin cntDatasourceBase cntDatabases LockRight = True LockTop = False LockVertical = False + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 4 TabStop = True @@ -93,6 +105,7 @@ Begin cntDatasourceBase cntDatabases Cancel = False Caption = "Stop" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -106,7 +119,8 @@ Begin cntDatasourceBase cntDatabases LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 3 TabStop = True @@ -121,6 +135,7 @@ Begin cntDatasourceBase cntDatabases Cancel = False Caption = "Create" ControlID = "" + CSSClasses = "" Default = False Enabled = True Height = 38 @@ -134,7 +149,8 @@ Begin cntDatasourceBase cntDatabases LockRight = False LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 1 TabStop = True @@ -149,6 +165,7 @@ Begin cntDatasourceBase cntDatabases Cancel = False Caption = "Start" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -162,7 +179,8 @@ Begin cntDatasourceBase cntDatabases LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 2 TabStop = True @@ -177,6 +195,7 @@ Begin cntDatasourceBase cntDatabases Cancel = False Caption = "Rename" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -190,7 +209,8 @@ Begin cntDatasourceBase cntDatabases LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 9 TabStop = True @@ -202,6 +222,7 @@ Begin cntDatasourceBase cntDatabases End Begin WebMessageDialog dlgDrop ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -214,6 +235,7 @@ Begin cntDatasourceBase cntDatabases LockTop = True LockVertical = False Message = "" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -224,6 +246,7 @@ Begin cntDatasourceBase cntDatabases Cancel = False Caption = "Download" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -237,7 +260,8 @@ Begin cntDatasourceBase cntDatabases LockRight = False LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 6 TabStop = True @@ -249,6 +273,7 @@ Begin cntDatasourceBase cntDatabases End Begin WebThread thrUpload DebugIdentifier = "" + Enabled = True Index = -2147483648 LockedInPosition= True Priority = 5 @@ -256,10 +281,12 @@ Begin cntDatasourceBase cntDatabases StackSize = 0 ThreadID = 0 ThreadState = "" + Type = "" End Begin WebProgressWheel pgrWheel Colorize = False ControlID = "" + CSSClasses = "" Enabled = True Height = 32 Index = -2147483648 @@ -272,7 +299,7 @@ Begin cntDatasourceBase cntDatabases LockRight = False LockTop = False LockVertical = False - PanelIndex = "0" + PanelIndex = 0 Parent = "rctFilter" Scope = 2 SVGColor = &c00000000 @@ -292,6 +319,7 @@ Begin cntDatasourceBase cntDatabases Index = -2147483648 Location = 0 LockedInPosition= True + PanelIndex = 0 Period = 500 RunMode = 0 Scope = 2 @@ -303,6 +331,7 @@ Begin cntDatasourceBase cntDatabases Index = -2147483648 Location = 0 LockedInPosition= True + PanelIndex = 0 Period = 500 RunMode = 0 Scope = 2 @@ -313,6 +342,7 @@ Begin cntDatasourceBase cntDatabases Cancel = False Caption = "Upload" ControlID = "" + CSSClasses = "" Default = False Enabled = True Height = 38 @@ -326,7 +356,8 @@ Begin cntDatasourceBase cntDatabases LockRight = False LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 5 TabStop = True @@ -342,6 +373,7 @@ Begin cntDatasourceBase cntDatabases Index = -2147483648 Location = 0 LockedInPosition= True + PanelIndex = 0 Period = 500 RunMode = 0 Scope = 2 @@ -349,6 +381,7 @@ Begin cntDatasourceBase cntDatabases End Begin WebThread thrDownload DebugIdentifier = "" + Enabled = True Index = -2147483648 LockedInPosition= True Priority = 5 @@ -356,12 +389,14 @@ Begin cntDatasourceBase cntDatabases StackSize = 0 ThreadID = 0 ThreadState = "" + Type = "" End Begin WebButton btnEncryption AllowAutoDisable= False Cancel = False Caption = "Encryption" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -375,7 +410,8 @@ Begin cntDatasourceBase cntDatabases LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 8 TabStop = True @@ -387,6 +423,7 @@ Begin cntDatasourceBase cntDatabases End Begin WebMessageDialog dlgDecrypt ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -399,7 +436,7 @@ Begin cntDatasourceBase cntDatabases LockTop = True LockVertical = False Message = "" - PanelIndex = "0" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -410,6 +447,7 @@ Begin cntDatasourceBase cntDatabases Cancel = False Caption = "Schedules" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -423,7 +461,8 @@ Begin cntDatasourceBase cntDatabases LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 7 TabStop = True @@ -435,6 +474,7 @@ Begin cntDatasourceBase cntDatabases End Begin WebMessageDialog dlgMessage ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -447,6 +487,7 @@ Begin cntDatasourceBase cntDatabases LockTop = True LockVertical = False Message = "" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -1186,12 +1227,6 @@ End #tag EndWindowCode #tag Events lstInfos - #tag Event - Sub Opening() - Me.ExecuteJavaScript("$('#" + Me.ControlID + "').addClass('listboxDbHeaderAlignment')") - - End Sub - #tag EndEvent #tag Event Sub SelectionChanged(rows() As Integer) #Pragma unused rows @@ -1512,6 +1547,14 @@ End #tag EndEvent #tag EndEvents #tag ViewBehavior + #tag ViewProperty + Name="PanelIndex" + Visible=false + Group="Behavior" + InitialValue="" + Type="Integer" + EditorType="" + #tag EndViewProperty #tag ViewProperty Name="Area" Visible=false diff --git a/webapp/containers/data/cntSchedules.xojo_code b/webapp/containers/data/cntSchedules.xojo_code index 2b13697..417e2eb 100644 --- a/webapp/containers/data/cntSchedules.xojo_code +++ b/webapp/containers/data/cntSchedules.xojo_code @@ -3,6 +3,7 @@ Begin cntDatasourceBase cntSchedules Compatibility = "" ControlCount = 0 ControlID = "" + CSSClasses = "" Enabled = True Height = 500 Indicator = 0 @@ -15,6 +16,7 @@ Begin cntDatasourceBase cntSchedules LockRight = False LockTop = True LockVertical = False + PanelIndex = 0 ScrollDirection = 0 TabIndex = 0 Top = 0 @@ -27,8 +29,13 @@ Begin cntDatasourceBase cntSchedules ColumnCount = 1 ColumnWidths = "" ControlID = "" + CSSClasses = "lstSchedules" + DefaultRowHeight= 49 Enabled = True + GridLineStyle = 3 + HasBorder = True HasHeader = True + HeaderHeight = 0 Height = 342 HighlightSortedColumn= True Index = -2147483648 @@ -46,6 +53,7 @@ Begin cntDatasourceBase cntSchedules LockTop = True LockVertical = False NoRowsMessage = "No Schedules" + PanelIndex = 0 ProcessingMessage= "" RowCount = 0 RowSelectionType= 1 @@ -63,8 +71,12 @@ Begin cntDatasourceBase cntSchedules End Begin WebRectangle rctFilter BackgroundColor = &cFFFFFF + BorderColor = &c000000FF + BorderThickness = 1 ControlCount = 0 ControlID = "" + CornerSize = -1 + CSSClasses = "" Enabled = True HasBackgroundColor= False Height = 75 @@ -80,7 +92,7 @@ Begin cntDatasourceBase cntSchedules LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + PanelIndex = 0 Scope = 2 TabIndex = 1 TabStop = True @@ -94,6 +106,7 @@ Begin cntDatasourceBase cntSchedules Begin WebLabel labFilter Bold = True ControlID = "" + CSSClasses = "" Enabled = True FontName = "" FontSize = 0.0 @@ -110,7 +123,7 @@ Begin cntDatasourceBase cntSchedules LockTop = True LockVertical = False Multiline = False - PanelIndex = "0" + PanelIndex = 0 Parent = "rctFilter" Scope = 2 TabIndex = 0 @@ -129,6 +142,7 @@ Begin cntDatasourceBase cntSchedules Begin WebLabel labFilterDatabase Bold = False ControlID = "" + CSSClasses = "" Enabled = True FontName = "" FontSize = 0.0 @@ -145,7 +159,7 @@ Begin cntDatasourceBase cntSchedules LockTop = True LockVertical = False Multiline = False - PanelIndex = "0" + PanelIndex = 0 Parent = "rctFilter" Scope = 2 TabIndex = 1 @@ -163,6 +177,7 @@ Begin cntDatasourceBase cntSchedules End Begin WebPopupMenu lstFilterDatabase ControlID = "" + CSSClasses = "" Enabled = True Height = 38 Index = -2147483648 @@ -178,7 +193,7 @@ Begin cntDatasourceBase cntSchedules LockRight = False LockTop = True LockVertical = False - PanelIndex = "0" + PanelIndex = 0 Parent = "rctFilter" RowCount = 0 Scope = 2 @@ -198,6 +213,7 @@ Begin cntDatasourceBase cntSchedules Cancel = False Caption = "Schedules" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -211,7 +227,8 @@ Begin cntDatasourceBase cntSchedules LockRight = True LockTop = True LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Parent = "rctFilter" Scope = 2 TabIndex = 3 @@ -229,6 +246,7 @@ Begin cntDatasourceBase cntSchedules Cancel = False Caption = "Drop" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -242,7 +260,8 @@ Begin cntDatasourceBase cntSchedules LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 6 TabStop = True @@ -257,6 +276,7 @@ Begin cntDatasourceBase cntSchedules Cancel = False Caption = "Rename" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -270,7 +290,8 @@ Begin cntDatasourceBase cntSchedules LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 5 TabStop = True @@ -282,6 +303,7 @@ Begin cntDatasourceBase cntSchedules End Begin WebMessageDialog dlgDrop ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -294,7 +316,7 @@ Begin cntDatasourceBase cntSchedules LockTop = True LockVertical = False Message = "" - PanelIndex = "0" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -305,6 +327,7 @@ Begin cntDatasourceBase cntSchedules Cancel = False Caption = "Create" ControlID = "" + CSSClasses = "" Default = False Enabled = True Height = 38 @@ -318,7 +341,8 @@ Begin cntDatasourceBase cntSchedules LockRight = False LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 2 TabStop = True @@ -333,6 +357,7 @@ Begin cntDatasourceBase cntSchedules Cancel = False Caption = "Edit" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -346,7 +371,8 @@ Begin cntDatasourceBase cntSchedules LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 4 TabStop = True @@ -361,6 +387,7 @@ Begin cntDatasourceBase cntSchedules Cancel = False Caption = "Attach/Detach Databases" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -374,7 +401,8 @@ Begin cntDatasourceBase cntSchedules LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Parent = "nil" Scope = 2 TabIndex = 3 @@ -385,18 +413,9 @@ Begin cntDatasourceBase cntSchedules Width = 240 _mPanelIndex = -1 End - Begin WebThread thrDetails - DebugIdentifier = "" - Index = -2147483648 - LockedInPosition= True - Priority = 5 - Scope = 2 - StackSize = 0 - ThreadID = 0 - ThreadState = 0 - End Begin WebMessageDialog dlgMessage ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -409,6 +428,7 @@ Begin cntDatasourceBase cntSchedules LockTop = True LockVertical = False Message = "" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -809,6 +829,15 @@ End End Sub #tag EndMethod + #tag Method, Flags = &h1 + Protected Sub TableDatasourceLoaded() + Super.TableDatasourceLoaded() + + If ebShowDetails Then Me.ShowDetails() + + End Sub + #tag EndMethod + #tag Method, Flags = &h1 Protected Sub TableInitColumns() Super.TableInitColumns() @@ -855,21 +884,6 @@ End End Sub #tag EndMethod - #tag Method, Flags = &h1 - Protected Sub TableLoad() - Super.TableLoad() - - If ebShowDetails Then - Try - thrDetails.Start - Catch err As RuntimeException - - End Try - End If - - End Sub - #tag EndMethod - #tag Method, Flags = &h1 Protected Function TableLoadRowSet() As RowSet Var filterDatabasename As String = Me.GetSelectedDatabasename() @@ -970,12 +984,6 @@ End End Sub #tag EndEvent - #tag Event - Sub Opening() - Me.ExecuteJavaScript("$('#" + Me.ControlID + "').addClass('listboxSchedulesHeaderAlignment')") - - End Sub - #tag EndEvent #tag EndEvents #tag Events lstFilterDatabase #tag Event @@ -1048,21 +1056,15 @@ End End Sub #tag EndEvent #tag EndEvents -#tag Events thrDetails - #tag Event - Sub Run() - Try - If (Not ebShowDetails) Then Return - - Self.ShowDetails() - - Catch err As RuntimeException - End Try - - End Sub - #tag EndEvent -#tag EndEvents #tag ViewBehavior + #tag ViewProperty + Name="PanelIndex" + Visible=false + Group="Behavior" + InitialValue="" + Type="Integer" + EditorType="" + #tag EndViewProperty #tag ViewProperty Name="Area" Visible=false diff --git a/webapp/containers/information/cntClients.xojo_code b/webapp/containers/information/cntClients.xojo_code index 2fe4d02..8ccc69f 100644 --- a/webapp/containers/information/cntClients.xojo_code +++ b/webapp/containers/information/cntClients.xojo_code @@ -3,6 +3,7 @@ Begin cntDatasourceBase cntClients Compatibility = "" ControlCount = 0 ControlID = "" + CSSClasses = "" Enabled = True Height = 500 Indicator = 0 @@ -15,6 +16,7 @@ Begin cntDatasourceBase cntClients LockRight = False LockTop = True LockVertical = False + PanelIndex = 0 ScrollDirection = 0 TabIndex = 0 Top = 0 @@ -27,8 +29,13 @@ Begin cntDatasourceBase cntClients ColumnCount = 1 ColumnWidths = "" ControlID = "" + CSSClasses = "lstClients" + DefaultRowHeight= 49 Enabled = True + GridLineStyle = 3 + HasBorder = True HasHeader = True + HeaderHeight = 0 Height = 422 HighlightSortedColumn= True Index = -2147483648 @@ -46,6 +53,7 @@ Begin cntDatasourceBase cntClients LockTop = True LockVertical = False NoRowsMessage = "No Clients" + PanelIndex = 0 ProcessingMessage= "" RowCount = 0 RowSelectionType= 1 @@ -66,6 +74,7 @@ Begin cntDatasourceBase cntClients Cancel = False Caption = "Refresh" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -79,6 +88,8 @@ Begin cntDatasourceBase cntClients LockRight = True LockTop = False LockVertical = False + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 1 TabStop = True @@ -93,6 +104,7 @@ Begin cntDatasourceBase cntClients Cancel = False Caption = "Disconnect" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -106,7 +118,8 @@ Begin cntDatasourceBase cntClients LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 2 TabStop = True @@ -118,6 +131,7 @@ Begin cntDatasourceBase cntClients End Begin WebMessageDialog dlgDisconnect ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -130,7 +144,7 @@ Begin cntDatasourceBase cntClients LockTop = True LockVertical = False Message = "" - PanelIndex = "0" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -138,6 +152,7 @@ Begin cntDatasourceBase cntClients End Begin WebMessageDialog dlgMessage ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -150,6 +165,7 @@ Begin cntDatasourceBase cntClients LockTop = True LockVertical = False Message = "" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -410,12 +426,6 @@ End #tag EndWindowCode #tag Events lstInfos - #tag Event - Sub Opening() - Me.ExecuteJavaScript("$('#" + Me.ControlID + "').addClass('listboxClientsHeaderAlignment')") - - End Sub - #tag EndEvent #tag Event Sub SelectionChanged(rows() As Integer) #Pragma unused rows @@ -450,6 +460,14 @@ End #tag EndEvent #tag EndEvents #tag ViewBehavior + #tag ViewProperty + Name="PanelIndex" + Visible=false + Group="Behavior" + InitialValue="" + Type="Integer" + EditorType="" + #tag EndViewProperty #tag ViewProperty Name="Area" Visible=false diff --git a/webapp/containers/security/cntGroups.xojo_code b/webapp/containers/security/cntGroups.xojo_code index e23ba18..85ddbb3 100644 --- a/webapp/containers/security/cntGroups.xojo_code +++ b/webapp/containers/security/cntGroups.xojo_code @@ -3,6 +3,7 @@ Begin cntDatasourceBase cntGroups Compatibility = "" ControlCount = 0 ControlID = "" + CSSClasses = "" Enabled = True Height = 500 Indicator = 0 @@ -15,6 +16,7 @@ Begin cntDatasourceBase cntGroups LockRight = False LockTop = True LockVertical = False + PanelIndex = 0 ScrollDirection = 0 TabIndex = 0 Top = 0 @@ -27,8 +29,13 @@ Begin cntDatasourceBase cntGroups ColumnCount = 1 ColumnWidths = "" ControlID = "" + CSSClasses = "lstGroups" + DefaultRowHeight= 49 Enabled = True + GridLineStyle = 3 + HasBorder = True HasHeader = True + HeaderHeight = 0 Height = 422 HighlightSortedColumn= True Index = -2147483648 @@ -46,6 +53,7 @@ Begin cntDatasourceBase cntGroups LockTop = True LockVertical = False NoRowsMessage = "No Groups" + PanelIndex = 0 ProcessingMessage= "" RowCount = 0 RowSelectionType= 1 @@ -66,6 +74,7 @@ Begin cntDatasourceBase cntGroups Cancel = False Caption = "Drop" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -79,6 +88,8 @@ Begin cntDatasourceBase cntGroups LockRight = True LockTop = False LockVertical = False + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 3 TabStop = True @@ -93,6 +104,7 @@ Begin cntDatasourceBase cntGroups Cancel = False Caption = "Rename" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -106,7 +118,8 @@ Begin cntDatasourceBase cntGroups LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 2 TabStop = True @@ -121,6 +134,7 @@ Begin cntDatasourceBase cntGroups Cancel = False Caption = "Create" ControlID = "" + CSSClasses = "" Default = False Enabled = True Height = 38 @@ -134,7 +148,8 @@ Begin cntDatasourceBase cntGroups LockRight = False LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 1 TabStop = True @@ -144,18 +159,9 @@ Begin cntDatasourceBase cntGroups Width = 100 _mPanelIndex = -1 End - Begin WebThread thrDetails - DebugIdentifier = "" - Index = -2147483648 - LockedInPosition= True - Priority = 5 - Scope = 2 - StackSize = 0 - ThreadID = 0 - ThreadState = 0 - End Begin WebMessageDialog dlgDrop ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -168,6 +174,7 @@ Begin cntDatasourceBase cntGroups LockTop = True LockVertical = False Message = "" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -175,6 +182,7 @@ Begin cntDatasourceBase cntGroups End Begin WebMessageDialog dlgMessage ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -187,6 +195,7 @@ Begin cntDatasourceBase cntGroups LockTop = True LockVertical = False Message = "" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -308,19 +317,6 @@ End End Function #tag EndMethod - #tag Method, Flags = &h0 - Sub Close() - Try - thrDetails.Stop - Catch err As RuntimeException - - End Try - - Super.Close() - - End Sub - #tag EndMethod - #tag Method, Flags = &h0 Sub Constructor() Super.Constructor @@ -426,6 +422,15 @@ End End Sub #tag EndMethod + #tag Method, Flags = &h1 + Protected Sub TableDatasourceLoaded() + Super.TableDatasourceLoaded() + + If ebShowDetails Then Me.ShowDetails() + + End Sub + #tag EndMethod + #tag Method, Flags = &h1 Protected Sub TableInitColumns() Super.TableInitColumns() @@ -471,21 +476,6 @@ End End Sub #tag EndMethod - #tag Method, Flags = &h1 - Protected Sub TableLoad() - Super.TableLoad() - - If ebShowDetails Then - Try - thrDetails.Start - Catch err As RuntimeException - - End Try - End If - - End Sub - #tag EndMethod - #tag Method, Flags = &h1 Protected Function TableLoadRowSet() As RowSet Return Session.DB.SelectSQL("SHOW GROUPS") @@ -564,12 +554,6 @@ End #tag EndWindowCode #tag Events lstInfos - #tag Event - Sub Opening() - Me.ExecuteJavaScript("$('#" + Me.ControlID + "').addClass('listboxGroupsHeaderAlignment')") - - End Sub - #tag EndEvent #tag Event Sub SelectionChanged(rows() As Integer) #Pragma unused rows @@ -605,20 +589,6 @@ End End Sub #tag EndEvent #tag EndEvents -#tag Events thrDetails - #tag Event - Sub Run() - Try - If (Not ebShowDetails) Then Return - - Self.ShowDetails() - - Catch err As RuntimeException - End Try - - End Sub - #tag EndEvent -#tag EndEvents #tag Events dlgDrop #tag Event Sub ButtonPressed(button As WebMessageDialogButton) @@ -628,6 +598,14 @@ End #tag EndEvent #tag EndEvents #tag ViewBehavior + #tag ViewProperty + Name="PanelIndex" + Visible=false + Group="Behavior" + InitialValue="" + Type="Integer" + EditorType="" + #tag EndViewProperty #tag ViewProperty Name="Area" Visible=false diff --git a/webapp/containers/security/cntUsers.xojo_code b/webapp/containers/security/cntUsers.xojo_code index 66f54b9..cc0a8c0 100644 --- a/webapp/containers/security/cntUsers.xojo_code +++ b/webapp/containers/security/cntUsers.xojo_code @@ -3,6 +3,7 @@ Begin cntDatasourceBase cntUsers Compatibility = "" ControlCount = 0 ControlID = "" + CSSClasses = "" Enabled = True Height = 500 Indicator = 0 @@ -15,6 +16,7 @@ Begin cntDatasourceBase cntUsers LockRight = False LockTop = True LockVertical = False + PanelIndex = 0 ScrollDirection = 0 TabIndex = 0 Top = 0 @@ -27,8 +29,13 @@ Begin cntDatasourceBase cntUsers ColumnCount = 1 ColumnWidths = "" ControlID = "" + CSSClasses = "lstUsers" + DefaultRowHeight= 49 Enabled = True + GridLineStyle = 3 + HasBorder = True HasHeader = True + HeaderHeight = 0 Height = 342 HighlightSortedColumn= True Index = -2147483648 @@ -46,6 +53,7 @@ Begin cntDatasourceBase cntUsers LockTop = True LockVertical = False NoRowsMessage = "No Users" + PanelIndex = 0 ProcessingMessage= "" RowCount = 0 RowSelectionType= 1 @@ -66,6 +74,7 @@ Begin cntDatasourceBase cntUsers Cancel = False Caption = "Drop" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -79,6 +88,8 @@ Begin cntDatasourceBase cntUsers LockRight = True LockTop = False LockVertical = False + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 6 TabStop = True @@ -93,6 +104,7 @@ Begin cntDatasourceBase cntUsers Cancel = False Caption = "Rename" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -106,7 +118,8 @@ Begin cntDatasourceBase cntUsers LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 5 TabStop = True @@ -121,6 +134,7 @@ Begin cntDatasourceBase cntUsers Cancel = False Caption = "Create" ControlID = "" + CSSClasses = "" Default = False Enabled = True Height = 38 @@ -134,7 +148,8 @@ Begin cntDatasourceBase cntUsers LockRight = False LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 2 TabStop = True @@ -144,21 +159,12 @@ Begin cntDatasourceBase cntUsers Width = 100 _mPanelIndex = -1 End - Begin WebThread thrDetails - DebugIdentifier = "" - Index = -2147483648 - LockedInPosition= True - Priority = 5 - Scope = 2 - StackSize = 0 - ThreadID = 0 - ThreadState = 0 - End Begin WebButton btnPassword AllowAutoDisable= False Cancel = False Caption = "Set Password" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -172,7 +178,8 @@ Begin cntDatasourceBase cntUsers LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 4 TabStop = True @@ -187,6 +194,7 @@ Begin cntDatasourceBase cntUsers Cancel = False Caption = "Groups" ControlID = "" + CSSClasses = "" Default = False Enabled = False Height = 38 @@ -200,7 +208,8 @@ Begin cntDatasourceBase cntUsers LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + Outlined = False + PanelIndex = 0 Scope = 2 TabIndex = 3 TabStop = True @@ -212,6 +221,7 @@ Begin cntDatasourceBase cntUsers End Begin WebMessageDialog dlgDrop ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -224,6 +234,7 @@ Begin cntDatasourceBase cntUsers LockTop = True LockVertical = False Message = "" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -231,8 +242,12 @@ Begin cntDatasourceBase cntUsers End Begin WebRectangle rctFilter BackgroundColor = &cFFFFFF + BorderColor = &c000000FF + BorderThickness = 1 ControlCount = 0 ControlID = "" + CornerSize = -1 + CSSClasses = "" Enabled = True HasBackgroundColor= False Height = 75 @@ -248,7 +263,7 @@ Begin cntDatasourceBase cntUsers LockRight = True LockTop = False LockVertical = False - PanelIndex = "0" + PanelIndex = 0 Scope = 2 TabIndex = 1 TabStop = True @@ -262,6 +277,7 @@ Begin cntDatasourceBase cntUsers Begin WebLabel labFilter Bold = True ControlID = "" + CSSClasses = "" Enabled = True FontName = "" FontSize = 0.0 @@ -278,7 +294,7 @@ Begin cntDatasourceBase cntUsers LockTop = True LockVertical = False Multiline = False - PanelIndex = "0" + PanelIndex = 0 Parent = "rctFilter" Scope = 2 TabIndex = 0 @@ -297,6 +313,7 @@ Begin cntDatasourceBase cntUsers Begin WebLabel labFilterGroup Bold = False ControlID = "" + CSSClasses = "" Enabled = True FontName = "" FontSize = 0.0 @@ -313,7 +330,7 @@ Begin cntDatasourceBase cntUsers LockTop = True LockVertical = False Multiline = False - PanelIndex = "0" + PanelIndex = 0 Parent = "rctFilter" Scope = 2 TabIndex = 1 @@ -331,6 +348,7 @@ Begin cntDatasourceBase cntUsers End Begin WebPopupMenu lstFilterGroup ControlID = "" + CSSClasses = "" Enabled = True Height = 38 Index = -2147483648 @@ -346,7 +364,7 @@ Begin cntDatasourceBase cntUsers LockRight = False LockTop = True LockVertical = False - PanelIndex = "0" + PanelIndex = 0 Parent = "rctFilter" RowCount = 0 Scope = 2 @@ -364,6 +382,7 @@ Begin cntDatasourceBase cntUsers End Begin WebMessageDialog dlgMessage ControlID = "" + CSSClasses = "" Enabled = True Explanation = "" Index = -2147483648 @@ -376,6 +395,7 @@ Begin cntDatasourceBase cntUsers LockTop = True LockVertical = False Message = "" + PanelIndex = 0 Scope = 2 Title = "" Tooltip = "" @@ -578,19 +598,6 @@ End End Function #tag EndMethod - #tag Method, Flags = &h0 - Sub Close() - Try - thrDetails.Stop - Catch err As RuntimeException - - End Try - - Super.Close() - - End Sub - #tag EndMethod - #tag Method, Flags = &h0 Sub Constructor() Super.Constructor @@ -753,6 +760,15 @@ End End Sub #tag EndMethod + #tag Method, Flags = &h1 + Protected Sub TableDatasourceLoaded() + Super.TableDatasourceLoaded() + + If ebShowDetails Then Me.ShowDetails() + + End Sub + #tag EndMethod + #tag Method, Flags = &h1 Protected Sub TableInitColumns() Super.TableInitColumns() @@ -798,21 +814,6 @@ End End Sub #tag EndMethod - #tag Method, Flags = &h1 - Protected Sub TableLoad() - Super.TableLoad() - - If ebShowDetails Then - Try - thrDetails.Start - Catch err As RuntimeException - - End Try - End If - - End Sub - #tag EndMethod - #tag Method, Flags = &h1 Protected Sub TableLoadFilters() Super.TableLoadFilters() @@ -922,12 +923,6 @@ End #tag EndWindowCode #tag Events lstInfos - #tag Event - Sub Opening() - Me.ExecuteJavaScript("$('#" + Me.ControlID + "').addClass('listboxUsersHeaderAlignment')") - - End Sub - #tag EndEvent #tag Event Sub SelectionChanged(rows() As Integer) #Pragma unused rows @@ -961,20 +956,6 @@ End End Sub #tag EndEvent #tag EndEvents -#tag Events thrDetails - #tag Event - Sub Run() - Try - If (Not ebShowDetails) Then Return - - Self.ShowDetails() - - Catch err As RuntimeException - End Try - - End Sub - #tag EndEvent -#tag EndEvents #tag Events btnPassword #tag Event Sub Pressed() @@ -1014,6 +995,14 @@ End #tag EndEvent #tag EndEvents #tag ViewBehavior + #tag ViewProperty + Name="PanelIndex" + Visible=false + Group="Behavior" + InitialValue="" + Type="Integer" + EditorType="" + #tag EndViewProperty #tag ViewProperty Name="Area" Visible=false