Skip to content

Commit 261dde3

Browse files
aduguidaduguid
committed
Add namespace and fixed the settings invalidate of the ribbon
1 parent accdc1d commit 261dde3

File tree

7 files changed

+1139
-1124
lines changed

7 files changed

+1139
-1124
lines changed

‎VB/App_Data/ScriptHelp.sdf‎

0 Bytes
Binary file not shown.

‎VB/Scripts/Data.vb‎

Lines changed: 107 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -4,143 +4,147 @@ Imports System.Data
44
Imports System.Data.SqlServerCe
55
Imports System.Security.AccessControl
66

7-
Public Class Data
7+
Namespace Scripts
88

9-
Const dataFolder As String = "App_Data"
9+
Public Class Data
1010

11-
Public Shared Function Connection() As String
12-
Data.SetUserPath()
13-
Dim databaseFile As String = "Data Source=" + Path.Combine(My.Settings.App_PathLocalData, My.Application.Info.ProductName + ".sdf")
14-
Return databaseFile
15-
End Function
11+
Const dataFolder As String = "App_Data"
1612

17-
Public Shared TableAliasTable As New DataTable()
18-
Public Shared DateFormatTable As New DataTable()
19-
Public Shared GraphDataTable As New DataTable()
13+
Public Shared Function Connection() As String
14+
Data.SetUserPath()
15+
Dim databaseFile As String = "Data Source=" + Path.Combine(My.Settings.App_PathLocalData, My.Application.Info.ProductName + ".sdf")
16+
Return databaseFile
17+
End Function
2018

21-
Public Shared Sub CreateTableAliasTable()
22-
Try
23-
Dim columnName As String = "TableName"
24-
Dim dcTableName As New DataColumn(columnName, GetType(String))
25-
TableAliasTable.Rows.Clear()
26-
Dim columns As DataColumnCollection = TableAliasTable.Columns
27-
If columns.Contains(columnName) = False Then
28-
TableAliasTable.Columns.Add(dcTableName)
29-
End If
19+
Public Shared TableAliasTable As New DataTable()
20+
Public Shared DateFormatTable As New DataTable()
21+
Public Shared GraphDataTable As New DataTable()
3022

31-
Dim tableName As String = "TableAlias"
32-
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
23+
Public Shared Sub CreateTableAliasTable()
24+
Try
25+
Dim columnName As String = "TableName"
26+
Dim dcTableName As New DataColumn(columnName, GetType(String))
27+
TableAliasTable.Rows.Clear()
28+
Dim columns As DataColumnCollection = TableAliasTable.Columns
29+
If columns.Contains(columnName) = False Then
30+
TableAliasTable.Columns.Add(dcTableName)
31+
End If
3332

34-
Using da = New SqlCeDataAdapter(sql, Connection())
35-
da.Fill(TableAliasTable)
36-
End Using
33+
Dim tableName As String = "TableAlias"
34+
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
3735

38-
TableAliasTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
36+
Using da = New SqlCeDataAdapter(sql, Connection())
37+
da.Fill(TableAliasTable)
38+
End Using
3939

40-
Catch ex As Exception
41-
'ErrorHandler.DisplayMessage(ex)
40+
TableAliasTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
4241

43-
End Try
42+
Catch ex As Exception
43+
'ErrorHandler.DisplayMessage(ex)
4444

45-
End Sub
45+
End Try
4646

47-
Public Shared Sub CreateDateFormatTable()
48-
Try
49-
Dim columnName As String = "FormatString"
50-
Dim dcFormatString As New DataColumn(columnName, GetType(String))
51-
DateFormatTable.Rows.Clear()
52-
Dim columns As DataColumnCollection = DateFormatTable.Columns
53-
If columns.Contains(columnName) = False Then
54-
DateFormatTable.Columns.Add(dcFormatString)
55-
End If
47+
End Sub
5648

57-
Dim tableName As String = "DateFormat"
58-
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
49+
Public Shared Sub CreateDateFormatTable()
50+
Try
51+
Dim columnName As String = "FormatString"
52+
Dim dcFormatString As New DataColumn(columnName, GetType(String))
53+
DateFormatTable.Rows.Clear()
54+
Dim columns As DataColumnCollection = DateFormatTable.Columns
55+
If columns.Contains(columnName) = False Then
56+
DateFormatTable.Columns.Add(dcFormatString)
57+
End If
5958

60-
Using da = New SqlCeDataAdapter(sql, Connection())
61-
da.Fill(DateFormatTable)
62-
End Using
59+
Dim tableName As String = "DateFormat"
60+
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
6361

64-
DateFormatTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
62+
Using da = New SqlCeDataAdapter(sql, Connection())
63+
da.Fill(DateFormatTable)
64+
End Using
6565

66-
Catch ex As Exception
67-
'ErrorHandler.DisplayMessage(ex)
66+
DateFormatTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
6867

69-
End Try
68+
Catch ex As Exception
69+
'ErrorHandler.DisplayMessage(ex)
7070

71-
End Sub
71+
End Try
7272

73-
Public Shared Sub CreateGraphDataTable()
74-
Try
75-
Dim columnName As String = "ORDR_NBR"
76-
Dim dcFormatString As New DataColumn(columnName, GetType(String))
77-
GraphDataTable.Rows.Clear()
78-
Dim columns As DataColumnCollection = GraphDataTable.Columns
79-
If columns.Contains(columnName) = False Then
80-
GraphDataTable.Columns.Add(dcFormatString)
81-
End If
73+
End Sub
8274

83-
Dim tableName As String = "GraphData"
84-
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
75+
Public Shared Sub CreateGraphDataTable()
76+
Try
77+
Dim columnName As String = "ORDR_NBR"
78+
Dim dcFormatString As New DataColumn(columnName, GetType(String))
79+
GraphDataTable.Rows.Clear()
80+
Dim columns As DataColumnCollection = GraphDataTable.Columns
81+
If columns.Contains(columnName) = False Then
82+
GraphDataTable.Columns.Add(dcFormatString)
83+
End If
8584

86-
Using da = New SqlCeDataAdapter(sql, Connection())
87-
da.Fill(GraphDataTable)
88-
End Using
85+
Dim tableName As String = "GraphData"
86+
Dim sql As String = Convert.ToString((Convert.ToString("SELECT * FROM ") & tableName) + " ORDER BY ") & columnName
8987

90-
GraphDataTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
88+
Using da = New SqlCeDataAdapter(sql, Connection())
89+
da.Fill(GraphDataTable)
90+
End Using
9191

92-
Catch ex As Exception
93-
'ErrorHandler.DisplayMessage(ex)
92+
GraphDataTable.DefaultView.Sort = columnName & Convert.ToString(" asc")
9493

95-
Finally
94+
Catch ex As Exception
95+
'ErrorHandler.DisplayMessage(ex)
9696

97-
End Try
97+
Finally
9898

99-
End Sub
99+
End Try
100100

101-
Public Shared Sub SetServerPath()
102-
Try
103-
Dim versionNumber As String = "" 'AssemblyInfo.versionFolderNumber TODO: FIX THIS
104-
'return Path.Combine(My.Settings.App_PathDeploy, "Application Files", AssemblyInfo.Product + versionNumber, dataFolder, AssemblyInfo.Product + ".sdf.deploy"); //for internal server
105-
Dim baseUrl As New Uri(My.Settings.App_PathDeploy)
106-
Dim relativeUrl As String = (Convert.ToString("Application Files/" + My.Application.Info.ProductName) & versionNumber) + "/" + dataFolder + "/"
107-
Dim combined As New Uri(baseUrl, relativeUrl)
101+
End Sub
108102

109-
My.Settings.App_PathDeployData = combined.ToString()
103+
Public Shared Sub SetServerPath()
104+
Try
105+
Dim versionNumber As String = "" 'AssemblyInfo.versionFolderNumber TODO: FIX THIS
106+
'return Path.Combine(My.Settings.App_PathDeploy, "Application Files", AssemblyInfo.Product + versionNumber, dataFolder, AssemblyInfo.Product + ".sdf.deploy"); //for internal server
107+
Dim baseUrl As New Uri(My.Settings.App_PathDeploy)
108+
Dim relativeUrl As String = (Convert.ToString("Application Files/" + My.Application.Info.ProductName) & versionNumber) + "/" + dataFolder + "/"
109+
Dim combined As New Uri(baseUrl, relativeUrl)
110110

111-
Catch ex As Exception
112-
'ErrorHandler.DisplayMessage(ex)
111+
My.Settings.App_PathDeployData = combined.ToString()
113112

114-
End Try
113+
Catch ex As Exception
114+
'ErrorHandler.DisplayMessage(ex)
115115

116-
End Sub
116+
End Try
117117

118-
Public Shared Sub SetUserPath()
119-
Dim userFilePath As String = String.Empty
120-
Try
121-
If System.Deployment.Application.ApplicationDeployment.IsNetworkDeployed Then
122-
Dim versionNumber As String = "" 'AssemblyInfo.versionFolderNumber TODO: FIX THIS
123-
Dim localAppData As String = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
124-
'userFilePath = Path.Combine(localAppData, AssemblyInfo.Copyright.Replace(" ", "_"), AssemblyInfo.Product, dataFolder)
125-
'if (!Directory.Exists(userFilePath)) Directory.CreateDirectory(userFilePath);
126-
System.IO.Directory.CreateDirectory(userFilePath)
127-
Dim info As New DirectoryInfo(userFilePath)
128-
Dim security As DirectorySecurity = info.GetAccessControl()
129-
security.AddAccessRule(New FileSystemAccessRule("Everyone", FileSystemRights.Modify, InheritanceFlags.ContainerInherit, PropagationFlags.None, AccessControlType.Allow))
130-
security.AddAccessRule(New FileSystemAccessRule("Everyone", FileSystemRights.Modify, InheritanceFlags.ObjectInherit, PropagationFlags.None, AccessControlType.Allow))
118+
End Sub
119+
120+
Public Shared Sub SetUserPath()
121+
Dim userFilePath As String = String.Empty
122+
Try
123+
If System.Deployment.Application.ApplicationDeployment.IsNetworkDeployed Then
124+
Dim versionNumber As String = "" 'AssemblyInfo.versionFolderNumber TODO: FIX THIS
125+
Dim localAppData As String = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
126+
'userFilePath = Path.Combine(localAppData, AssemblyInfo.Copyright.Replace(" ", "_"), AssemblyInfo.Product, dataFolder)
127+
'if (!Directory.Exists(userFilePath)) Directory.CreateDirectory(userFilePath);
128+
System.IO.Directory.CreateDirectory(userFilePath)
129+
Dim info As New DirectoryInfo(userFilePath)
130+
Dim security As DirectorySecurity = info.GetAccessControl()
131+
security.AddAccessRule(New FileSystemAccessRule("Everyone", FileSystemRights.Modify, InheritanceFlags.ContainerInherit, PropagationFlags.None, AccessControlType.Allow))
132+
security.AddAccessRule(New FileSystemAccessRule("Everyone", FileSystemRights.Modify, InheritanceFlags.ObjectInherit, PropagationFlags.None, AccessControlType.Allow))
133+
134+
info.SetAccessControl(security)
135+
Else
136+
userFilePath = "C:\Users\tduguid\Source\Repos\ScriptHelp2\VB\App_Data\" 'System.IO.Path.Combine(AssemblyInfo.GetClickOnceLocation(), dataFolder)
137+
End If
131138

132-
info.SetAccessControl(security)
133-
Else
134-
userFilePath = "C:\Users\tduguid\Source\Repos\ScriptHelp2\VB\App_Data\" 'System.IO.Path.Combine(AssemblyInfo.GetClickOnceLocation(), dataFolder)
135-
End If
139+
My.Settings.App_PathLocalData = userFilePath
136140

137-
My.Settings.App_PathLocalData = userFilePath
141+
Catch ex As Exception
142+
'ErrorHandler.DisplayMessage(ex)
138143

139-
Catch ex As Exception
140-
'ErrorHandler.DisplayMessage(ex)
144+
End Try
141145

142-
End Try
146+
End Sub
143147

144-
End Sub
148+
End Class
145149

146-
End Class
150+
End Namespace

0 commit comments

Comments
 (0)