Skip to content

Commit 58995cd

Browse files
karthickthangasamykarthickthangasamy
authored
Merge pull request #46 from SundaresanGunasekaran/master
feature(REPORT-478182): Bold Reports 12.1 Release Changes
2 parents d3668a8 + 0ae9617 commit 58995cd

17 files changed

Lines changed: 141 additions & 21 deletions

File tree

‎assets/sidebar/portrait.png‎

-1.78 MB
Loading

‎build/copy.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ const { cp, mkdir } = require('shelljs');
33
const fs = require('fs');
44

55
const scripts = {
6-
common: ['common/ej2-base.min.js', 'common/ej2-data.min.js', 'common/ej2-pdf-export.min.js', 'common/ej2-svg-base.min.js'],
7-
control: ['data-visualization/ej2-circulargauge.min.js', 'data-visualization/ej2-lineargauge.min.js', 'data-visualization/ej2-maps.min.js'],
86
barcode: ['images', 'barcode.reportitem.css', 'barcode.reportitem.js', 'qrbarcode.reportitem.js'],
97
signature: ['signature.reportitem.css', 'signature.dialog.css', 'signature.reportitem.js', 'signature.dialog.js'],
108
shape: ['shape.reportitem.css', 'shape.reportitem.js'],
119
pdf: ['document.reportitem.css', 'pdfdocument.reportitem.js'],
12-
html: ['htmldocument.reportitem.js']
10+
html: ['htmldocument.reportitem.js'],
11+
pdfSignature: ['pdf.signature.reportitem.css', 'pdf.signature.reportitem.js']
1312
};
1413

1514
const srcDir = 'node_modules/@boldreports/javascript-reporting-controls/Scripts/';
@@ -23,17 +22,17 @@ const extensionsExportTemp = {
2322
'signatureDialog': 'export { SignatureDialog }',
2423
'shape': 'export { EJShape }',
2524
'pdfDocument': 'export { EJPdfDocument }',
26-
'htmlDocument': 'export { EJHtmlDocument }'
25+
'htmlDocument': 'export { EJHtmlDocument }',
26+
'pdfSignature': 'export { EJPDFSignature }'
2727
}
2828

2929
gulp.task('copy', (done) => {
30-
copyFiles(scripts.common, srcDir, destDir + 'common');
31-
copyFiles(scripts.control, srcDir, destDir + 'data-visualization');
3230
copyFiles(scripts.barcode, extensionsItemSrcDir, extensionsItemDir);
3331
copyFiles(scripts.signature, extensionsItemSrcDir, extensionsItemDir);
3432
copyFiles(scripts.shape, extensionsItemSrcDir, extensionsItemDir);
3533
copyFiles(scripts.html, extensionsItemSrcDir, extensionsItemDir);
3634
copyFiles(scripts.pdf, extensionsItemSrcDir, extensionsItemDir);
35+
copyFiles(scripts.pdfSignature, extensionsItemSrcDir, extensionsItemDir);
3736
done();
3837
});
3938

@@ -52,7 +51,8 @@ gulp.task('update-extensions-export', (done) => {
5251
'signatureDialog': ['signature.dialog.js', 'signatureDialog'],
5352
'shape': ['shape.reportitem.js', 'shape'],
5453
'pdfDocument': ['pdfdocument.reportitem.js', 'pdfDocument'],
55-
'htmlDocument': ['htmldocument.reportitem.js', 'htmlDocument']
54+
'htmlDocument': ['htmldocument.reportitem.js', 'htmlDocument'],
55+
'pdfSignature': ['pdf.signature.reportitem.js', 'pdfSignature']
5656
};
5757
const updateFile = (key, [filename, exportKey]) => {
5858
const filePath = `${extensionsItemDir}${filename}`;

‎build/templates/common/index.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121
location.href = location.origin + '/error.html';
2222
}
2323
}
24+
(function addTrailingSlash() {
25+
var path = window.location.pathname;
26+
if (path.indexOf('/preview') !== -1 && !path.endsWith('/')) {
27+
var newUrl = window.location.origin + path + '/';
28+
window.location.replace(newUrl);
29+
}
30+
})();
2431
</script>
2532
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico">
2633
<link href="../../../common/index.css" rel="stylesheet" />

‎build/templates/common/index.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ import { SignatureDialog } from './../extensions/report-item-extensions/signatur
4949
import './../extensions/report-item-extensions/shape.reportitem.css';
5050
import { EJShape } from './../extensions/report-item-extensions/shape.reportitem';
5151

52+
//PDF signature
53+
import './../extensions/report-item-extensions/pdf.signature.reportitem.css';
54+
import { EJPDFSignature } from './../extensions/report-item-extensions/pdf.signature.reportitem';
55+
5256
//globals
5357
import './../../../src/controls/globals';
5458

@@ -70,6 +74,9 @@ let htmlDocument = 'EJHtmlDocument';
7074
window[pdfDocument] = EJPdfDocument;
7175
window[htmlDocument] = EJHtmlDocument;
7276

77+
let pdfSignature = 'EJPDFSignature';
78+
window[pdfSignature] = EJPDFSignature;
79+
7380
//code-mirror
7481
import 'codemirror/lib/codemirror';
7582
import 'codemirror/addon/hint/show-hint';

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121
location.href = location.origin + '/error.html';
2222
}
2323
}
24+
(function addTrailingSlash() {
25+
var path = window.location.pathname;
26+
if (path === '/report-designer') {
27+
var newUrl = window.location.origin + path + '/' + window.location.search;
28+
window.location.replace(newUrl);
29+
}
30+
})();
2431
</script>
2532
<link href="../favicon.ico" type="image/x-icon" rel="shortcut icon" />
2633
<link href="../common/index.css" rel="stylesheet" />

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,22 @@ $(function () {
4545
className: 'EJSignature',
4646
imageClass: 'customitem-signature',
4747
displayName: 'Electronic',
48-
category: 'Signature',
48+
category: 'Signatures',
4949
toolTip:{
5050
requirements: 'Add a report item to the designer area.',
5151
description: 'This report item is used to add a graphic signature.',
52-
title: 'Signature'
52+
title: 'Electronic Signature'
53+
}
54+
}, {
55+
name: 'PDFSignature',
56+
className: 'EJPDFSignature',
57+
imageClass: 'customitem-pdfsignature',
58+
displayName: 'PDF',
59+
category: 'Signatures',
60+
toolTip:{
61+
requirements: 'Add a report item to the designer area.',
62+
description: 'This report item is used to add a digital PDF signature.',
63+
title: 'PDF Signature'
5364
}
5465
}, {
5566
name: 'Shape',

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121
location.href = location.origin + '/error.html';
2222
}
2323
}
24+
(function addTrailingSlash() {
25+
var path = window.location.pathname;
26+
if (path === '/report-designer/rdlc') {
27+
var newUrl = window.location.origin + path + '/' + window.location.search;
28+
window.location.replace(newUrl);
29+
}
30+
})();
2431
</script>
2532
<link href="../../favicon.ico" type="image/x-icon" rel="shortcut icon" />
2633
<link href="../../common/index.css" rel="stylesheet" />

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,22 @@ $(function () {
4545
className: 'EJSignature',
4646
imageClass: 'customitem-signature',
4747
displayName: 'Electronic',
48-
category: 'Signature',
48+
category: 'Signatures',
4949
toolTip:{
5050
requirements: 'Add a report item to the designer area.',
5151
description: 'This report item is used to add a graphic signature.',
52-
title: 'Signature'
52+
title: 'Electronic Signature'
53+
}
54+
}, {
55+
name: 'PDFSignature',
56+
className: 'EJPDFSignature',
57+
imageClass: 'customitem-pdfsignature',
58+
displayName: 'PDF',
59+
category: 'Signatures',
60+
toolTip:{
61+
requirements: 'Add a report item to the designer area.',
62+
description: 'This report item is used to add a digital PDF signature.',
63+
title: 'PDF Signature'
5364
}
5465
}, {
5566
name: 'Shape',

‎index.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@
2828
location.href = location.origin + '/error.html';
2929
}
3030
}
31+
function addTrailingSlash() {
32+
var path = window.location.href;
33+
if (path && path !== '/' && !path.endsWith('/')) {
34+
var newUrl = path + '/';
35+
window.location.replace(newUrl);
36+
}
37+
}
38+
addTrailingSlash();
39+
window.addEventListener('hashchange', addTrailingSlash, false);
3140
</script>
3241
<link rel="stylesheet" href="app.css" />
3342
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />

‎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": "11.1.10",
3+
"version": "12.1.12",
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": "11.1.10",
43-
"@boldreports/javascript-reporting-extensions": "11.1.10",
42+
"@boldreports/javascript-reporting-controls": "12.1.12",
43+
"@boldreports/javascript-reporting-extensions": "12.1.12",
4444
"codemirror": "5.58.2",
4545
"hasher": "1.2.0",
4646
"jquery": "3.6.0",

0 commit comments

Comments
 (0)