Skip to content

Commit 17b5ffb

Browse files
karthickthangasamykarthickthangasamy
authored
Merge pull request #41 from SundaresanGunasekaran/master
feature(REPORT-428356): Bold Reports 9.1 Release Changes
2 parents dd32109 + cfe90d2 commit 17b5ffb

10 files changed

Lines changed: 109 additions & 28 deletions

File tree

‎build/templates/common/index.css‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,13 @@ body {
172172
}
173173

174174
#r-w-container #r-w-property-container {
175-
height: 100%;
175+
height: auto;
176176
width: 30%;
177+
position: relative;
178+
}
179+
180+
#r-w-property-container .e-spinner-pane {
181+
background-color: rgba(0, 0, 0, 0.4);
177182
}
178183

179184
#r-w-property-name-category {
@@ -223,6 +228,7 @@ body {
223228
#r-w-property-enddate {
224229
display: inline-flex;
225230
margin-left: 20px;
231+
margin-right: 20px;
226232
}
227233

228234
#r-w-property-name-category,
@@ -313,6 +319,7 @@ body {
313319
display: flex;
314320
position: fixed;
315321
z-index: 1;
322+
font-family: "Roboto", "Segoe UI", "GeezaPro", "DejaVu Serif", "sans-serif";
316323
justify-content: space-between;
317324
}
318325

‎build/templates/common/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<div class="ej-preview-header">
6060
<div class="ej-preview-left-side">
6161
<a id="home_page" href="/" target="_blank">
62-
<div class="ej-preview-platform-name">Bold Reports for JavaScript</div>
62+
<h1 class="ej-preview-platform-name">Bold Reports<sup>®</sup> for JavaScript</h1>
6363
</a>
6464
</div>
6565
<div class="ej-preview-right-side">
@@ -68,7 +68,7 @@
6868
title="Report Server" target="_blank">Schedule Free Demo</a> -->
6969
<a class="ej-preview-button product-detail" href="https://www.boldreports.com/embedded-reporting/javascript-report-viewer"
7070
title="Report Viewer" target="_blank">Product Detail</a>
71-
<a class="ej-preview-button try-it-free" href="https://app.boldid.net/reporting/embedded/register?plan=120&evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/"
71+
<a class="ej-preview-button try-it-free" href="https://app.boldid.net/register/reports/enterprise?evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/&host=server&quantity=1"
7272
title="Report Server" target="_blank">Try it Free</a>
7373
</div>
7474
</div>

‎build/templates/common/index.js‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as jquery from 'jquery';
22
window['$'] = jquery;
3-
import * as data from './../../../src/controls/samples.json';
4-
window['reportSamples'] = data.default.samples;
3+
import samplesData from './../../../src/controls/samples.json';
4+
window['reportSamples'] = samplesData.samples;
55
import './../../../src/controls/rdlcData';
66

77
//bootstrap
@@ -25,6 +25,16 @@ import './../extensions/report-item-extensions/barcode.reportitem.css';
2525
import { EJBarcode } from './../extensions/report-item-extensions/barcode.reportitem';
2626
import { EJQRBarcode } from './../extensions/report-item-extensions/qrbarcode.reportitem';
2727

28+
//signature
29+
import './../extensions/report-item-extensions/signature.reportitem.css';
30+
import './../extensions/report-item-extensions/signature.dialog.css';
31+
import { EJSignature } from './../extensions/report-item-extensions/signature.reportitem';
32+
import { SignatureDialog } from './../extensions/report-item-extensions/signature.dialog';
33+
34+
//shape
35+
import './../extensions/report-item-extensions/shape.reportitem.css';
36+
import { EJShape } from './../extensions/report-item-extensions/shape.reportitem';
37+
2838
//globals
2939
import './../../../src/controls/globals';
3040

@@ -33,6 +43,14 @@ let qrBarcode = 'EJQRBarcode';
3343
window[barcode] = EJBarcode;
3444
window[qrBarcode] = EJQRBarcode;
3545

46+
let signature = 'EJSignature';
47+
let signatureDialog = 'SignatureDialog';
48+
window[signature] = EJSignature;
49+
window[signatureDialog] = SignatureDialog;
50+
51+
let shape = 'EJShape';
52+
window[shape] = EJShape;
53+
3654
//code-mirror
3755
import 'codemirror/lib/codemirror';
3856
import 'codemirror/addon/hint/show-hint';
@@ -45,9 +63,8 @@ import './../../../node_modules/codemirror/addon/hint/show-hint.css';
4563
import * as CodeMirror from 'codemirror';
4664
window['CodeMirror'] = CodeMirror;
4765

48-
$(function () {
49-
let url = location.origin.indexOf('demos.boldreports.com') !== -1 ? '/' : '/demos/';
50-
document.getElementById('home_page').setAttribute('href', url + 'javascript/#/');
66+
$(function() {
67+
document.getElementById('home_page').setAttribute('href', '/javascript/#/');
5168
});
5269

5370
window.addEventListener('beforeunload', () => {

‎build/templates/report-designer/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<div class="ej-preview-header">
4141
<div class="ej-preview-left-side">
4242
<a id="home_page" href="/" target="_blank">
43-
<div class="ej-preview-platform-name">Bold Reports for JavaScript</div>
43+
<h1 class="ej-preview-platform-name">Bold Reports<sup>®</sup> for JavaScript</h1>
4444
</a>
4545
</div>
4646
<div class="ej-preview-right-side">
@@ -49,7 +49,7 @@
4949
title="Report Server" target="_blank">Schedule Free Demo</a> -->
5050
<a class="ej-preview-button product-detail" href="https://www.boldreports.com/embedded-reporting/javascript-report-designer"
5151
title="Report Designer" target="_blank">Product Detail</a>
52-
<a class="ej-preview-button try-it-free" href="https://app.boldid.net/reporting/embedded/register?plan=120&evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/"
52+
<a class="ej-preview-button try-it-free" href="https://app.boldid.net/register/reports/enterprise?evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/&host=server&quantity=1"
5353
title="Report Server" target="_blank">Try it Free</a>
5454
</div>
5555
</div>

‎build/templates/report-designer/index.js‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ if (reportName) {
1111
}
1212

1313
$(function () {
14+
var url = location.host;
1415
$("#container").boldReportDesigner({
1516
// Specifies the URL of the WebAPI service. It will be used for processing the report.
1617
serviceUrl: window.Globals.DESIGNER_SERVICE_URL,
1718
// This event will be triggered when the Report Designer widget is created
1819
create: controlCreate,
19-
permissionSettings: { dataSource: ej.ReportDesigner.Permission.All & ~ej.ReportDesigner.Permission.Create},
20+
permissionSettings: url.indexOf("demos.boldreports.com") !== -1 ? { dataSource: ej.ReportDesigner.Permission.All & ~ej.ReportDesigner.Permission.Create } : { dataSource: ej.ReportDesigner.Permission.All },
2021
reportItemExtensions: [{
2122
name: 'barcode',
2223
className: 'EJBarcode',
@@ -39,9 +40,31 @@ $(function () {
3940
description: 'Display the barcode lines as report item.',
4041
title: '2D Barcode'
4142
}
43+
}, {
44+
name: 'ESignature',
45+
className: 'EJSignature',
46+
imageClass: 'customitem-signature',
47+
displayName: 'Electronic',
48+
category: 'Signature',
49+
toolTip:{
50+
requirements: 'Add a report item to the designer area.',
51+
description: 'This report item is used to add a graphic signature.',
52+
title: 'Signature'
53+
}
54+
}, {
55+
name: 'Shape',
56+
className: 'EJShape',
57+
imageClass: 'customitem-shape',
58+
displayName: 'Shape',
59+
category: 'Shapes',
60+
toolTip: {
61+
requirements: 'Add a report item to the designer area',
62+
description: 'Display the different types of shapes as report item',
63+
title: 'Shapes'
64+
}
4265
}],
4366
toolbarSettings: {
44-
items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open
67+
items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.New & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open
4568
},
4669
ajaxBeforeLoad: onAjaxBeforeLoad,
4770
toolbarRendering: window.Globals.DESIGNER_TOOLBAR_RENDERING,
@@ -74,6 +97,15 @@ function controlCreate() {
7497
}
7598
});
7699
}
100+
if (reportName == "powerpoint-report.rdl") {
101+
designerInst.setModel({
102+
previewOptions: {
103+
exportSettings: {
104+
exportOptions: ej.ReportViewer.ExportOptions.PPT
105+
}
106+
}
107+
});
108+
}
77109
}
78110

79111
function onAjaxBeforeLoad(args) {
@@ -93,10 +125,12 @@ function updateDescription() {
93125
metaDes = metaDes.replace(/{{sampleName}}/g, title);
94126
document.getElementsByName('description')[0].content = metaDes;
95127
title += ' | JavaScript Report Designer';
96-
document.title = title.length < 45 ? title += ' | Bold Reports' : title;
128+
const titleWithBoldReports = (title.length < 45) ? title += ' | Bold Reports' : title;
129+
document.title = titleWithBoldReports;
130+
document.querySelector('meta[property="og:title"]').setAttribute('content', titleWithBoldReports);
97131
}
98132

99133
function getReportName() {
100134
const reportNameRegex = /[\\?&]report-name=([^&#]*)/.exec(location.search);
101135
return reportNameRegex ? reportNameRegex[1] : undefined;
102-
};
136+
};

‎build/templates/report-designer/rdlc/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<div class="ej-preview-header">
4141
<div class="ej-preview-left-side">
4242
<a id="home_page" href="/" target="_blank">
43-
<div class="ej-preview-platform-name">Bold Reports for JavaScript</div>
43+
<h1 class="ej-preview-platform-name">Bold Reports<sup>®</sup> for JavaScript</h1>
4444
</a>
4545
</div>
4646
<div class="ej-preview-right-side">
@@ -49,7 +49,7 @@
4949
title="Report Server" target="_blank">Schedule Free Demo</a> -->
5050
<a class="ej-preview-button product-detail" href="https://www.boldreports.com/embedded-reporting/javascript-report-designer"
5151
title="Report Designer" target="_blank">Product Detail</a>
52-
<a class="ej-preview-button try-it-free" href="https://app.boldid.net/reporting/embedded/register?plan=120&evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/"
52+
<a class="ej-preview-button try-it-free" href="https://app.boldid.net/register/reports/enterprise?evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/&host=server&quantity=1"
5353
title="Report Server" target="_blank">Try it Free</a>
5454
</div>
5555
</div>

‎build/templates/report-designer/rdlc/index.js‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,13 @@ if (reportName) {
1111
}
1212

1313
$(function () {
14+
var url = location.host;
1415
$("#container").boldReportDesigner({
1516
// Specifies the URL of the WebAPI service. It will be used for processing the report.
1617
serviceUrl: window.Globals.DESIGNER_SERVICE_URL,
1718
// This event will be triggered when the Report Designer widget is created
1819
create: controlCreate,
19-
permissionSettings: { dataSource: ej.ReportDesigner.Permission.All & ~ej.ReportDesigner.Permission.Create},
20+
permissionSettings: url.indexOf("demos.boldreports.com") !== -1 ? { dataSource: ej.ReportDesigner.Permission.All & ~ej.ReportDesigner.Permission.Create } : { dataSource: ej.ReportDesigner.Permission.All },
2021
reportItemExtensions: [{
2122
name: 'barcode',
2223
className: 'EJBarcode',
@@ -39,9 +40,31 @@ $(function () {
3940
description: 'Display the barcode lines as report item.',
4041
title: '2D Barcode'
4142
}
43+
}, {
44+
name: 'ESignature',
45+
className: 'EJSignature',
46+
imageClass: 'customitem-signature',
47+
displayName: 'Electronic',
48+
category: 'Signature',
49+
toolTip:{
50+
requirements: 'Add a report item to the designer area.',
51+
description: 'This report item is used to add a graphic signature.',
52+
title: 'Signature'
53+
}
54+
}, {
55+
name: 'Shape',
56+
className: 'EJShape',
57+
imageClass: 'customitem-shape',
58+
displayName: 'Shape',
59+
category: 'Shapes',
60+
toolTip: {
61+
requirements: 'Add a report item to the designer area',
62+
description: 'Display the different types of shapes as report item',
63+
title: 'Shapes'
64+
}
4265
}],
4366
toolbarSettings: {
44-
items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open
67+
items: ej.ReportDesigner.ToolbarItems.All & ~ej.ReportDesigner.ToolbarItems.New & ~ej.ReportDesigner.ToolbarItems.Save & ~ej.ReportDesigner.ToolbarItems.Open
4568
},
4669
ajaxBeforeLoad: onAjaxBeforeLoad,
4770
reportOpened: onReportOpened,
@@ -102,10 +125,12 @@ function updateDescription() {
102125
metaDes = metaDes.replace(/{{sampleName}}/g, title);
103126
document.getElementsByName('description')[0].content = metaDes;
104127
title += ' | JavaScript Report Designer';
105-
document.title = title.length < 45 ? title += ' | Bold Reports' : title;
128+
const titleWithBoldReports = (title.length < 45) ? title += ' | Bold Reports' : title;
129+
document.title = titleWithBoldReports;
130+
document.querySelector('meta[property="og:title"]').setAttribute('content', titleWithBoldReports);
106131
}
107132

108133
function getReportName() {
109134
const reportNameRegex = /[\\?&]report-name=([^&#]*)/.exec(location.search);
110135
return reportNameRegex ? reportNameRegex[1] : undefined;
111-
};
136+
};

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "javascript-samples",
3-
"version": "7.1.9",
3+
"version": "9.1.7",
44
"description": "",
55
"author": "",
66
"license": "ISC",
@@ -39,8 +39,8 @@
3939
},
4040
"dependencies": {
4141
"@babel/polyfill": "7.2.5",
42-
"@boldreports/javascript-reporting-controls": "7.1.9",
43-
"@boldreports/javascript-reporting-extensions": "7.1.9",
42+
"@boldreports/javascript-reporting-controls": "9.1.7",
43+
"@boldreports/javascript-reporting-extensions": "9.1.7",
4444
"codemirror": "5.58.2",
4545
"hasher": "1.2.0",
4646
"jquery": "3.6.0",

‎src/common/header/header.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="ej-sb-header">
22
<div class="ej-sb-left-side">
33
<div class="ej-sb-hamburger-icon ej-sb-icons"></div>
4-
<div class="ej-sb-platform-name">Bold Reports for JavaScript</div>
4+
<div class="ej-sb-platform-name">Bold Reports<sup>®</sup> for JavaScript</div>
55
<div class="dropdown">
66
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton"
77
data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -13,6 +13,6 @@
1313
<!-- We hided this element as per management instruction -->
1414
<!-- <a class="ej-sb-button nav-link bold-schedule-demo" href="https://www.boldreports.com/schedule-free-demo" target="_blank" rel="noreferrer">Schedule Free Demo</a> -->
1515
<a class="ej-sb-button nav-link product-detail" href="https://www.boldreports.com/embedded-reporting/javascript-report-viewer" target="_blank" rel="noreferrer">Product Detail</a>
16-
<a class="ej-sb-button nav-link try-it-free" href="https://app.boldid.net/reporting/embedded/register?plan=194&evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/&host=server&quantity=1" target="_blank" rel="noreferrer">Try it Free</a>
16+
<a class="ej-sb-button nav-link try-it-free" href="https://app.boldid.net/register/reports/enterprise?evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/&host=server&quantity=1" target="_blank" rel="noreferrer">Try it Free</a>
1717
</div>
1818
</div>

‎src/controls/samples.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"Intuitive drag-and-drop widgets",
2424
"Hassle-free licensing"
2525
],
26-
"freeTrialUrl": "https://app.boldid.net/reporting/embedded/register?plan=194&evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/&host=server&quantity=1"
26+
"freeTrialUrl": "https://app.boldid.net/register/reports/enterprise?evaluation=v2&leadsource=demos.boldreports.com&gclid=&referrerroriginurl=https://demos.boldreports.com/pricing&secondaryreferraloriginurl=https://demos.boldreports.com/&host=server&quantity=1"
2727
},
2828
"copyrightYear": "2025",
2929
"samples": [
@@ -436,7 +436,6 @@
436436
{
437437
"routerPath": "cmr-report",
438438
"sampleName": "CMR Report",
439-
"status": "New",
440439
"basePath": "report-viewer",
441440
"directoryName": "cmr-report",
442441
"imageDetails": {
@@ -452,7 +451,6 @@
452451
"sampleName": "Infographics Report",
453452
"basePath": "report-viewer",
454453
"directoryName": "infographics-report",
455-
"status": "New",
456454
"imageDetails": {
457455
"isLandscape": false,
458456
"index": 17

0 commit comments

Comments
 (0)