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.

Sign up for GitHub

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

Jump to bottom

Viz PDF export: Fix image size and date format in PDF file(T1150550) #24108

Merged
merged 2 commits into from
Mar 24, 2023
Merged

Viz PDF export: Fix image size and date format in PDF file(T1150550) #24108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e979f3
size of image should be integer
alexanderPolosatov Mar 24, 2023
bc8d856
Creation date format should be valid
alexanderPolosatov Mar 24, 2023
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
28 changes: 26 additions & 2 deletions js/exporter/pdf_creator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,13 @@ let composePdfString = function(imageString, options, curDate) {

const widthPt = (width * 0.75).toFixed(2);
const heightPt = (height * 0.75).toFixed(2);
const flooredWidth = Math.floor(width);
const flooredHeight = Math.floor(height);

const mainPage = mainPageTemplate.replace('_width_', widthPt).replace('_height_', heightPt);
const content = contentTemplate.replace('_width_', widthPt).replace('_height_', heightPt);
const info = infoTemplate.replace('_date_', curDate).replace('_version_', version);
const image = imageStartTemplate.replace('_width_', width).replace('_height_', height).replace('_length_', imageString.length) + imageString + imageEndTemplate;
const image = imageStartTemplate.replace('_width_', flooredWidth).replace('_height_', flooredHeight).replace('_length_', imageString.length) + imageString + imageEndTemplate;
const xref = getXref(mainPage.length, content.length, info.length);

const mainContent = mainPage + content + info + image;
Expand Down Expand Up @@ -64,9 +66,31 @@ let getBase64 = function(binaryData) {
return window.btoa(binaryData);
};

function getTwoDigitValue(value) {
const stringValue = value.toString();

if(stringValue.length === 1) {
return `0${value}`;
}
return value;
}

function convertToPdfDateFormat(date) {
const dateUnits = [
date.getUTCFullYear(),
getTwoDigitValue(date.getUTCMonth()),
getTwoDigitValue(date.getUTCDate()),
getTwoDigitValue(date.getUTCHours()),
getTwoDigitValue(date.getUTCMinutes()),
getTwoDigitValue(date.getUTCSeconds())
];

return `(D:${dateUnits.join('')}Z00'00')`;
}

export function getData(data, options) {
return imageCreator.getImageData(data, extend({}, options, { format: 'JPEG' })).then(imageString => {
const binaryData = composePdfString(imageString, options, getCurDate());
const binaryData = composePdfString(imageString, options, convertToPdfDateFormat(getCurDate()));
const pdfData = isFunction(window.Blob) ?
getBlob(binaryData) :
getBase64(binaryData);
Expand Down
65 changes: 56 additions & 9 deletions testing/tests/DevExpress.exporter/pdfCreator.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@ const isFunction = require('core/utils/type').isFunction;
const imageCreator = require('exporter/image_creator').imageCreator;
const getWindow = require('core/utils/window').getWindow;
const window = getWindow();
const ASN_DATE_REGEX = /CreationDate\s\(D:([0-9]+)Z([0-9]+)'([0-9]+)'/;

const contentTestEnv = {
beforeEach: function() {
pdfCreator.set_getBlob(function(data) { return data; });
pdfCreator.set_getBase64(function(data) { return data; });
pdfCreator.set_getCurDate(function() { return '_test_date_'; });
const that = this;
sinon.stub(imageCreator, 'getImageData', function(markup) { const def = $.Deferred(); def.resolve(that.imageDataSample || '_test_' + markup + '_string_'); return def; });
sinon.stub(imageCreator, 'getImageData', (markup) => {
const def = $.Deferred();
def.resolve(this.imageDataSample || '_test_' + markup + '_string_');
return def;
});
},
afterEach: function() {
pdfCreator.restore_getBlob();
pdfCreator.restore_getBase64();
pdfCreator.restore_getCurDate();
imageCreator.getImageData.restore();
}
};
Expand All @@ -42,19 +44,19 @@ QUnit.test('PDF \'content stream\' populated with correct size in pt', function(
});
});

QUnit.test('PDF \'info\' has correct date and dx version', function(assert) {
QUnit.test('PDF \'info\' has correct dx version', function(assert) {
const done = assert.async();

getData('image_markup', { width: 600.1, height: 400.2 }).then(function(data) {
assert.notStrictEqual(data.indexOf('/CreationDate _test_date_/Producer(DevExtreme ' + version + ')'), -1);
assert.notStrictEqual(data.indexOf('/Producer(DevExtreme ' + version + ')'), -1, 'version is valid');
done();
});
});

QUnit.test('PDF \'image\' populated with correct size in px, length and image string', function(assert) {
const done = assert.async();
getData('image_markup', { width: 600.1, height: 400.2, margin: 10 }).then(function(data) {
assert.notStrictEqual(data.indexOf('/Image/Width 620.1/Height 420.2/'), -1);
assert.notStrictEqual(data.indexOf('/Image/Width 620/Height 420/'), -1);
assert.notStrictEqual(data.indexOf('/Length 26>>stream\r\n_test_image_markup_string_\r\n'), -1);
done();
});
Expand All @@ -75,7 +77,7 @@ QUnit.test('PDF \'startxref\' populated with correct offset', function(assert) {
const match = data.match(/startxref\r\n(\d+)\r\n/);
assert.ok(match);
assert.strictEqual(match.length, 2);
assert.strictEqual(parseInt(match[1]), 707 + version.length);
assert.strictEqual(parseInt(match[1]), 717 + version.length);
done();
});
});
Expand All @@ -92,7 +94,7 @@ QUnit.test('PDF \'xref\' populated with correct blocks offset', function(assert)
assert.strictEqual(parseInt(match[2]), 10, '2');
assert.strictEqual(parseInt(match[3]), 346, '3');
assert.strictEqual(parseInt(match[4]), 89, '4');
assert.strictEqual(parseInt(match[5]), 520 + version.length, '5');
assert.strictEqual(parseInt(match[5]), 534 + version.length, '5');
assert.strictEqual(parseInt(match[6]), 450, '6');
assert.strictEqual(parseInt(match[7]), 143, '7');

Expand Down Expand Up @@ -194,3 +196,48 @@ QUnit.test('getData returns Base64 when Blob is not supported by Browser', funct
done();
});
});

QUnit.module('PDF CreationDate', {
beforeEach() {
contentTestEnv.beforeEach.apply(this, arguments);
pdfCreator.set_getCurDate(() => this.currentDate);

},
afterEach() {
contentTestEnv.afterEach.apply(this, arguments);
pdfCreator.restore_getCurDate();
}
}, () => {

QUnit.test('PDF \'info\' has correct date. Date units less 10', function(assert) {
const done = assert.async();
this.currentDate = new Date('Tue Feb 02 2021 06:04:01 GMT+0400');

getData('image_markup', { width: 600.1, height: 400.2 }).then(function(data) {
const matches = data.match(ASN_DATE_REGEX);

assert.strictEqual(matches.length, 4, 'matches count is valid');
assert.strictEqual(matches[1], '20210102020401', 'date is valid');
assert.strictEqual(matches[2], '00', 'time should be in UTC format');
assert.strictEqual(matches[3], '00', 'time should be in UTC format');

done();
});
});

QUnit.test('PDF \'info\' has correct date. Date units great 10', function(assert) {
const done = assert.async();
this.currentDate = new Date('Tue Dec 11 2021 21:12:13 GMT+0400');

getData('image_markup', { width: 600.1, height: 400.2 }).then(function(data) {
const matches = data.match(ASN_DATE_REGEX);

assert.strictEqual(matches.length, 4, 'matches count is valid');
assert.strictEqual(matches[1], '20211111171213', 'date is valid');
assert.strictEqual(matches[2], '00', 'time should be in UTC format');
assert.strictEqual(matches[3], '00', 'time should be in UTC format');

done();
});
});
});