Skip to content

Commit 2b1d3e8

Browse files
Vishnu7101karthickthangasamy
Vishnu7101
authored and
karthickthangasamy
committed
feature(REPORT-405059): Bold Reports 7.1 Changes
1 parent dcf6400 commit 2b1d3e8

File tree

134 files changed

+11781
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+11781
-177
lines changed

‎Controllers/ReportViewer/CmrReportController.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
using Microsoft.AspNetCore.Mvc;
6+
7+
namespace ReportsCoreSamples.Controllers
8+
{
9+
[Route("report-viewer/cmr-report")]
10+
public class CmrReportController : PreviewController
11+
{
12+
[HttpGet("")]
13+
public IActionResult Index()
14+
{
15+
this.updateMetaData();
16+
return View();
17+
}
18+
19+
}
20+
}

‎Controllers/ReportViewer/InfographicsReportController.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Threading.Tasks;
5+
using Microsoft.AspNetCore.Mvc;
6+
7+
namespace ReportsCoreSamples.Controllers
8+
{
9+
[Route("report-viewer/infographics-report")]
10+
public class InfographicsReportController : PreviewController
11+
{
12+
[HttpGet("")]
13+
public IActionResult Index()
14+
{
15+
this.updateMetaData();
16+
return View();
17+
}
18+
}
19+
}

‎Controllers/ReportWriterController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public override string GetImageFromHTML(string url)
152152
public async Task<string> ConvertBase64(string url)
153153
{
154154
string puppeteerChromeExe = "";
155-
puppeteerChromeExe = Path.Combine(_hostingEnvironment.WebRootPath, "puppeteer", "Win-901912", "chrome-linux", "chrome");
155+
puppeteerChromeExe = Path.Combine(_hostingEnvironment.WebRootPath, "puppeteer", "Win-901912", "chrome-win", "chrome.exe");
156156
await using var browser = await PuppeteerSharp.Puppeteer.LaunchAsync(new PuppeteerSharp.LaunchOptions
157157
{
158158
Headless = true,

‎ReportsCoreSamples.csproj‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.8.0" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Bold.Licensing" Version="6.3.16" />
20-
<PackageReference Include="BoldReports.AspNet.Core" Version="6.3.16" />
21-
<PackageReference Include="BoldReports.CRI.Barcode" Version="6.3.16" />
22-
<PackageReference Include="BoldReports.Net.Core" Version="6.3.16" />
23-
<PackageReference Include="BoldReports.Data.WebData" Version="6.3.16" />
24-
<PackageReference Include="BoldReports.Data.Csv" Version="6.3.16" />
25-
<PackageReference Include="BoldReports.Data.Excel" Version="6.3.16" />
26-
<PackageReference Include="BoldReports.Data.ElasticSearch" Version="6.3.16" />
27-
<PackageReference Include="BoldReports.Data.SSAS" Version="6.3.16" />
19+
<PackageReference Include="Bold.Licensing" Version="7.1.9" />
20+
<PackageReference Include="BoldReports.AspNet.Core" Version="7.1.9" />
21+
<PackageReference Include="BoldReports.CRI.Barcode" Version="7.1.9" />
22+
<PackageReference Include="BoldReports.CRI.Signature" Version="6.1.34" />
23+
<PackageReference Include="BoldReports.Net.Core" Version="7.1.9" />
24+
<PackageReference Include="BoldReports.Data.WebData" Version="7.1.9" />
25+
<PackageReference Include="BoldReports.Data.Csv" Version="7.1.9" />
26+
<PackageReference Include="BoldReports.Data.Excel" Version="7.1.9" />
27+
<PackageReference Include="BoldReports.Data.ElasticSearch" Version="7.1.9" />
28+
<PackageReference Include="BoldReports.Data.SSAS" Version="7.1.9" />
2829
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
2930
<PackageReference Include="log4net" Version="2.0.15" />
3031
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
@@ -35,11 +36,11 @@
3536
</PackageReference>
3637
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
3738
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
38-
<PackageReference Include="BoldReports.Data.MySQL" Version="6.3.16" />
39-
<PackageReference Include="BoldReports.Data.Oracle" Version="6.3.16" />
40-
<PackageReference Include="BoldReports.Data.PostgreSQL" Version="6.3.16" />
41-
<PackageReference Include="BoldReports.Data.Snowflake" Version="6.3.16" />
42-
<PackageReference Include="BoldReports.Data.GoogleBigQuery" Version="6.3.16" />
39+
<PackageReference Include="BoldReports.Data.MySQL" Version="7.1.9" />
40+
<PackageReference Include="BoldReports.Data.Oracle" Version="7.1.9" />
41+
<PackageReference Include="BoldReports.Data.PostgreSQL" Version="7.1.9" />
42+
<PackageReference Include="BoldReports.Data.Snowflake" Version="7.1.9" />
43+
<PackageReference Include="BoldReports.Data.GoogleBigQuery" Version="7.1.9" />
4344
</ItemGroup>
4445
<ItemGroup>
4546
<None Include="Controllers\**" CopyToOutputDirectory="Always" />
@@ -50,4 +51,4 @@
5051
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
5152
</None>
5253
</ItemGroup>
53-
</Project>
54+
</Project>

‎Startup.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public Startup(IConfiguration configuration, IWebHostEnvironment _hostingEnviron
3333
LogExtension.RegisterLog4NetConfig();
3434

3535
string License = File.ReadAllText(System.IO.Path.Combine(_hostingEnvironment.ContentRootPath, "BoldLicense.txt"), Encoding.UTF8);
36-
BoldLicenseProvider.RegisterLicense(License, bool.Parse(configuration.GetSection("appSettings").GetSection("IsOfflineLicense").Value));
36+
BoldLicenseProvider.RegisterLicense(License, bool.Parse(configuration.GetSection("appSettings").GetSection("IsOfflineLicense").Value), bool.Parse(configuration.GetSection("appSettings").GetSection("EnableLicenseLog").Value));
3737
ReportConfig.DefaultSettings = new ReportSettings()
3838
{
3939
MapSetting = this.GetMapSettings(_hostingEnvironment)
@@ -170,7 +170,8 @@ public void Configure(IApplicationBuilder app)
170170
pattern: "{controller=Main}/{action=Index}/{id?}");
171171
endpoints.MapFallback(context =>
172172
{
173-
context.Response.Redirect("/report-viewer/product-line-sales");
173+
var redirectPath = context.Request.PathBase.Value.Contains("aspnet-core") ? "/aspnet-core/report-viewer/product-line-sales/" : "/report-viewer/product-line-sales";
174+
context.Response.Redirect(redirectPath);
174175
return Task.CompletedTask;
175176
});
176177
});

‎Views/CmrReport/Index.cshtml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
@inject Globals globals;
2+
3+
@section control {
4+
5+
<bold-report-viewer id="reportviewer" report-service-url="@Globals.SERVICE_URL" report-path="cmr-report.rdl"
6+
toolbar-rendering="onToolbarRendering" tool-bar-item-click="onToolBarItemClick"
7+
export-item-click="onExportItemClick" />
8+
9+
}
10+
11+
@section description {
12+
<div id="description">
13+
<p>
14+
The CMR International Consignment Note outlines the terms, responsibilities, and legal framework for international road freight transport under the CMR Convention, presented in a comprehensive RDL format.
15+
</p>
16+
<ul>
17+
<li>The CMR International Consignment Note is effectively represented through a variety of table report items, each providing a detailed and informative view of the consignment details.</li>
18+
</ul>
19+
<p>
20+
More information about the image report item can be found in this <a
21+
href="https://help.boldreports.com/enterprise-reporting/designer-guide/report-designer/report-items/tablix/"
22+
target="_blank" rel="noreferrer">documentation</a> section.
23+
</p>
24+
</div>
25+
}

‎Views/InfographicsReport/Index.cshtml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
@inject Globals globals;
2+
3+
@section control {
4+
5+
<bold-report-viewer id="reportviewer" report-service-url="@Globals.SERVICE_URL" report-path="infographics-report.rdl" toolbar-rendering="onToolbarRendering" tool-bar-item-click="onToolBarItemClick" export-item-click="onExportItemClick" />
6+
7+
}
8+
9+
@section description {
10+
<div id="description">
11+
<p>
12+
The Infographics Report showcases the overall academic performance of a college through graphical representations, utilizing the Bold Reports <code>image</code> report item for visually engaging insights.
13+
</p>
14+
<ul>
15+
<li>The report presents student demographics, academic achievements, and study preferences through visually engaging infographics, seamlessly incorporating the concept.</li>
16+
<li>It provides visual insights into key metrics such as graduation rates, course interests, and study habits.</li>
17+
</ul>
18+
<p>
19+
More information about the image report item can be found in this <a
20+
href="https://help.boldreports.com/enterprise-reporting/designer-guide/report-designer/image-manager/"
21+
target="_blank" rel="noreferrer">documentation</a> section.
22+
</p>
23+
</div>
24+
}

‎Views/RDLC/Index.cshtml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
@{
66
List<BoldReports.Models.ReportDesigner.ReportItemExtensionsModule> extensions = new List<BoldReports.Models.ReportDesigner.ReportItemExtensionsModule>(){
77
new BoldReports.Models.ReportDesigner.ReportItemExtensionsModule{Name="barcode",ClassName="EJBarcode",ImageClass="customitem-barcode",DisplayName="1D Barcode",Category="Barcodes"},
8-
new BoldReports.Models.ReportDesigner.ReportItemExtensionsModule{Name="matrixbarcode",ClassName="EJQRBarcode",ImageClass="customitem-qrbarcode",DisplayName="2D Barcode",Category="Barcodes"}
8+
new BoldReports.Models.ReportDesigner.ReportItemExtensionsModule{Name="matrixbarcode",ClassName="EJQRBarcode",ImageClass="customitem-qrbarcode",DisplayName="2D Barcode",Category="Barcodes"},
9+
new BoldReports.Models.ReportDesigner.ReportItemExtensionsModule{Name="ESignature",ClassName="EJSignature",ImageClass="customitem-signature",DisplayName="Electronic",Category="Signature"}
910
};
1011
}
1112

@@ -96,4 +97,4 @@
9697
9798
</script>
9899
99-
}
100+
}

‎Views/ReportDesigner/Index.cshtml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
@{
66
List<BoldReports.Models.ReportDesigner.ReportItemExtensionsModule> extensions = new List<BoldReports.Models.ReportDesigner.ReportItemExtensionsModule>(){
77
new BoldReports.Models.ReportDesigner.ReportItemExtensionsModule{Name="barcode",ClassName="EJBarcode",ImageClass="customitem-barcode",DisplayName="1D Barcode",Category="Barcodes"},
8-
new BoldReports.Models.ReportDesigner.ReportItemExtensionsModule{Name="matrixbarcode",ClassName="EJQRBarcode",ImageClass="customitem-qrbarcode",DisplayName="2D Barcode",Category="Barcodes"}
8+
new BoldReports.Models.ReportDesigner.ReportItemExtensionsModule{Name="matrixbarcode",ClassName="EJQRBarcode",ImageClass="customitem-qrbarcode",DisplayName="2D Barcode",Category="Barcodes"},
9+
new BoldReports.Models.ReportDesigner.ReportItemExtensionsModule{Name="ESignature",ClassName="EJSignature",ImageClass="customitem-signature",DisplayName="Electronic",Category="Signature"}
910
};
1011
}
1112

@@ -96,4 +97,4 @@
9697
};
9798
</script>
9899
99-
}
100+
}

‎Views/ReportWriter/Index.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div class="r-w-sample-title">Website Visitor Analysis</div>
2727
</div>
2828
<div class="r-w-sample r-w-sample-portrait" onclick="onSampleClick({event: event, name:'sales-report'})">
29-
<img class="r-w-sample-image" style="background-position-y: 1200px" />
29+
<img class="r-w-sample-image" style="background-position-y: -2160px" />
3030
<div class="r-w-sample-title">Sales Report</div>
3131
</div>
3232
<div class="r-w-sample r-w-sample-portrait" onclick="onSampleClick({event: event, name:'sub-report'})">

0 commit comments

Comments
 (0)