Added a <thead> to column names row in the HTML reports.

Changed when/how assemblies are searched for a class that inherits BaseGraph. Search now happens when edit is first called/loaded.

Author: Micmaz

Chart.js/ChartjsGraph.ascx.designer.vb

@@ -20,11 +20,11 @@ Partial Public Class ChartjsGraph
 		doDrilldown(row)
 	End Sub
 
-	'Public Overrides ReadOnly Property propertyList() As String
-	'	Get
-	'		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"
-	'	End Get
-	'End Property
+	Public Overrides ReadOnly Property propertyList() As String
+		Get
+			Return "chartTitle,Height,Width,addtionalChartProperties,addtionalItemLevelProperties,beginAtZero,chartTitle,chartType,colorScheme,colorSchemeBaseColor,colorSchemedistance,colorSchemeRandomizeColorOrder,colorSchemeVariation,cornerRadius,datsetLabelsStr,defaultFontColor,defaultFontFamily,defaultFontSize,defaultFontStyle,dropShadow,dropShadowBlur,dropShadowColor,dropShadowOffsetX,dropShadowOffsetY,fillLineChart,gradient,gradientEnd,gradientEndShade,gradientStart,gradientStartShade,labelCol,numberOfSeries,valueColsStr"
+		End Get
+	End Property
 
 	Private Sub DynamicPropertyEditor1_objectPropertiesSet(ByVal objectInstance As Object) Handles propgrid.objectPropertiesSet
 		Dim regex1 As Regex = New Regex("\x40\w+", RegexOptions.IgnoreCase Or RegexOptions.CultureInvariant Or RegexOptions.IgnorePatternWhitespace Or RegexOptions.Compiled)

Chart.js/ChartjsGraph.ascx.vb

@@ -1,4 +1,4 @@
-Imports System
+Imports System
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 

Chart.js/My Project/Application.Designer.vb

@@ -233,8 +233,8 @@ Public Class GroupedTable
         Next
         Rows.AddAt(Rows.GetRowIndex(rowList(0)) + 1, r)
         If rowAfterTotal Then
-            r = New TableRow
-            For Each col As String In cols()
+			r = New TableRow
+			For Each col As String In cols()
                 r.Cells.Add(makeCell(" ", "spacerCell"))
             Next
             Rows.AddAt(Rows.GetRowIndex(rowList(0)) + 2, r)
@@ -250,11 +250,12 @@ Public Class GroupedTable
 
             'Make the header
             r = New TableHeaderRow
-            For Each col As String In colLst
-                col = col.Trim()
-                r.Cells.Add(makeHeaderCell(col, "headerCell"))
-            Next
-            Rows.Add(r)
+			For Each col As String In colLst
+				col = col.Trim()
+				r.Cells.Add(makeHeaderCell(col, "headerCell"))
+			Next
+			r.TableSection = TableRowSection.TableHeader
+			Rows.Add(r)
 
             For Each row As DataRow In DataSource.Rows
                 r = New TableRow

Chart.js/My Project/AssemblyInfo.vb

@@ -25,7 +25,9 @@ Public Class ParmDisplay
         NameValueAutocomplete = 6
     End Enum
 
-    Private ReadOnly Property sqlhelper() As BaseClasses.BaseHelper
+	Public Property controlPanel As New Panel
+
+	Private ReadOnly Property sqlhelper() As BaseClasses.BaseHelper
         Get
             Return parentGraph.sqlhelper
         End Get
@@ -124,7 +126,7 @@ Public Class ParmDisplay
 			'End If
 
 			'Me.Controls.Add(New LiteralControl("<br />"))
-			Me.Controls.Add(p)
+			controlPanel.Controls.Add(p)
 			Return p
 		End If
 		Return Nothing
@@ -215,6 +217,7 @@ Public Class ParmDisplay
 		'If hasparms Then
 		Me.Controls.AddAt(0, New LiteralControl("<fieldset class='reportField'><legend>" & Me.parentGraph.GraphName & "</legend>"))
 		Me.Controls.Add(Submit)
+		Me.Controls.Add(controlPanel)
 		Me.Controls.Add(New LiteralControl("</fieldset>"))
 		'End If
 
@@ -237,12 +240,22 @@ Public Class ParmDisplay
 	End Function
 
 	Private Sub ParmDisplay_PreRender(sender As Object, e As EventArgs) Handles Me.PreRender
-		If Not Me.parentGraph.parms Is Me Then
-			For Each parm As String In controlParmHash.Keys
-				Me.parentGraph.parms.Controls.Add(controlParmHash(parm))
-				Me.parentGraph.parms.Visible = True
-			Next
-
-		End If
+		For Each gr As Graph In Me.parentGraph.parentReport.GraphsList
+			If gr.parms Is Me Then
+				Exit For
+			End If
+			If gr.parms.Visible() Then
+				For Each key As String In controlParmHash.Keys
+					If Not gr.parms.controlParmHash.ContainsKey(key) Then
+						gr.parms.controlParmHash.Add(key, controlParmHash(key))
+						gr.parms.controlPanel.Controls.Add(controlParmHash(key))
+						'Dim r As dsReports.DTIGraphParmsRow = savedparms(parmName)
+						'Dim c As Control = addParmControl(parmName, r.DisplayName, r.Parm_Type, r.ParmProperties)
+						'controlParmHash.Add(parmName, c)
+					End If
+				Next
+				Me.Visible = False
+			End If
+		Next
 	End Sub
 End Class

Chart.js/My Project/Resources.Designer.vb

@@ -465,10 +465,10 @@ Public Class Report
             i += 1
         Next
         Me.CssClass = "DTIReport"
-        If isadmin Then
-            ReportTitleLabel.Text = ReportName
-        End If
-        Controls.AddAt(0, ReportTitleLabel)
+		'If isadmin Then
+		ReportTitleLabel.Text = ReportName
+		'End If
+		Controls.AddAt(0, ReportTitleLabel)
         Controls.AddAt(1, New LiteralControl("<br>"))
         If isadmin Then
             Report.reghsString(Me.Page)
@@ -488,8 +488,9 @@ Public Class Report
     End Sub
 
     Private Sub Report_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Init
-        'If Me.Visible Then
-        RaiseEvent PreInit()
+		'If Me.Visible Then
+		Me.ReportTitleLabel.CssClass = "ReportTitleLabel"
+		RaiseEvent PreInit()
         If Me.isadmin Then
 		try
             Page.EnableEventValidation = False
@@ -590,6 +591,8 @@ Public Class Report
 				.Control_Name = "~/res/Reporting/" & graphName & "Graph.ascx"
 				.Name = graphName
 			End With
+			If graphName.ToLower = "chartjs" Then row.Control_Name = "~/res/Chart.js/ChartjsGraph.ascx"
+
 			If Not ctrlList.Contains(row.Control_Name.ToLower) OrElse dtGraphTypes.Select("Name = '" & row.Name & "'").Length = 0 Then
 				dtGraphTypes.AddDTIGraphTypesRow(row)
 				ctrlList.Add(row.Control_Name.ToLower())
@@ -625,28 +628,34 @@ Public Class Report
 
 		'Get Graph types from the Assembly cache
 		For Each asm As System.Reflection.Assembly In AppDomain.CurrentDomain.GetAssemblies
-			For Each tp As Type In asm.GetTypes()
-				If tp.IsSubclassOf(GetType(BaseGraph)) Then
-					Dim newGraph As DTIGraphTypesRow = dtGraphTypes.NewDTIGraphTypesRow
-					newGraph.Control_Name = "~/res/" & tp.FullName.Replace(".", "/") & ".ascx"
-					newGraph.Name = tp.Name.Replace("Graph", "")
-					Dim ctrlName As String = newGraph.Control_Name.ToLower
-					foundlist.Add(ctrlName)
-					If Not fullList.ContainsKey(ctrlName) Then
-						'ctrlList.Add(ctrlName)
-						fullList.Add(ctrlName, New List(Of DTIGraphTypesRow))
-						fullList(ctrlName).Add(newGraph)
-						dtGraphTypes.AddDTIGraphTypesRow(newGraph)
+			Try
+				For Each tp As Type In asm.GetTypes()
+					If tp.IsSubclassOf(GetType(BaseGraph)) Then
+						Dim newGraph As DTIGraphTypesRow = dtGraphTypes.NewDTIGraphTypesRow
+						newGraph.Control_Name = "~/res/" & tp.FullName.Replace(".", "/") & ".ascx"
+						newGraph.Name = tp.Name.Replace("Graph", "")
+						Dim ctrlName As String = newGraph.Control_Name.ToLower
+						foundlist.Add(ctrlName)
+						If Not fullList.ContainsKey(ctrlName) Then
+							'ctrlList.Add(ctrlName)
+							fullList.Add(ctrlName, New List(Of DTIGraphTypesRow))
+							fullList(ctrlName).Add(newGraph)
+							dtGraphTypes.AddDTIGraphTypesRow(newGraph)
+						End If
 					End If
-				End If
-			Next
+				Next
+			Catch ex As Reflection.ReflectionTypeLoadException
+
+			End Try
 		Next
 
 		Try
-			'this update is to add any new graph types from other assemblies.
+			'this Update Is to add any New graph types from other assemblies.
 			myhelper.Update(dtGraphTypes)
 		Catch ex As Exception
-
+			If HttpContext.Current.Request.QueryString("showerror") = "y" Then
+				Throw ex
+			End If
 		End Try
 
 

Chart.js/My Project/Settings.Designer.vb

@@ -22,14 +22,14 @@ Public Partial Class ReportGraphs
 
             ds.Clear()
             If ReportID <> -1 Then
-                Try
+				Try
 					sqlhelper.FillDataSetMultiSelect("Select * from DTIReports where id = " & ReportID & "; Select * from DTIGraphs where Report_Id = " & ReportID & " order by [order];Select * from DTIGraphTypes", ds, New String() {"DTIReports", "DTIGraphs", "DTIGraphTypes"})
-					Report.getGraphTypeList(sqlhelper, ds.DTIGraphTypes)
 				Catch ex As Exception
-                    Report.loadDSToDatabase(sqlhelper)
+					Report.loadDSToDatabase(sqlhelper)
                     sqlhelper.FillDataSetMultiSelect("Select * from DTIReports where id = " & ReportID & "; Select * from DTIGraphs where Report_Id = " & ReportID & " order by [order];Select * from DTIGraphTypes", ds, New String() {"DTIReports", "DTIGraphs", "DTIGraphTypes"})
                 End Try
             End If
+			Report.getGraphTypeList(sqlhelper, ds.DTIGraphTypes)
 
 
 			If ds.DTIReports.Count > 0 Then

Reporting/GraphTester.aspx.designer.vb

@@ -11,7 +11,7 @@ public partial class Default : BaseClasses.BaseSecurityPage
 	{
 		protected void Page_Load(object sender, EventArgs e)
 		{
-			Chart1.data = sqlHelper.FillDataTable("select * from media_types");
+			//Chart1.data = sqlHelper.FillDataTable("select * from media_types");
 		}
 	}
 }

Reporting/GroupedTable.vb

@@ -12,7 +12,7 @@ public partial class ReportSelector : System.Web.UI.Page
 	{
 		protected void Page_Load(object sender, EventArgs e)
 		{
-			Reporting.Report.ReportDataConnectionShared = new System.Data.SqlClient.SqlConnection(WebConfigurationManager.ConnectionStrings["phData"].ConnectionString);
+			//Reporting.Report.ReportDataConnectionShared = new System.Data.SqlClient.SqlConnection(WebConfigurationManager.ConnectionStrings["phData"].ConnectionString);
 		}
 
 		protected void btnToggleEditing_Click(object sender, EventArgs e)

Reporting/HtmlTableGraph.ascx.designer.vb

@@ -11,10 +11,13 @@
     <add name="ConnectionString1" connectionString="Data Source=Database\chinook.db" providerName="System.Data.SqliteClient"/>
 		<add name="ConnectionString2" connectionString="Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\Databases\Northwind.mdf;Integrated Security=True;Connect Timeout=30" providerName="System.Data.SqlClient"/>
 		<add name="ConnectionString3" connectionString="Data Source=(LocalDB)\MSSQLLocalDB;AttachDbFilename=C:\Databases\AdventureWorksDW2008R2_Data.mdf;Integrated Security=True;Connect Timeout=30" providerName="System.Data.SqlClient"/>
-		<add name="ConnectionString4" connectionString="Data Source=tcp:vmdevsql03,3415;Initial Catalog=cjrcCourtReminder;Integrated Security=True" providerName="System.Data.SqlClient"/>
-		<add name="ConnectionString" connectionString="Data Source=tcp:vmprdsql03,3415;Initial Catalog=dssScheduler;Integrated Security=True" providerName="System.Data.SqlClient"/>
+		<add name="ConnectionString4" connectionString="Data Source=tcp:vmdevsql05,3415;Initial Catalog=cjrcCourtReminder;Integrated Security=True" providerName="System.Data.SqlClient"/>
+		<add name="ConnectionString5" connectionString="Data Source=tcp:vmprdsql05,3415;Initial Catalog=dssScheduler;Integrated Security=True" providerName="System.Data.SqlClient"/>
+		<add name="phData" connectionString="Data Source=tcp:vmphdevsql,3415;Initial Catalog=DurhamPHDJan2018;Integrated Security=True" providerName="System.Data.SqlClient" />
+		<add name="ConnectionString6" connectionString="Data Source=tcp:vmprdsql05,3415;Initial Catalog=DSSForm;Integrated Security=True" providerName="System.Data.SqlClient"/>
+	<add name="ConnectionString" connectionString="Data Source=tcp:vmprdsql05,3415;Initial Catalog=cjrcCourtReminder;Integrated Security=True" providerName="System.Data.SqlClient"/>
 	</connectionStrings>
-  <system.web>
+  <system.web> 
     <compilation debug="true" targetFramework="4.0"/>
     <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
   </system.web> 

Reporting/My Project/Application.Designer.vb

@@ -4,5 +4,6 @@
 	,"AllUsers": {"universalRelations":[{"child_cols":["InsertedBy"],"parent_cols":["UserID"]}]}
 	,"AllUsers": {"universalRelations":[{"child_cols":["LastEditedBy"],"parent_cols":["UserID"]}]}
 	,"Clinical_Data.PatientEncounter": {"universalRelations":[{"child_cols":["PatientEncounterID"],"parent_cols":["PatientEncounterID"]}]}
-	,"InsurancePlan": {"universalRelations":[{"child_cols":["InsurancePlanID"],"parent_cols":["InsurancePlanID"]}]}
+	,"InsurancePlan": { "universalRelations":[{ "child_cols": ["InsurancePlanID"], "parent_cols": ["InsurancePlanID"] }] }
+	,"SlidingFeeScalePrograms": { "universalRelations":[{ "child_cols": ["SlidingFeeScaleProgramsID"], "parent_cols": ["SlidingFeeScaleProgramsID"] }] }
 }