Skip to content

Commit 9349839

Browse files
MicmazMicmaz
committedAug 15, 2022
Added separate report settings connection, Added default parameters as a shared property on reports.
Added Fusion charts folder for paid version of that tool, excluded any .js that is theirs.
1 parent 3fcca4e commit 9349839

30 files changed

+2797
-319
lines changed
 

‎FusionCharts/Chart.vb

+871
Large diffs are not rendered by default.

‎FusionCharts/ChartBase.vb

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
Imports System.Web.UI.WebControls
2+
Imports System.Web.UI
3+
4+
Public MustInherit Class ChartBase
5+
Inherits Panel
6+
7+
Protected innerpnl As New Panel
8+
Protected content As New LiteralControl
9+
'Public MustOverride Function getSwfFile() As String
10+
Public MustOverride Function outputXML() As String
11+
12+
13+
Private _chartType As Integer = 0
14+
Public Property chartType() As Chart.chartTypeEnum
15+
Get
16+
Return _chartType
17+
End Get
18+
Set(ByVal value As Chart.chartTypeEnum)
19+
_chartType = value
20+
End Set
21+
End Property
22+
23+
Private _dataurl As String = Nothing
24+
Public Property dataUrl() As String
25+
Get
26+
Return _dataurl
27+
End Get
28+
Set(ByVal value As String)
29+
_dataurl = value
30+
End Set
31+
End Property
32+
33+
Private _debugmode As Boolean = False
34+
Public Property debugMode() As Boolean
35+
Get
36+
Return _debugmode
37+
End Get
38+
Set(ByVal value As Boolean)
39+
_debugmode = value
40+
End Set
41+
End Property
42+
43+
44+
Protected Overrides Sub Render(ByVal writer As System.Web.UI.HtmlTextWriter)
45+
innerpnl.Width = Me.Width
46+
innerpnl.Height = Me.Height
47+
innerpnl.ID = "innerpnl" & Me.ID
48+
content.Text = getContent()
49+
MyBase.Render(writer)
50+
End Sub
51+
52+
Private Function getContent() As String
53+
'Dim chartfile As String = getSwfFile()
54+
'Dim swf As String = Page.ClientScript.GetWebResourceUrl(Me.GetType(), "FusionCharts." & chartfile)
55+
'Dim swf As String = BaseClasses.Scripts.ScriptsURL(True) & "/FusionCharts/" & chartfile
56+
'Dim swf As String = BaseClasses.Scripts.ScriptsURL(True) & "/FusionCharts/" & chartType.ToString() & ".swf"
57+
'swf = swf.Trim("/")
58+
Dim swfid As String = Me.ClientID & "swf"
59+
Dim xml As String
60+
Dim i As Integer = New Random().Next()
61+
Dim var As String = "dynchart" & i
62+
If dataUrl Is Nothing Then
63+
xml = var & ".setXMLData(""" & JavaScriptEncode(outputXML()) & """);"
64+
Else
65+
xml = var & ".setDataURL(""" & Me.dataUrl & """);"
66+
End If
67+
' Return " <script type=""text/javascript""> " & vbCrLf & _
68+
'" var " & var & " = new FusionCharts(""" & swf & """, """ & swfid & """, """ & Me.Width.Value & """, """ & Me.Height.Value & """, ""0"", ""1"");" & vbCrLf & _
69+
'xml & vbCrLf & _
70+
'var & ".addParam(""wmode"", ""opaque"");" & vbCrLf & _
71+
'var & ".render(""" & innerpnl.ClientID & """);" & vbCrLf & _
72+
'" </script> " & vbCrLf
73+
Return " <script type=""text/javascript""> var " & var & ";" & vbCrLf & _
74+
" $(function(){ " & var & " = new FusionCharts(""" & chartType.ToString() & """, """ & swfid & """, """ & Me.Width.Value & """, """ & Me.Height.Value & """, ""0"", ""1"");" & vbCrLf & _
75+
xml & vbCrLf & _
76+
var & ".render(""" & innerpnl.ClientID & """);" & vbCrLf & _
77+
" }); </script> " & vbCrLf
78+
79+
End Function
80+
81+
Public Shared Function JavaScriptEncode(ByVal Str As String) As String
82+
83+
Str = Replace(Str, "\", "\\")
84+
Str = Replace(Str, "'", "\'")
85+
Str = Replace(Str, """", "\""")
86+
Str = Replace(Str, Chr(8), "\b")
87+
Str = Replace(Str, Chr(9), "\t")
88+
Str = Replace(Str, Chr(10), "\r")
89+
Str = Replace(Str, Chr(12), "\f")
90+
Str = Replace(Str, Chr(13), "\n")
91+
92+
Return Str
93+
94+
End Function
95+
96+
Private Sub Chart_Init(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Init
97+
'Dim scriptLocation As String = Page.ClientScript.GetWebResourceUrl(Me.GetType(), "FusionCharts.FusionCharts.js")
98+
'scriptLocation = scriptLocation.Trim("/")
99+
'Page.ClientScript.RegisterClientScriptInclude("FusionCharts.FusionCharts.js", scriptLocation)
100+
101+
registerControl(Me.Page)
102+
103+
innerpnl.Controls.Add(content)
104+
Me.Controls.Add(innerpnl)
105+
106+
End Sub
107+
108+
''' <summary>
109+
''' Registers all necessary javascript and css files for this control to function on the page.
110+
''' </summary>
111+
''' <param name="page"></param>
112+
''' <remarks></remarks>
113+
<System.ComponentModel.Description("Registers all necessary javascript and css files for this control to function on the page.")> _
114+
Public Shared Sub registerControl(ByVal page As Page)
115+
If Not page Is Nothing Then
116+
jQueryLibrary.jQueryInclude.addScriptFile(page, "/FusionCharts/FusionCharts.js")
117+
jQueryLibrary.jQueryInclude.addScriptFile(page, "/FusionCharts/themes.js")
118+
End If
119+
End Sub
120+
121+
Public Function removeValue(valueName As String) As Boolean
122+
If props.containsKey(valueName) Then
123+
props.remove(valueName)
124+
Return True
125+
End If
126+
Return False
127+
End Function
128+
129+
Protected props As New PropertyHash()
130+
Public Property xmlprop(ByVal propname As String) As String
131+
Get
132+
Return props.xmlprop(propname)
133+
End Get
134+
Set(ByVal value As String)
135+
props.xmlprop(propname) = value
136+
End Set
137+
End Property
138+
139+
Public Property xmlBoolProp(ByVal propname As String) As Boolean
140+
Get
141+
Return props.xmlBoolProp(propname)
142+
End Get
143+
Set(ByVal value As Boolean)
144+
props.xmlBoolProp(propname) = value
145+
End Set
146+
End Property
147+
148+
Public Enum palettEnum
149+
Not_Set = 0
150+
Green = 1
151+
Grey = 2
152+
Brown = 3
153+
Blue = 4
154+
Red = 5
155+
End Enum
156+
157+
Public Enum labelDisplayEnum
158+
Not_Set = 0
159+
WRAP
160+
STAGGER
161+
ROTATE
162+
NONE
163+
SLANT
164+
End Enum
165+
166+
Public Enum ChartTheme
167+
None
168+
Flint
169+
Fire
170+
Carbon
171+
Ocean
172+
Zune
173+
End Enum
174+
175+
Public Enum BooleanDefault
176+
[No]
177+
[Yes]
178+
[Default]
179+
End Enum
180+
181+
Public Shared Function parseColor(ByVal hexstring As String) As System.Drawing.Color
182+
Try
183+
Dim r As Integer = Integer.Parse(hexstring.Substring(0, 2), Globalization.NumberStyles.HexNumber)
184+
Dim g As Integer = Integer.Parse(hexstring.Substring(2, 2), Globalization.NumberStyles.HexNumber)
185+
Dim b As Integer = Integer.Parse(hexstring.Substring(4, 2), Globalization.NumberStyles.HexNumber)
186+
Return System.Drawing.Color.FromArgb(r, g, b)
187+
Catch ex As Exception
188+
Return Nothing
189+
End Try
190+
End Function
191+
192+
Public Shared Function getColorHex(ByVal color As System.Drawing.Color) As String
193+
If color = Nothing Then Return Nothing
194+
Try
195+
Return String.Format("{0:X2}{1:X2}{2:X2}", color.R, color.G, color.B)
196+
Catch ex As Exception
197+
Return Nothing
198+
End Try
199+
End Function
200+
201+
End Class
202+

‎FusionCharts/DragChart.vb

+421
Large diffs are not rendered by default.

‎FusionCharts/FusionCharts.vbproj

+125
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>9.0.30729</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{A4E0DC55-9DD6-4CF8-B136-98A170B6FDEF}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>FusionCharts</RootNamespace>
11+
<AssemblyName>FusionCharts</AssemblyName>
12+
<MyType>WebControl</MyType>
13+
<FileUpgradeFlags>
14+
</FileUpgradeFlags>
15+
<UpgradeBackupLocation>
16+
</UpgradeBackupLocation>
17+
<OldToolsVersion>3.5</OldToolsVersion>
18+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
19+
<TargetFrameworkProfile />
20+
</PropertyGroup>
21+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22+
<DebugSymbols>true</DebugSymbols>
23+
<DebugType>full</DebugType>
24+
<DefineDebug>true</DefineDebug>
25+
<DefineTrace>true</DefineTrace>
26+
<OutputPath>..\..\_Output\</OutputPath>
27+
<DocumentationFile>FusionCharts.xml</DocumentationFile>
28+
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31+
<DebugType>pdbonly</DebugType>
32+
<DefineDebug>false</DefineDebug>
33+
<DefineTrace>true</DefineTrace>
34+
<Optimize>true</Optimize>
35+
<OutputPath>..\..\_Output\</OutputPath>
36+
<DocumentationFile>FusionCharts.xml</DocumentationFile>
37+
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
38+
</PropertyGroup>
39+
<ItemGroup>
40+
<Reference Include="DTIControls, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<SpecificVersion>False</SpecificVersion>
42+
<HintPath>..\..\..\tester\DTIControls\_Output\DTIControls.dll</HintPath>
43+
</Reference>
44+
<Reference Include="System" />
45+
<Reference Include="System.Data" />
46+
<Reference Include="System.Data.DataSetExtensions" />
47+
<Reference Include="System.Drawing" />
48+
<Reference Include="System.Management" />
49+
<Reference Include="System.Web" />
50+
<Reference Include="System.Xml" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Import Include="Microsoft.VisualBasic" />
54+
<Import Include="System" />
55+
<Import Include="System.Collections" />
56+
<Import Include="System.Collections.Generic" />
57+
<Import Include="System.Data" />
58+
<Import Include="System.Diagnostics" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<Compile Include="Chart.vb" />
62+
<Compile Include="ChartBase.vb" />
63+
<Compile Include="dataXml.vb" />
64+
<Compile Include="DragChart.vb" />
65+
<Compile Include="FusionGraph.ascx.designer.vb">
66+
<DependentUpon>FusionGraph.ascx.vb</DependentUpon>
67+
</Compile>
68+
<Compile Include="FusionGraph.ascx.vb">
69+
<DependentUpon>FusionGraph.ascx</DependentUpon>
70+
<SubType>ASPXCodeBehind</SubType>
71+
</Compile>
72+
<Compile Include="My Project\Application.Designer.vb">
73+
<AutoGen>True</AutoGen>
74+
<DependentUpon>Application.myapp</DependentUpon>
75+
</Compile>
76+
<Compile Include="My Project\AssemblyInfo.vb" />
77+
<Compile Include="PropertyHash.vb" />
78+
<Compile Include="xmlDataObject.vb" />
79+
</ItemGroup>
80+
<ItemGroup>
81+
<EmbeddedResource Include="js\fusioncharts.charts.js" />
82+
<EmbeddedResource Include="js\fusioncharts.gantt.js" />
83+
<EmbeddedResource Include="js\fusioncharts.js" />
84+
<EmbeddedResource Include="js\fusioncharts.maps.js" />
85+
<EmbeddedResource Include="js\fusioncharts.powercharts.js" />
86+
<EmbeddedResource Include="js\fusioncharts.widgets.js" />
87+
<EmbeddedResource Include="js\maps\maps.fusioncharts.usa.js" />
88+
<EmbeddedResource Include="js\maps\maps.fusioncharts.world.js" />
89+
<EmbeddedResource Include="js\themes\themes.fusioncharts.theme.carbon.js" />
90+
<EmbeddedResource Include="js\themes\themes.fusioncharts.theme.fint.js" />
91+
<EmbeddedResource Include="js\themes\themes.fusioncharts.theme.ocean.js" />
92+
<EmbeddedResource Include="js\themes\themes.fusioncharts.theme.zune.js" />
93+
</ItemGroup>
94+
<ItemGroup>
95+
<EmbeddedResource Include="js\themes\themes.fusioncharts.theme.fire.js" />
96+
</ItemGroup>
97+
<ItemGroup>
98+
<EmbeddedResource Include="js\themes\themes.js" />
99+
</ItemGroup>
100+
<ItemGroup>
101+
<None Include="My Project\Application.myapp">
102+
<Generator>MyApplicationCodeGenerator</Generator>
103+
<LastGenOutput>Application.Designer.vb</LastGenOutput>
104+
</None>
105+
</ItemGroup>
106+
<ItemGroup>
107+
<ProjectReference Include="..\Reporting\Reporting.vbproj">
108+
<Project>{9ad06030-79e7-4b75-a3f7-ebf9ca757047}</Project>
109+
<Name>Reporting</Name>
110+
</ProjectReference>
111+
</ItemGroup>
112+
<ItemGroup>
113+
<EmbeddedResource Include="FusionGraph.ascx">
114+
<SubType>ASPXCodeBehind</SubType>
115+
</EmbeddedResource>
116+
</ItemGroup>
117+
<Import Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
118+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
119+
Other similar extension points exist, see Microsoft.Common.targets.
120+
<Target Name="BeforeBuild">
121+
</Target>
122+
<Target Name="AfterBuild">
123+
</Target>
124+
-->
125+
</Project>

‎FusionCharts/FusionGraph.ascx

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<%@ Control Language="vb" AutoEventWireup="false" CodeBehind="FusionGraph.ascx.vb" Inherits="FusionCharts.FusionGraph" %>
2+
<%@ Register Assembly="FusionCharts" Namespace="FusionCharts" TagPrefix="cc1" %>
3+
<cc1:Chart ID="Chart1" runat="server" Height="354px" Width="508px">
4+
</cc1:Chart>
5+
6+

‎FusionCharts/FusionGraph.ascx.designer.vb

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FusionCharts/FusionGraph.ascx.vb

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
Imports System.Text.RegularExpressions
2+
Imports Reporting
3+
Partial Public Class FusionGraph
4+
Inherits BaseGraph
5+
6+
7+
Public Overrides Sub bindToDisplay()
8+
Me.Chart1.data = Me.dt
9+
Me.dynamicObject = Chart1
10+
Chart1.chartTitle = Me.graph.GraphName
11+
If parentReport IsNot Nothing Then
12+
If parentReport.graphsDT.Count > graph.myIndex Then Me.Chart1.drillable = True
13+
End If
14+
Me.Chart1.drillable = Me.graph.drillable
15+
MyBase.bindToDisplay()
16+
End Sub
17+
18+
Private Sub Chart1_DrillDownEvent(ByVal sender As FusionCharts.Chart, ByVal row As System.Data.DataRow, ByVal columnName As String, ByVal columnValue As String) Handles Chart1.DrillDownEvent
19+
doDrilldown(row)
20+
End Sub
21+
22+
Public Overrides ReadOnly Property propertyList() As String
23+
Get
24+
Return "chartTitle,chartType,formatNumberScale,Height,Width,numberOfSeries,numberPrefix,numberSuffix,palette,rotateValues,displayedTextColStr,showValues,Wrap,setAdaptiveYMin,xAxisMinValue,xAxisMaxValue,yAxisMinValue,yAxisMaxValue,xAxisName,yAxisName,addtionalChartProperties,baseFontSize,baseFont,baseFontColor,labelDisplay,roundEdges,showBorder,theme,showShadow,showGradient,showPlotBorder,animation,backgroundColor,canvasColor,captionColor,showLegend,plotSpacePercent,chartColors"
25+
End Get
26+
End Property
27+
28+
Private Sub DynamicPropertyEditor1_objectPropertiesSet(ByVal objectInstance As Object) Handles propgrid.objectPropertiesSet
29+
Dim regex1 As Regex = New Regex("\x40\w+", RegexOptions.IgnoreCase Or RegexOptions.CultureInvariant Or RegexOptions.IgnorePatternWhitespace Or RegexOptions.Compiled)
30+
Dim i As Integer = 0
31+
Dim parms As New Generic.List(Of Object)
32+
If Chart1.chartTitle Is Nothing Then Chart1.chartTitle = ""
33+
For Each singleMatch As Match In regex1.Matches(Chart1.chartTitle)
34+
Dim key As String = singleMatch.ToString.ToLower.Substring(1)
35+
If graph.clickedvals.ContainsKey(key) Then
36+
Chart1.chartTitle = Chart1.chartTitle.Replace(singleMatch.Value, graph.clickedvals(key))
37+
End If
38+
Next
39+
End Sub
40+
End Class

‎FusionCharts/My Project/Application.Designer.vb

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FusionCharts/My Project/Application.myapp

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<MySubMain>false</MySubMain>
4+
<SingleInstance>false</SingleInstance>
5+
<ShutdownMode>0</ShutdownMode>
6+
<EnableVisualStyles>true</EnableVisualStyles>
7+
<AuthenticationMode>0</AuthenticationMode>
8+
<ApplicationType>1</ApplicationType>
9+
<SaveMySettingsOnExit>true</SaveMySettingsOnExit>
10+
</MyApplicationData>

‎FusionCharts/My Project/AssemblyInfo.vb

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
Imports System
2+
Imports System.Reflection
3+
Imports System.Runtime.InteropServices
4+
Imports System.Runtime.CompilerServices
5+
Imports System.Web.UI
6+
7+
' General Information about an assembly is controlled through the following
8+
' set of attributes. Change these attribute values to modify the information
9+
' associated with an assembly.
10+
11+
' Review the values of the assembly attributes
12+
13+
<Assembly: AssemblyTitle("FusionCharts")>
14+
<Assembly: AssemblyDescription("")>
15+
<Assembly: AssemblyCompany("")>
16+
<Assembly: AssemblyProduct("FusionCharts")>
17+
<Assembly: AssemblyCopyright("Copyright © 2009")>
18+
<Assembly: AssemblyTrademark("")>
19+
20+
<Assembly: ComVisible(False)>
21+
22+
'The following GUID is for the ID of the typelib if this project is exposed to COM
23+
<Assembly: Guid("275df2c0-b05a-4565-a8da-49cfce3c5f39")>
24+
25+
' Version information for an assembly consists of the following four values:
26+
'
27+
' Major Version
28+
' Minor Version
29+
' Build Number
30+
' Revision
31+
'
32+
' You can specify all the values or you can default the Build and Revision Numbers
33+
' by using the '*' as shown below:
34+
' <Assembly: AssemblyVersion("1.0.*")>
35+
36+
<Assembly: AssemblyVersion("1.0.0.0")>
37+
<Assembly: AssemblyFileVersion("1.0.0.0")>
38+
<Assembly: WebResource("FusionCharts.Area2D.swf", "application/x-shockwave-flash")>
39+
<Assembly: WebResource("FusionCharts.Bar2D.swf", "application/x-shockwave-flash")>
40+
<Assembly: WebResource("FusionCharts.Bubble.swf", "application/x-shockwave-flash")>
41+
<Assembly: WebResource("FusionCharts.Column2D.swf", "application/x-shockwave-flash")>
42+
<Assembly: WebResource("FusionCharts.Column3D.swf", "application/x-shockwave-flash")>
43+
<Assembly: WebResource("FusionCharts.Doughnut2D.swf", "application/x-shockwave-flash")>
44+
<Assembly: WebResource("FusionCharts.Doughnut3D.swf", "application/x-shockwave-flash")>
45+
<Assembly: WebResource("FusionCharts.FCExporter.swf", "application/x-shockwave-flash")>
46+
<Assembly: WebResource("FusionCharts.Line.swf", "application/x-shockwave-flash")>
47+
<Assembly: WebResource("FusionCharts.MSArea.swf", "application/x-shockwave-flash")>
48+
<Assembly: WebResource("FusionCharts.MSBar2D.swf", "application/x-shockwave-flash")>
49+
<Assembly: WebResource("FusionCharts.MSBar3D.swf", "application/x-shockwave-flash")>
50+
<Assembly: WebResource("FusionCharts.MSColumn2D.swf", "application/x-shockwave-flash")>
51+
<Assembly: WebResource("FusionCharts.MSColumn3D.swf", "application/x-shockwave-flash")>
52+
<Assembly: WebResource("FusionCharts.MSColumn3DLineDY.swf", "application/x-shockwave-flash")>
53+
<Assembly: WebResource("FusionCharts.MSColumnLine3D.swf", "application/x-shockwave-flash")>
54+
<Assembly: WebResource("FusionCharts.MSCombi2D.swf", "application/x-shockwave-flash")>
55+
<Assembly: WebResource("FusionCharts.MSCombi3D.swf", "application/x-shockwave-flash")>
56+
<Assembly: WebResource("FusionCharts.MSCombiDY2D.swf", "application/x-shockwave-flash")>
57+
<Assembly: WebResource("FusionCharts.MSLine.swf", "application/x-shockwave-flash")>
58+
<Assembly: WebResource("FusionCharts.MSStackedColumn2D.swf", "application/x-shockwave-flash")>
59+
<Assembly: WebResource("FusionCharts.MSStackedColumn2DLineDY.swf", "application/x-shockwave-flash")>
60+
<Assembly: WebResource("FusionCharts.Pie2D.swf", "application/x-shockwave-flash")>
61+
<Assembly: WebResource("FusionCharts.Pie3D.swf", "application/x-shockwave-flash")>
62+
<Assembly: WebResource("FusionCharts.Scatter.swf", "application/x-shockwave-flash")>
63+
<Assembly: WebResource("FusionCharts.ScrollArea2D.swf", "application/x-shockwave-flash")>
64+
<Assembly: WebResource("FusionCharts.ScrollColumn2D.swf", "application/x-shockwave-flash")>
65+
<Assembly: WebResource("FusionCharts.ScrollCombi2D.swf", "application/x-shockwave-flash")>
66+
<Assembly: WebResource("FusionCharts.ScrollCombiDY2D.swf", "application/x-shockwave-flash")>
67+
<Assembly: WebResource("FusionCharts.ScrollLine2D.swf", "application/x-shockwave-flash")>
68+
<Assembly: WebResource("FusionCharts.ScrollStackedColumn2D.swf", "application/x-shockwave-flash")>
69+
<Assembly: WebResource("FusionCharts.SSGrid.swf", "application/x-shockwave-flash")>
70+
<Assembly: WebResource("FusionCharts.StackedArea2D.swf", "application/x-shockwave-flash")>
71+
<Assembly: WebResource("FusionCharts.StackedBar2D.swf", "application/x-shockwave-flash")>
72+
<Assembly: WebResource("FusionCharts.StackedBar3D.swf", "application/x-shockwave-flash")>
73+
<Assembly: WebResource("FusionCharts.StackedColumn2D.swf", "application/x-shockwave-flash")>
74+
<Assembly: WebResource("FusionCharts.StackedColumn3D.swf", "application/x-shockwave-flash")>
75+
<Assembly: WebResource("FusionCharts.DragNode.swf", "application/x-shockwave-flash")>
76+
<Assembly: WebResource("FusionCharts.StackedColumn3DLineDY.swf", "application/x-shockwave-flash")>
77+
<Assembly: WebResource("FusionCharts.Charts.js", "text/js")>
78+
<Assembly: WebResource("FusionCharts.FusionCharts.js", "text/js")>

‎FusionCharts/My Project/Resources.Designer.vb

+63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FusionCharts/My Project/Resources.resx

+117
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:element name="root" msdata:IsDataSet="true">
64+
<xsd:complexType>
65+
<xsd:choice maxOccurs="unbounded">
66+
<xsd:element name="metadata">
67+
<xsd:complexType>
68+
<xsd:sequence>
69+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
70+
</xsd:sequence>
71+
<xsd:attribute name="name" type="xsd:string" />
72+
<xsd:attribute name="type" type="xsd:string" />
73+
<xsd:attribute name="mimetype" type="xsd:string" />
74+
</xsd:complexType>
75+
</xsd:element>
76+
<xsd:element name="assembly">
77+
<xsd:complexType>
78+
<xsd:attribute name="alias" type="xsd:string" />
79+
<xsd:attribute name="name" type="xsd:string" />
80+
</xsd:complexType>
81+
</xsd:element>
82+
<xsd:element name="data">
83+
<xsd:complexType>
84+
<xsd:sequence>
85+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
86+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
87+
</xsd:sequence>
88+
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
89+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
90+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
91+
</xsd:complexType>
92+
</xsd:element>
93+
<xsd:element name="resheader">
94+
<xsd:complexType>
95+
<xsd:sequence>
96+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
97+
</xsd:sequence>
98+
<xsd:attribute name="name" type="xsd:string" use="required" />
99+
</xsd:complexType>
100+
</xsd:element>
101+
</xsd:choice>
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:schema>
105+
<resheader name="resmimetype">
106+
<value>text/microsoft-resx</value>
107+
</resheader>
108+
<resheader name="version">
109+
<value>2.0</value>
110+
</resheader>
111+
<resheader name="reader">
112+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
113+
</resheader>
114+
<resheader name="writer">
115+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
</root>

‎FusionCharts/My Project/Settings.Designer.vb

+73
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎FusionCharts/My Project/Settings.settings

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
3+
<Profiles>
4+
<Profile Name="(Default)" />
5+
</Profiles>
6+
<Settings />
7+
</SettingsFile>

‎FusionCharts/PropertyHash.vb

+131
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
Public Class PropertyHash
2+
3+
4+
5+
Private _propht As New Hashtable
6+
Public Property xmlprop(ByVal propname As String) As String
7+
Get
8+
Return _propht(propname)
9+
End Get
10+
Set(ByVal value As String)
11+
_propht(propname) = value
12+
End Set
13+
End Property
14+
15+
Public Function containsKey(ByVal keyname As String) As Boolean
16+
Return _propht.ContainsKey(keyname)
17+
End Function
18+
19+
Public Sub remove(ByVal propname As String)
20+
_propht.Remove(propname)
21+
End Sub
22+
23+
Public Property xmlBoolProp(ByVal propname As String) As Boolean
24+
Get
25+
If xmlprop(propname) Is Nothing Then Return False
26+
If xmlprop(propname) = "1" Then Return True
27+
Return False
28+
End Get
29+
Set(ByVal value As Boolean)
30+
If value Then
31+
xmlprop(propname) = "1"
32+
Else
33+
xmlprop(propname) = "0"
34+
End If
35+
End Set
36+
End Property
37+
38+
Public Property xmlColorProperty(ByVal propname As String) As Drawing.Color
39+
Get
40+
Return getColor(xmlprop(propname))
41+
End Get
42+
Set(value As Drawing.Color)
43+
If value = Nothing Then
44+
remove(propname)
45+
Else
46+
xmlprop(propname) = getColorString(value)
47+
End If
48+
End Set
49+
End Property
50+
51+
Public Property xmlBoolDefault(ByVal propname As String) As ChartBase.BooleanDefault
52+
Get
53+
If xmlprop(propname) Is Nothing Then Return ChartBase.BooleanDefault.Default
54+
If xmlprop(propname) = "1" Then Return ChartBase.BooleanDefault.Yes
55+
Return ChartBase.BooleanDefault.No
56+
End Get
57+
Set(ByVal value As ChartBase.BooleanDefault)
58+
If value = ChartBase.BooleanDefault.Yes Then
59+
xmlprop(propname) = "1"
60+
ElseIf value = ChartBase.BooleanDefault.No Then
61+
xmlprop(propname) = "0"
62+
End If
63+
If value = ChartBase.BooleanDefault.Default Then
64+
remove(propname)
65+
End If
66+
End Set
67+
End Property
68+
69+
Public Property xmlpropString() As String
70+
Get
71+
Dim outstr As String = ""
72+
For Each key As String In _propht.Keys
73+
outstr &= key & "='" & _propht(key) & "' "
74+
Next
75+
Return outstr
76+
End Get
77+
Set(ByVal value As String)
78+
If value Is Nothing OrElse value.Trim = "" Then
79+
Else
80+
value = value & " "
81+
_propht.Clear()
82+
For Each val As String In value.Split("' ")
83+
Dim vals() As String = val.Split("='")
84+
If vals.Length > 1 Then
85+
_propht.Add(vals(0), vals(1))
86+
End If
87+
Next
88+
End If
89+
End Set
90+
End Property
91+
92+
Private _tag As String = "dataset"
93+
Public Property tag() As String
94+
Get
95+
Return _tag
96+
End Get
97+
Set(ByVal value As String)
98+
_tag = value
99+
End Set
100+
End Property
101+
102+
Public Function getColor(color As String) As Drawing.Color
103+
Try
104+
Return System.Drawing.ColorTranslator.FromHtml(color)
105+
Catch ex As Exception
106+
107+
End Try
108+
Return Nothing
109+
End Function
110+
111+
Public Function getColorString(color As Drawing.Color) As String
112+
If color = Nothing Then Return ""
113+
Return String.Format("#{0:X2}{1:X2}{2:X2}", color.R, color.G, color.B)
114+
End Function
115+
116+
Public Overridable Function outputXML(ByVal innerText As String) As String
117+
Dim out As String = "<" & tag & " " & xmlpropString & " >" & innerText & "</" & tag & ">"
118+
Return out
119+
End Function
120+
121+
Public Overridable Function outputsingleTagXML() As String
122+
Dim out As String = "<" & tag & " " & xmlpropString & " />"
123+
Return out
124+
End Function
125+
126+
Public Sub New(Optional ByVal tagname As String = Nothing)
127+
If Not tagname Is Nothing Then tag = tagname
128+
End Sub
129+
130+
End Class
131+

‎FusionCharts/dataXml.vb

Whitespace-only changes.

‎FusionCharts/mapChart.vb

+482
Large diffs are not rendered by default.

‎FusionCharts/xmlDataObject.vb

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
2+
Public Class xmlDataObject
3+
4+
Public props As New PropertyHash()
5+
6+
Public Property tag() As String
7+
Get
8+
Return props.tag
9+
End Get
10+
Set(ByVal value As String)
11+
props.tag = value
12+
End Set
13+
End Property
14+
15+
Public Property xmlprop(ByVal propname As String) As String
16+
Get
17+
Return props.xmlprop(propname)
18+
End Get
19+
Set(ByVal value As String)
20+
props.xmlprop(propname) = value
21+
End Set
22+
End Property
23+
24+
Public Property xmlBoolProp(ByVal propname As String) As Boolean
25+
Get
26+
Return props.xmlBoolProp(propname)
27+
End Get
28+
Set(ByVal value As Boolean)
29+
props.xmlBoolProp(propname) = value
30+
End Set
31+
End Property
32+
33+
End Class

‎Reporting.sln

+8-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "FusionChartsFreeware", "Fus
1111
EndProject
1212
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "FusionCharts", "FusionCharts\FusionCharts.vbproj", "{A4E0DC55-9DD6-4CF8-B136-98A170B6FDEF}"
1313
EndProject
14-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DTIGrid", "..\DTIGrid\DTIGrid\DTIGrid.vbproj", "{D159EA22-D9CC-43A8-94A9-D238683E8767}"
14+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DTIGrid", "..\DTIGrid\DTIGrid\DTIGrid.vbproj", "{D75AC42D-C5D5-4223-B808-31F36457CA5F}"
1515
EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "_reportTester", "_reportTester\_reportTester.csproj", "{10CB324E-A733-472C-B14C-30EA57AD2D82}"
1717
EndProject
@@ -37,10 +37,10 @@ Global
3737
{A4E0DC55-9DD6-4CF8-B136-98A170B6FDEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
3838
{A4E0DC55-9DD6-4CF8-B136-98A170B6FDEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
3939
{A4E0DC55-9DD6-4CF8-B136-98A170B6FDEF}.Release|Any CPU.Build.0 = Release|Any CPU
40-
{D159EA22-D9CC-43A8-94A9-D238683E8767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41-
{D159EA22-D9CC-43A8-94A9-D238683E8767}.Debug|Any CPU.Build.0 = Debug|Any CPU
42-
{D159EA22-D9CC-43A8-94A9-D238683E8767}.Release|Any CPU.ActiveCfg = Release|Any CPU
43-
{D159EA22-D9CC-43A8-94A9-D238683E8767}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{D75AC42D-C5D5-4223-B808-31F36457CA5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{D75AC42D-C5D5-4223-B808-31F36457CA5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{D75AC42D-C5D5-4223-B808-31F36457CA5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{D75AC42D-C5D5-4223-B808-31F36457CA5F}.Release|Any CPU.Build.0 = Release|Any CPU
4444
{10CB324E-A733-472C-B14C-30EA57AD2D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4545
{10CB324E-A733-472C-B14C-30EA57AD2D82}.Debug|Any CPU.Build.0 = Debug|Any CPU
4646
{10CB324E-A733-472C-B14C-30EA57AD2D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -49,4 +49,7 @@ Global
4949
GlobalSection(SolutionProperties) = preSolution
5050
HideSolutionNode = FALSE
5151
EndGlobalSection
52+
GlobalSection(ExtensibilityGlobals) = postSolution
53+
SolutionGuid = {D30505AE-7030-458C-89F9-F40E08B37606}
54+
EndGlobalSection
5255
EndGlobal

‎Reporting/QueryBuilder/js/QueryBuilder.js

+17-11
Original file line numberDiff line numberDiff line change
@@ -167,28 +167,33 @@ function setupData(schema, targetElement) {
167167
*/
168168

169169
function loadData(){
170-
$.getJSON(schemaExtendedJsonCall, {}, function (data) {
171-
tableSchemaExtended = data;
172-
}).fail(ajaxError);
170+
173171
$.getJSON(schemaJsonCall, {}, function (data) {
174-
tableSchema = data;
175-
var externalTables=""; //Tables in external Schema that aren't in the main database.
172+
tableSchema = $.extendext(true, 'concat', tableSchema, data);
173+
loadExternalTables();
174+
}).fail(ajaxError);
175+
$("body").trigger("dataloaded");
176+
}
177+
178+
function loadExternalTables(expandedNode){
179+
$.getJSON(schemaExtendedJsonCall, {}, function (data) {
180+
tableSchemaExtended = data;
181+
var externalTables=""; //Tables in external Schema that aren't in the main database.
176182
$.each(tableSchemaExtended,function(key,val){
177183
if(!(key in tableSchema)) externalTables+= key + "##"
178184
});
179185
tableSchema = $.extendext(true, 'concat', {}, tableSchema, tableSchemaExtended);
180186

181187
//jQuery.extend(true, tableSchema, tableSchemaExtended);
182188
if(externalTables=="")
183-
setupData(tableSchema);
189+
setupData(tableSchema,expandedNode);
184190
else
185-
$.getJSON(schemaJsonCall+"&tablelist="+externalTables, function (data) {
191+
$.getJSON(schemaJsonCall+"&tablelist="+encodeURIComponent(externalTables), function (data) {
186192
//jQuery.extend(true, tableSchema, data);
187193
tableSchema = $.extendext(true, 'concat',{}, tableSchema, data);
188-
setupData(tableSchema);
194+
setupData(tableSchema,expandedNode);
189195
}).fail(ajaxError);
190-
}).fail(ajaxError);
191-
$("body").trigger("dataloaded");
196+
}).fail(ajaxError);
192197
}
193198

194199
var viewsLoaded = false;
@@ -197,7 +202,8 @@ function addViewData()
197202
$.getJSON(schemaViewsJsonCall, function (data) {
198203
//jQuery.extend(true, tableSchema, data);
199204
tableSchema = $.extendext(true, 'concat', tableSchema, data);
200-
setupData(data,'#views');
205+
//setupData(data,'#views');
206+
loadExternalTables('#views');
201207
}).fail(ajaxError);
202208
//$('#jstree').jstree().create_node('#' , { "id" : "ajson5", "text" : "newly added" }, "last", function(){});
203209
}

‎Reporting/QueryBuilder/js/jstreeTheme/jstreeTheme.style.throbber.gif

1.68 KB
Loading

‎Reporting/Report.vb

+14-3
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ Public Class Report
314314
End Property
315315

316316
Private Shared _sharedsession As System.Web.SessionState.HttpSessionState
317-
Private Shared ReadOnly Property Sharedsession() As System.Web.SessionState.HttpSessionState
317+
Friend Shared ReadOnly Property Sharedsession() As System.Web.SessionState.HttpSessionState
318318
Get
319319
If _sharedsession Is Nothing Then _sharedsession = BaseClasses.DataBase.createSession(True)
320320
Return _sharedsession
@@ -376,6 +376,14 @@ Public Class Report
376376
End Set
377377
End Property
378378

379+
380+
Public Shared ReadOnly Property defaultParameters() As Hashtable
381+
Get
382+
If (BaseClasses.DataBase.httpSession("GlobalReportProperties") Is Nothing) Then BaseClasses.DataBase.httpSession("GlobalReportProperties") = New Hashtable()
383+
Return BaseClasses.DataBase.httpSession("GlobalReportProperties")
384+
End Get
385+
End Property
386+
379387
#End Region
380388

381389
Public Event PreInit()
@@ -514,6 +522,7 @@ Public Class Report
514522
'initializeReport()
515523
End If
516524
buildData()
525+
Me.Controls.Add(New LiteralControl("<div class=""DTIReportEnd""></div>"))
517526
'End If
518527
End Sub
519528

@@ -561,9 +570,10 @@ Public Class Report
561570
Dim idstr As String = "DTIReportClickedVals_" & Me.ReportName
562571
If Me.session(idstr) Is Nothing Then
563572
Dim ht As New Hashtable
564-
565-
566573
Me.session(idstr) = ht
574+
For Each parmkey As String In defaultParameters.Keys
575+
If Not ht.ContainsKey(parmkey) Then ht(parmkey) = defaultParameters(parmkey)
576+
Next
567577
End If
568578
If setParmsFromQueryString AndAlso Not queryValsRun Then
569579
queryValsRun = True
@@ -572,6 +582,7 @@ Public Class Report
572582
ht(key) = HttpContext.Current.Request.QueryString(key)
573583
Next
574584
End If
585+
575586
Return Me.session(idstr)
576587
End Get
577588
End Property

‎Reporting/ReportEditorBase.vb

+21-8
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,11 @@ Public Class ReportEditorBase
1414

1515
End Sub
1616

17-
Private _helper As BaseHelper
18-
Public Shadows Property sqlhelper() As BaseClasses.BaseHelper
17+
Private _helper As BaseHelper
18+
Public Property sqlhelper() As BaseClasses.BaseHelper
1919
Get
2020
If _helper Is Nothing Then
21-
If Not Session("ReportSettingsConnection") Is Nothing Then
22-
_helper = BaseClasses.DataBase.createHelper(Session("ReportSettingsConnection"))
23-
Else
24-
_helper = BaseClasses.DataBase.getHelper
25-
End If
21+
_helper = BaseClasses.DataBase.createHelper(ReportSettingsConnection)
2622
End If
2723
Return _helper
2824
End Get
@@ -31,7 +27,24 @@ Public Class ReportEditorBase
3127
End Set
3228
End Property
3329

34-
Public Property ds() As dsReports
30+
Private _ReportSettingsConnection As System.Data.Common.DbConnection
31+
Public Property ReportSettingsConnection() As System.Data.Common.DbConnection
32+
Get
33+
If _ReportSettingsConnection IsNot Nothing Then Return _ReportSettingsConnection
34+
If Session("ReportSettingsConnection") IsNot Nothing Then Return Session("ReportSettingsConnection")
35+
If Report.Sharedsession("ReportSettingsConnection") IsNot Nothing Then Return Report.Sharedsession("ReportSettingsConnection")
36+
Return BaseClasses.DataBase.defaultConnectionSessionWide
37+
End Get
38+
Set(ByVal value As System.Data.Common.DbConnection)
39+
'If ReportDataConnection.ToString = sqlhelper.defaultConnection.ToString Then
40+
' ReportDataConnection = sqlhelper.defaultConnection
41+
'End If
42+
_ReportSettingsConnection = value
43+
_helper = Nothing
44+
End Set
45+
End Property
46+
47+
Public Property ds() As dsReports
3548
Get
3649
If Session("DTIReportDATAsetForEditingGraphsOfAPartciularReport") Is Nothing Then
3750
Session("DTIReportDATAsetForEditingGraphsOfAPartciularReport") = New dsReports

‎Reporting/ReportSelector.vb

+15-20
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ Public Class ReportSelector
1313
Public Property sqlhelper() As BaseClasses.BaseHelper
1414
Get
1515
If _helper Is Nothing Then
16-
If session("ReportSettingsConnection") Is Nothing Then
17-
_helper = BaseClasses.DataBase.getHelper
18-
Else
19-
_helper = BaseClasses.DataBase.createHelper(session("ReportSettingsConnection"))
20-
End If
16+
_helper = BaseClasses.DataBase.createHelper(ReportSettingsConnection)
2117
End If
2218
Return _helper
2319
End Get
@@ -53,25 +49,24 @@ Public Class ReportSelector
5349
End Set
5450
End Property
5551

52+
Private _ReportSettingsConnection As System.Data.Common.DbConnection
5653
Public Property ReportSettingsConnection() As System.Data.Common.DbConnection
5754
Get
58-
Return sqlhelper.defaultConnection
55+
If _ReportSettingsConnection IsNot Nothing Then Return _ReportSettingsConnection
56+
If session("ReportSettingsConnection") IsNot Nothing Then Return session("ReportSettingsConnection")
57+
If Report.Sharedsession("ReportSettingsConnection") IsNot Nothing Then Return Report.Sharedsession("ReportSettingsConnection")
58+
Return BaseClasses.DataBase.defaultConnectionSessionWide
5959
End Get
60-
Set(ByVal value As System.Data.Common.DbConnection)
61-
If value Is Nothing Then
62-
sqlhelper = Nothing
63-
Else
64-
sqlhelper = BaseClasses.DataBase.createHelper(value)
65-
End If
66-
If shownreport IsNot Nothing Then
67-
shownreport.ReportSettingsConnection = sqlhelper.defaultConnection
68-
End If
69-
End Set
70-
End Property
71-
72-
60+
Set(ByVal value As System.Data.Common.DbConnection)
61+
'If ReportDataConnection.ToString = sqlhelper.defaultConnection.ToString Then
62+
' ReportDataConnection = sqlhelper.defaultConnection
63+
'End If
64+
_ReportSettingsConnection = value
65+
_helper = Nothing
66+
End Set
67+
End Property
7368

74-
Private _ReportSettingsConnectionName As String = Nothing
69+
Private _ReportSettingsConnectionName As String = Nothing
7570
Public Property ReportSettingsConnectionName As String
7671
Get
7772
Return _ReportSettingsConnectionName

‎Reporting/Reporting.vbproj

+1
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@
349349
<EmbeddedResource Include="propertyEditor\clear.png" />
350350
<EmbeddedResource Include="propertyEditor\close.png" />
351351
<EmbeddedResource Include="propertyEditor\open.png" />
352+
<EmbeddedResource Include="QueryBuilder\js\jstreeTheme\jstreeTheme.style.throbber.gif" />
352353
<Content Include="QueryBuilder\js\tablethemes\green\tablethemes.green.asc.png" />
353354
<Content Include="QueryBuilder\js\tablethemes\green\tablethemes.green.background.png" />
354355
<Content Include="QueryBuilder\js\tablethemes\green\tablethemes.green.desc.png" />

‎_reportTester/Global.asax.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected void Session_Start(object sender, EventArgs e)
2323
//Reporting.Report.isGlobalAdmin = true;
2424
if(System.Web.Configuration.WebConfigurationManager.ConnectionStrings["ReportConnection"] !=null)
2525
Reporting.Report.ReportDataConnectionShared = new System.Data.SqlClient.SqlConnection(System.Web.Configuration.WebConfigurationManager.ConnectionStrings["ReportConnection"].ConnectionString);
26-
26+
Reporting.Report.defaultParameters.Add("election_id", 105);
2727
}
2828

2929
protected void Application_BeginRequest(object sender, EventArgs e)

‎_reportTester/Web.config

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<add name="ConnectionString2" connectionString="Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\Databases\Northwind.mdf;Integrated Security=True;Connect Timeout=30" providerName="System.Data.SqlClient" />
1313
<add name="ConnectionString3" connectionString="Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\Databases\AdventureWorksDW2008R2_Data.mdf;Integrated Security=True;Connect Timeout=30" providerName="System.Data.SqlClient" />
1414
<add name="ConnectionString4" connectionString="Data Source=tcp:vmdevsql05,3415;Initial Catalog=projectbuild;Integrated Security=True" providerName="System.Data.SqlClient" />
15-
<add name="ConnectionString" connectionString="Data Source=tcp:vmprdsql05,3415;Initial Catalog=dssScheduler;Integrated Security=True" providerName="System.Data.SqlClient" />
15+
<add name="ConnectionString10" connectionString="Data Source=tcp:vmprdsql05,3415;Initial Catalog=dssScheduler;Integrated Security=True" providerName="System.Data.SqlClient" />
16+
<add name="ConnectionString" connectionString="Data Source=tcp:vmdevsql05,3415;Initial Catalog=BOEInventory;Integrated Security=True"
17+
providerName="System.Data.SqlClient" />
1618
<add name="ReportConnection1" connectionString="Data Source=tcp:vmphdevsql,3415;Initial Catalog=DurhamPHDJan2018;Integrated Security=True" providerName="System.Data.SqlClient" />
1719
<add name="ConnectionString7" connectionString="Data Source=tcp:vmprdsql05,3415;Initial Catalog=DSSForm;Integrated Security=True" providerName="System.Data.SqlClient" />
1820
<add name="ConnectionString8" connectionString="Data Source=tcp:vmprdsql05,3415;Initial Catalog=cjrcCourtReminder;Integrated Security=True" providerName="System.Data.SqlClient" />

‎_reportTester/_reportTester.csproj

+10-1
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@
8181
<Content Include="Default.aspx" />
8282
<Content Include="Global.asax" />
8383
<Content Include="jquery.floatThead.min.js" />
84+
<Content Include="QueryBuilder.aspx" />
8485
<Content Include="report.aspx" />
8586
<Content Include="ReportSelector.aspx" />
87+
<Content Include="tables.json.js" />
8688
<Content Include="tbltest.aspx" />
8789
<Content Include="ViewSwitcher.ascx" />
8890
<Content Include="Web.config">
@@ -110,6 +112,13 @@
110112
<DependentUpon>Global.asax</DependentUpon>
111113
</Compile>
112114
<Compile Include="Properties\AssemblyInfo.cs" />
115+
<Compile Include="QueryBuilder.aspx.cs">
116+
<DependentUpon>QueryBuilder.aspx</DependentUpon>
117+
<SubType>ASPXCodeBehind</SubType>
118+
</Compile>
119+
<Compile Include="QueryBuilder.aspx.designer.cs">
120+
<DependentUpon>QueryBuilder.aspx</DependentUpon>
121+
</Compile>
113122
<Compile Include="report.aspx.cs">
114123
<DependentUpon>report.aspx</DependentUpon>
115124
<SubType>ASPXCodeBehind</SubType>
@@ -148,7 +157,7 @@
148157
</ItemGroup>
149158
<ItemGroup>
150159
<Content Include="packages.config" />
151-
<Content Include="tables.json" />
160+
<None Include="tables.json1" />
152161
<Content Include="Site.Mobile.Master" />
153162
<None Include="Web.Debug.config">
154163
<DependentUpon>Web.config</DependentUpon>

‎_reportTester/tables.json

-262
This file was deleted.

‎_reportTester/tables.json.js

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{
2-
"Patients": {"universalRelations":[{"child_cols":["PatientID"],"parent_cols":["PatientID"]}]}
3-
,"AllStaff": {"universalRelations":[{"child_cols":["StaffID"],"parent_cols":["StaffID"]}]}
4-
,"AllUsers": {"universalRelations":[{"child_cols":["InsertedBy"],"parent_cols":["UserID"]}]}
5-
,"AllUsers": {"universalRelations":[{"child_cols":["LastEditedBy"],"parent_cols":["UserID"]}]}
6-
,"Clinical_Data.PatientEncounter": {"universalRelations":[{"child_cols":["PatientEncounterID"],"parent_cols":["PatientEncounterID"]}]}
7-
,"InsurancePlan": { "universalRelations":[{ "child_cols": ["InsurancePlanID"], "parent_cols": ["InsurancePlanID"] }] }
8-
,"SlidingFeeScalePrograms": { "universalRelations":[{ "child_cols": ["SlidingFeeScaleProgramsID"], "parent_cols": ["SlidingFeeScaleProgramsID"] }] }
2+
"Asset": { "universalRelations": [{ "parent_cols": ["id"], "child_cols": ["assetid"] }] }
3+
, "AssetItem": { "universalRelations": [{ "parent_cols": ["id"], "child_cols": ["assetitemid"] }] }
4+
, "Truck": { "universalRelations": [{ "parent_cols": ["id"], "child_cols": ["truckid"] }] }
5+
, "PackList": { "universalRelations": [{ "parent_cols": ["id"], "child_cols": ["packListid"] }] }
6+
, "Inventory": { "universalRelations": [{ "parent_cols": ["id"], "child_cols": ["Inventoryid"] }] }
7+
, "Delivery": { "universalRelations": [{ "parent_cols": ["id"], "child_cols": ["Deliveryid"] }] }
8+
, "BOEBallotTracking.dbo.LK_ELECTION": { "universalRelations": [{ "parent_cols": ["ID"], "child_cols": ["electionid"] }] }
9+
, "BOEBallotTracking.dbo.POLLING_PLACE": { "universalRelations": [{ "parent_cols": ["polling_place_id"], "child_cols": ["pollingPlaceid"] }] }
10+
, "BOEBallotTracking.dbo.EPB_SITE_INFO": { "universalRelations": [{ "parent_cols": ["name_abbr"], "child_cols": ["site_lbl"] }] }
11+
, "BOEBallotTracking.dbo.EPB_SITE_INFO": { "universalRelations": [{ "parent_cols": ["id"], "child_cols": ["OneStopID"] }] }
912
}

0 commit comments

Comments
 (0)
Please sign in to comment.