Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(REPORT-320537): Bold-Reports 5.2 Release Changes #28

Merged
merged 4 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Content/css/bold-reports/material/bold.theme.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Content/css/bold-reports/material/images/slider-tick.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions Content/css/common/writer.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/* form*/
.r-w-form {
.tab-content .tab-pane ej-sample form{
display: inherit;
overflow: inherit;
height: 100%;
width: 100%;
width: 100%;
}


/* container*/
.r-w-container {
height: 100%;
Expand Down
10 changes: 5 additions & 5 deletions Content/css/dependent/bootstrap.min.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions Controllers/ReportViewer/ExternalParameterReportController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.Http;
using System.Web.Mvc;
using ReportsMVCSamples.Models;
using HttpPostAttribute = System.Web.Http.HttpPostAttribute;

namespace ReportsMVCSamples.Controllers.ReportViewer
{
public class ExternalParameterReportController : PreviewController
{
// GET: ExternalParameterReport
[HttpPost]
public ActionResult Index()
{
string productCategoryData = SqlQuery.getProductCategory();
Expand Down
1 change: 1 addition & 0 deletions Controllers/ReportWriterController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public ActionResult Index()
}

[HttpPost]
[ValidateAntiForgeryToken]
public void generate(string reportName, string type)
{
try
Expand Down
2 changes: 2 additions & 0 deletions Global.asax.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class MvcApplication : System.Web.HttpApplication
{
protected void Application_Start()
{
System.Web.Helpers.AntiForgeryConfig.UniqueClaimTypeIdentifier = System.Security.Claims.ClaimTypes.NameIdentifier;
string License = File.ReadAllText(Server.MapPath("BoldLicense.txt"), Encoding.UTF8);
log4net.GlobalContext.Properties["LogPath"] = this.GetAppDataFolderPath();
BoldReports.Base.Logger.LogExtension.RegisterLog4NetConfig();
Expand All @@ -34,6 +35,7 @@ protected void Application_Start()
FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters);
RouteConfig.RegisterRoutes(RouteTable.Routes);
BundleConfig.RegisterBundles(BundleTable.Bundles);

}
private List<string> GetDataExtension()
{
Expand Down
Binary file removed NuGet/Bold.Licensing.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/Bold.Licensing.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Base.Logger.3.3.23.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Base.Logger.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Base.Logger.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.CRI.Barcode.3.3.23.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.CRI.Barcode.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.CRI.Barcode.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Data.Csv.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Data.Csv.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Data.ElasticSearch.5.1.20.nupkg
Binary file not shown.
Binary file not shown.
Binary file removed NuGet/BoldReports.Data.Excel.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Data.Excel.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Data.MySQL.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Data.MySQL.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Data.Oracle.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Data.Oracle.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Data.PostgreSQL.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Data.PostgreSQL.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Data.SSAS.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Data.SSAS.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Data.WebData.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Data.WebData.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Mvc5.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Mvc5.5.2.26.nupkg
Binary file not shown.
Binary file removed NuGet/BoldReports.Web.5.1.20.nupkg
Binary file not shown.
Binary file added NuGet/BoldReports.Web.5.2.26.nupkg
Binary file not shown.
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("5.1.20")]
[assembly: AssemblyFileVersion("5.1.20")]
[assembly: AssemblyVersion("5.2.26")]
[assembly: AssemblyFileVersion("5.2.26")]
26 changes: 13 additions & 13 deletions ReportsMVCSamples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,32 +50,32 @@
<HintPath>packages\BarcodeLib.1.3.0.0\lib\net20\BarcodeLib.dll</HintPath>
</Reference>
<Reference Include="Bold.Licensing">
<HintPath>packages\Bold.Licensing.5.1.20\lib\net45\Bold.Licensing.dll</HintPath>
<HintPath>packages\Bold.Licensing.5.2.26\lib\net45\Bold.Licensing.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="BoldReports.Data.WebData">
<HintPath>packages\BoldReports.Data.WebData.5.1.20\lib\net45\BoldReports.Data.WebData.dll</HintPath>
<HintPath>packages\BoldReports.Data.WebData.5.2.26\lib\net45\BoldReports.Data.WebData.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Data.Csv">
<HintPath>packages\BoldReports.Data.Csv.5.1.20\lib\net45\BoldReports.Data.Csv.dll</HintPath>
<HintPath>packages\BoldReports.Data.Csv.5.2.26\lib\net45\BoldReports.Data.Csv.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Data.Excel">
<HintPath>packages\BoldReports.Data.Excel.5.1.20\lib\net45\BoldReports.Data.Excel.dll</HintPath>
<HintPath>packages\BoldReports.Data.Excel.5.2.26\lib\net45\BoldReports.Data.Excel.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Data.SSAS">
<HintPath>packages\BoldReports.Data.SSAS.5.1.20\lib\net45\BoldReports.Data.SSAS.dll</HintPath>
<HintPath>packages\BoldReports.Data.SSAS.5.2.26\lib\net45\BoldReports.Data.SSAS.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Data.ElasticSearch">
<HintPath>packages\BoldReports.Data.ElasticSearch.5.1.20\lib\net45\BoldReports.Data.ElasticSearch.dll</HintPath>
<HintPath>packages\BoldReports.Data.ElasticSearch.5.2.26\lib\net45\BoldReports.Data.ElasticSearch.dll</HintPath>
</Reference>
<Reference Include="BoldReports.CRI.Barcode">
<HintPath>packages\BoldReports.CRI.Barcode.5.1.20\lib\net45\BoldReports.CRI.Barcode.dll</HintPath>
<HintPath>packages\BoldReports.CRI.Barcode.5.2.26\lib\net45\BoldReports.CRI.Barcode.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Mvc">
<HintPath>packages\BoldReports.Mvc5.5.1.20\lib\net45\BoldReports.Mvc.dll</HintPath>
<HintPath>packages\BoldReports.Mvc5.5.2.26\lib\net45\BoldReports.Mvc.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Web">
<HintPath>packages\BoldReports.Web.5.1.20\lib\net45\BoldReports.Web.dll</HintPath>
<HintPath>packages\BoldReports.Web.5.2.26\lib\net45\BoldReports.Web.dll</HintPath>
</Reference>
<Reference Include="KBCsv, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc96fa93a217f7a1, processorArchitecture=MSIL">
<HintPath>packages\KBCsv.5.0.0\lib\netstandard1.0\KBCsv.dll</HintPath>
Expand Down Expand Up @@ -112,7 +112,7 @@
<HintPath>packages\Syncfusion.Presentation.AspNet.20.2.0.36\lib\net45\Syncfusion.Presentation.Base.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Base.Logger">
<HintPath>packages\BoldReports.Base.Logger.5.1.20\lib\net45\BoldReports.Base.Logger.dll</HintPath>
<HintPath>packages\BoldReports.Base.Logger.5.2.26\lib\net45\BoldReports.Base.Logger.dll</HintPath>
</Reference>
<Reference Include="Syncfusion.SfBarcode.WPF">
<HintPath>packages\Syncfusion.SfBarcode.WPF.20.2.0.36\lib\net45\Syncfusion.SfBarcode.WPF.dll</HintPath>
Expand Down Expand Up @@ -189,13 +189,13 @@
<HintPath>packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Data.MySQL">
<HintPath>packages\BoldReports.Data.MySQL.5.1.20\lib\net45\BoldReports.Data.MySQL.dll</HintPath>
<HintPath>packages\BoldReports.Data.MySQL.5.2.26\lib\net45\BoldReports.Data.MySQL.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Data.Oracle">
<HintPath>packages\BoldReports.Data.Oracle.5.1.20\lib\net45\BoldReports.Data.Oracle.dll</HintPath>
<HintPath>packages\BoldReports.Data.Oracle.5.2.26\lib\net45\BoldReports.Data.Oracle.dll</HintPath>
</Reference>
<Reference Include="BoldReports.Data.PostgreSQL">
<HintPath>packages\BoldReports.Data.PostgreSQL.5.1.20\lib\net45\BoldReports.Data.PostgreSQL.dll</HintPath>
<HintPath>packages\BoldReports.Data.PostgreSQL.5.2.26\lib\net45\BoldReports.Data.PostgreSQL.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Scripts/bold-reports/bold.report-designer.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Scripts/bold-reports/bold.report-viewer.min.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Scripts/bold-reports/common/bold.reports.common.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Scripts/bold-reports/common/bold.reports.react.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/bold.reports.widgets.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/ej.unobtrusive.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/ej.webform.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/ej.widget.angular.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/ej.widget.ko.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/ej2-base.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/ej2-data.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/ej2-pdf-export.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/common/ej2-svg-base.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Scripts/bold-reports/data-visualization/ej.chart.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Scripts/common/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
args.e.preventDefault();
let curSampleData = reportSamples[args.index];
let reportPath = curSampleData.routerPath ? (curSampleData.basePath + '/' + curSampleData.routerPath) : curSampleData.basePath;
location.href = location.origin + getBasePath() + reportPath;
let routePath = location.origin + getBasePath() + reportPath;
if (location.href != routePath){
location.href = routePath;
}
}

function onHomeBtnClick() {
Expand Down
8 changes: 4 additions & 4 deletions Scripts/dependent/bootstrap.min.js

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions Scripts/samples.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"JavaScript": "javascript/#/",
"React": "react/#/",
"Blazor": "blazor/",
"ASP.NET Core": "aspnet-core/",
"ASP.NET WebForms": "aspnet-web-forms/"
"ASP.NET Core": "aspnet-core/"
},
"platform": "ASP.NET MVC",
"banner": {
Expand Down Expand Up @@ -373,4 +372,4 @@
}
}
]
}
}
5 changes: 4 additions & 1 deletion Views/ExternalParameterReport/Index.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@section control {
@using (Html.BeginForm()){
@Html.AntiForgeryToken();
@section control {
<form>
<div class="r-w-container">
<div class="r-w-sample-container">
Expand Down Expand Up @@ -148,3 +150,4 @@
</p>
</div>
}
}
Loading