diff --git a/.gitignore b/.gitignore index 319a3b18..2992eed9 100644 --- a/.gitignore +++ b/.gitignore @@ -419,4 +419,143 @@ /RdlEngine/bin/Debug/DataProviders.pdb /RdlEngine/bin/Debug/RdlEngineConfig.xml /RdlEngine/obj/Debug/ResolveAssemblyReference.cache -/RdlViewer/bin/Debug/RdlEngineConfig.xml \ No newline at end of file +/RdlViewer/bin/Debug/RdlEngineConfig.xml +/DataProviders/bin/x86/Debug/DataProviders.dll +/DataProviders/bin/x86/Debug/DataProviders.pdb +/DataProviders/obj/x86/Debug/DataProviders.csproj.FileListAbsolute.txt +/DataProviders/obj/x86/Debug/DataProviders.dll +/DataProviders/obj/x86/Debug/DataProviders.pdb +/DataProviders/obj/x86/Debug/Refactor/DataProviders.dll +/RdlCri/bin/x86/Debug/RdlCri.dll +/RdlCri/bin/x86/Debug/RdlCri.pdb +/RdlCri/bin/x86/Debug/RdlEngine.dll +/RdlCri/bin/x86/Debug/RdlEngine.pdb +/RdlCri/bin/x86/Debug/RdlEngineConfig.xml +/RdlCri/obj/Debug/build.force +/RdlCri/obj/Release/build.force +/RdlCri/obj/x86/Debug/RdlCri.csproj.FileListAbsolute.txt +/RdlCri/obj/x86/Debug/RdlCri.dll +/RdlCri/obj/x86/Debug/RdlCri.pdb +/RdlCri/obj/x86/Release/build.force +/RdlDesign/ReportDesigner.csproj.user +/RdlDesign/bin/x86/Debug/RdlCri.dll +/RdlDesign/bin/x86/Debug/RdlCri.pdb +/RdlDesign/bin/x86/Debug/RdlDesigner.exe +/RdlDesign/bin/x86/Debug/RdlDesigner.pdb +/RdlDesign/bin/x86/Debug/RdlDesigner.vshost.exe +/RdlDesign/bin/x86/Debug/RdlDesigner.vshost.exe.manifest +/RdlDesign/bin/x86/Debug/RdlEngine.dll +/RdlDesign/bin/x86/Debug/RdlEngine.pdb +/RdlDesign/bin/x86/Debug/RdlEngineConfig.xml +/RdlDesign/bin/x86/Debug/RdlViewer.dll +/RdlDesign/bin/x86/Debug/RdlViewer.pdb +/RdlDesign/bin/x86/Release/RdlDesigner.vshost.exe +/RdlDesign/bin/x86/Release/RdlDesigner.vshost.exe.manifest +/RdlDesign/obj/Debug/build.force +/RdlDesign/obj/Release/build.force +/RdlDesign/obj/x86/Debug/RdlDesigner.exe +/RdlDesign/obj/x86/Debug/RdlDesigner.pdb +/RdlDesign/obj/x86/Debug/ReportDesigner.csproj.FileListAbsolute.txt +/RdlDesign/obj/x86/Debug/ReportDesigner.csproj.GenerateResource.Cache +/RdlDesign/obj/x86/Debug/ResolveAssemblyReference.cache +/RdlDesign/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.BackgroundCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.BodyCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ChartAxisCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ChartCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ChartLegendCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.CodeCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ColorPickerPopup.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.CustomReportItemCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DataSetRowsCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DataSetsCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DesignCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DesignEditLines.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DesignRuler.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DesignXmlDraw.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogAbout.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogDataSourceRef.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogDataSources.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogDatabase.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogEmbeddedImages.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogExprEditor.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogFilterOperator.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogListOfStrings.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogNew.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogNewChart.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogNewMatrix.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogNewTable.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogToolOptions.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogValidValues.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DialogValidateRdl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.DrillParametersDialog.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.FiltersCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.FindTab.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.FontCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.GridCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.GroupingCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ImageCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.InteractivityCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ListCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.MDIChild.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.MatrixCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ModulesClassesCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.PositionCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.Properties.Resources.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.PropertyCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.PropertyDialog.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.QueryParametersCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.RdlDesigner.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.RdlEditPreview.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ReportCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ReportParameterCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.ReportXmlCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.SQLCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.SimpleButton.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.SimpleToggle.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.SingleCtlDialog.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.SortingCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.StaticSeriesCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.StyleBorderCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.StyleCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.StyleTextCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.SubreportCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.TableColumnCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.TableCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.TableRowCtl.resources +/RdlDesign/obj/x86/Debug/fyiReporting.RdlDesign.VisibilityCtl.resources +/RdlDesign/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll +/RdlDesign/obj/x86/Release/build.force +/RdlEngine/bin/x86/Debug/DataProviders.dll +/RdlEngine/bin/x86/Debug/DataProviders.pdb +/RdlEngine/bin/x86/Debug/RdlEngine.dll +/RdlEngine/bin/x86/Debug/RdlEngine.pdb +/RdlEngine/bin/x86/Debug/RdlEngineConfig.xml +/RdlEngine/obj/Debug/build.force +/RdlEngine/obj/Release/build.force +/RdlEngine/obj/x86/Debug/RdlEngine.csproj.FileListAbsolute.txt +/RdlEngine/obj/x86/Debug/RdlEngine.dll +/RdlEngine/obj/x86/Debug/RdlEngine.pdb +/RdlEngine/obj/x86/Debug/Refactor/RdlEngine.dll +/RdlEngine/obj/x86/Debug/ResolveAssemblyReference.cache +/RdlEngine/obj/x86/Release/build.force +/RdlMapFile/RdlMapFile.csproj.user +/RdlViewer/bin/x86/Debug/RdlEngine.dll +/RdlViewer/bin/x86/Debug/RdlEngine.pdb +/RdlViewer/bin/x86/Debug/RdlEngineConfig.xml +/RdlViewer/bin/x86/Debug/RdlViewer.dll +/RdlViewer/bin/x86/Debug/RdlViewer.pdb +/RdlViewer/obj/Debug/build.force +/RdlViewer/obj/Release/build.force +/RdlViewer/obj/x86/Debug/RdlViewer.csproj.FileListAbsolute.txt +/RdlViewer/obj/x86/Debug/RdlViewer.csproj.GenerateResource.Cache +/RdlViewer/obj/x86/Debug/RdlViewer.dll +/RdlViewer/obj/x86/Debug/RdlViewer.pdb +/RdlViewer/obj/x86/Debug/Refactor/RdlViewer.dll +/RdlViewer/obj/x86/Debug/ResolveAssemblyReference.cache +/RdlViewer/obj/x86/Debug/fyiReporting.RdlViewer.DataSourcePassword.resources +/RdlViewer/obj/x86/Debug/fyiReporting.RdlViewer.DialogMessages.resources +/RdlViewer/obj/x86/Debug/fyiReporting.RdlViewer.PageDrawing.resources +/RdlViewer/obj/x86/Debug/fyiReporting.RdlViewer.RdlViewer.resources +/RdlViewer/obj/x86/Debug/fyiReporting.RdlViewer.RdlViewerFind.resources +/RdlViewer/obj/x86/Release/build.force \ No newline at end of file diff --git a/DataProviders/DataProviders.csproj b/DataProviders/DataProviders.csproj index 06acd76c..012e80d9 100644 --- a/DataProviders/DataProviders.csproj +++ b/DataProviders/DataProviders.csproj @@ -90,6 +90,25 @@ none prompt + + true + bin\x86\Debug\ + DEBUG;TRACE + 285212672 + 4096 + full + x86 + prompt + + + bin\x86\Release\ + TRACE + 285212672 + true + 4096 + x86 + prompt + System diff --git a/RdlCri/RdlCri.csproj b/RdlCri/RdlCri.csproj index 94e71870..9dfae8e7 100644 --- a/RdlCri/RdlCri.csproj +++ b/RdlCri/RdlCri.csproj @@ -50,6 +50,22 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + diff --git a/RdlDesign/RdlDesign.sln b/RdlDesign/RdlDesign.sln index 3f8f7996..5788b894 100644 --- a/RdlDesign/RdlDesign.sln +++ b/RdlDesign/RdlDesign.sln @@ -8,28 +8,56 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RdlViewer", "..\RdlViewer\R EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataProviders", "..\DataProviders\DataProviders.csproj", "{D9F4197F-52D2-49F0-8DAF-E2884733CF2D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RdlCri", "..\RdlCri\RdlCri.csproj", "{9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3E1D2C49-44A2-46A0-B107-9E8A87AE78A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E1D2C49-44A2-46A0-B107-9E8A87AE78A7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3E1D2C49-44A2-46A0-B107-9E8A87AE78A7}.Debug|x86.ActiveCfg = Debug|x86 + {3E1D2C49-44A2-46A0-B107-9E8A87AE78A7}.Debug|x86.Build.0 = Debug|x86 {3E1D2C49-44A2-46A0-B107-9E8A87AE78A7}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E1D2C49-44A2-46A0-B107-9E8A87AE78A7}.Release|Any CPU.Build.0 = Release|Any CPU + {3E1D2C49-44A2-46A0-B107-9E8A87AE78A7}.Release|x86.ActiveCfg = Release|x86 + {3E1D2C49-44A2-46A0-B107-9E8A87AE78A7}.Release|x86.Build.0 = Release|x86 {C97E91F4-B310-44E2-9B6C-96775395722D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C97E91F4-B310-44E2-9B6C-96775395722D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C97E91F4-B310-44E2-9B6C-96775395722D}.Debug|x86.ActiveCfg = Debug|x86 + {C97E91F4-B310-44E2-9B6C-96775395722D}.Debug|x86.Build.0 = Debug|x86 {C97E91F4-B310-44E2-9B6C-96775395722D}.Release|Any CPU.ActiveCfg = Release|Any CPU {C97E91F4-B310-44E2-9B6C-96775395722D}.Release|Any CPU.Build.0 = Release|Any CPU + {C97E91F4-B310-44E2-9B6C-96775395722D}.Release|x86.ActiveCfg = Release|x86 + {C97E91F4-B310-44E2-9B6C-96775395722D}.Release|x86.Build.0 = Release|x86 {D99145B1-CB6C-41F5-BA86-723325145FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D99145B1-CB6C-41F5-BA86-723325145FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D99145B1-CB6C-41F5-BA86-723325145FB5}.Debug|x86.ActiveCfg = Debug|x86 + {D99145B1-CB6C-41F5-BA86-723325145FB5}.Debug|x86.Build.0 = Debug|x86 {D99145B1-CB6C-41F5-BA86-723325145FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU {D99145B1-CB6C-41F5-BA86-723325145FB5}.Release|Any CPU.Build.0 = Release|Any CPU + {D99145B1-CB6C-41F5-BA86-723325145FB5}.Release|x86.ActiveCfg = Release|x86 + {D99145B1-CB6C-41F5-BA86-723325145FB5}.Release|x86.Build.0 = Release|x86 {D9F4197F-52D2-49F0-8DAF-E2884733CF2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D9F4197F-52D2-49F0-8DAF-E2884733CF2D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9F4197F-52D2-49F0-8DAF-E2884733CF2D}.Debug|x86.ActiveCfg = Debug|x86 + {D9F4197F-52D2-49F0-8DAF-E2884733CF2D}.Debug|x86.Build.0 = Debug|x86 {D9F4197F-52D2-49F0-8DAF-E2884733CF2D}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9F4197F-52D2-49F0-8DAF-E2884733CF2D}.Release|Any CPU.Build.0 = Release|Any CPU + {D9F4197F-52D2-49F0-8DAF-E2884733CF2D}.Release|x86.ActiveCfg = Release|x86 + {D9F4197F-52D2-49F0-8DAF-E2884733CF2D}.Release|x86.Build.0 = Release|x86 + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}.Debug|x86.ActiveCfg = Debug|x86 + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}.Debug|x86.Build.0 = Debug|x86 + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}.Release|Any CPU.Build.0 = Release|Any CPU + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}.Release|x86.ActiveCfg = Release|x86 + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RdlDesign/RdlDesigner.cs b/RdlDesign/RdlDesigner.cs index dcfba65f..eec387ba 100644 --- a/RdlDesign/RdlDesigner.cs +++ b/RdlDesign/RdlDesigner.cs @@ -57,7 +57,7 @@ namespace fyiReporting.RdlDesign /// public partial class RdlDesigner : IMessageFilter { - static readonly string IpcFileName = @"\fyiIpcData400.txt"; // note: change file name with every release + static readonly string IpcFileName = @"\fyiIpcData400.txt"; // TODO: change file name with every release IpcChannel channel = new IpcChannel("RdlProject"); diff --git a/RdlDesign/ReportDesigner.csproj b/RdlDesign/ReportDesigner.csproj index 053c9f4f..9a5d88d3 100644 --- a/RdlDesign/ReportDesigner.csproj +++ b/RdlDesign/ReportDesigner.csproj @@ -87,6 +87,25 @@ none prompt + + true + bin\x86\Debug\ + DEBUG;TRACE + 285212672 + 4096 + full + x86 + prompt + + + bin\x86\Release\ + TRACE + 285212672 + true + 4096 + x86 + prompt + System @@ -738,6 +757,10 @@ + + {9C9ECACA-0DEB-4517-8CF1-02C3D3EB128E} + RdlCri + {C97E91F4-B310-44E2-9B6C-96775395722D} RdlEngine diff --git a/RdlEngine/RdlEngine.csproj b/RdlEngine/RdlEngine.csproj index 8e388ccd..8e53e96b 100644 --- a/RdlEngine/RdlEngine.csproj +++ b/RdlEngine/RdlEngine.csproj @@ -90,6 +90,25 @@ none prompt + + true + bin\x86\Debug\ + DEBUG;TRACE + 285212672 + 4096 + full + x86 + prompt + + + bin\x86\Release\ + TRACE + 285212672 + true + 4096 + x86 + prompt + System diff --git a/RdlEngine/RdlEngineConfig.xml b/RdlEngine/RdlEngineConfig.xml index 6380ee38..f5e73cb6 100644 --- a/RdlEngine/RdlEngineConfig.xml +++ b/RdlEngine/RdlEngineConfig.xml @@ -26,7 +26,7 @@ MySQL.NET - C:\Program Files\MySQL\MySQL Connector Net 1.0.6\bin\.NET 1.1\MySql.Data.dll + C:\Program Files (x86)\MySQL\MySQL Connector Net 6.3.7\Assemblies\v2.0\MySql.Data.dll MySql.Data.MySqlClient.MySqlConnection show tables SQL diff --git a/RdlEngine/Runtime/RdlEngineConfig.cs b/RdlEngine/Runtime/RdlEngineConfig.cs index f2a3fe4e..30c3c6ea 100644 --- a/RdlEngine/Runtime/RdlEngineConfig.cs +++ b/RdlEngine/Runtime/RdlEngineConfig.cs @@ -312,6 +312,14 @@ static void GetDataSource(IDictionary dsDir, XmlNode xNode) Assembly la = null; if (codemodule != null && cname != null) { + + if (System.IO.File.Exists(codemodule) == false) + { + sce = new SqlConfigEntry(provider, codemodule , cname, null, tselect, codemodule + " could not be found"); + dsDir.Add(provider, sce); + return; + } + // check to see if the DLL has been previously loaded // many of the DataProvider done by fyiReporting are in a single code module foreach (SqlConfigEntry sc in dsDir.Values) diff --git a/RdlViewer/RdlViewer.csproj b/RdlViewer/RdlViewer.csproj index 7eb7c54f..1844eba2 100644 --- a/RdlViewer/RdlViewer.csproj +++ b/RdlViewer/RdlViewer.csproj @@ -90,6 +90,25 @@ none prompt + + true + bin\x86\Debug\ + DEBUG;TRACE + 285212672 + 4096 + full + x86 + prompt + + + bin\x86\Release\ + TRACE + 285212672 + true + 4096 + x86 + prompt + System diff --git a/Readme.txt b/Readme.txt index ba2d91a4..d1c1cbc9 100644 --- a/Readme.txt +++ b/Readme.txt @@ -65,6 +65,11 @@ days at the most. *Install .net 4.0 sdk http://www.microsoft.com/download/en/details.aspx?id=8279 ----*This is to use the release build script in the Release-Builds\ folder ----*Only required if you want to use the release script +*Install database references for the databases you want to work with + * SQLite http://sqlite.phxsoftware.com/ + * MySQL ADO.NET Driver http://www.mysql.com/downloads/connector/net/ + * Firebird http://www.firebirdsql.org/en/net-provider/ + * Oracel http://www.oracle.com/technetwork/topics/dotnet/index-085163.html *Create github account if you already do not have one *Create a fork of My-FyiReporting master branch *Do your changes