Skip to content

[WEB-3632] - Add Device Names to PDF Export #586

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

Draft
henry-tp wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

[WEB-3632] - Add Device Names to PDF Export #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions src/modules/print/BasicsPrintView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@ class BasicsPrintView extends PrintView {
if (glucoseManagementIndicator) this.renderSimpleStat(glucoseManagementIndicator);
this.renderSimpleStat(standardDev);
this.renderSimpleStat(coefficientOfVariation);

this.renderDeviceNames();
}

defineStatColumns(opts = {}) {
Expand Down Expand Up @@ -423,6 +425,24 @@ class BasicsPrintView extends PrintView {
this.setFill();
}

renderDeviceNames() {
const tableColumns = this.defineStatColumns();

const deviceString = this.devices.map(d => d.deviceName).join(', ');

const rows = [{
label: 'Devices',
value: {
text: deviceString,
},
}]

this.renderTable(tableColumns, rows, {
showHeaders: false,
bottomMargin: 14,
});
}

renderHorizontalBarStat(statArg, opts = {}) {
let stat = _.cloneDeep(statArg);

Expand Down
1 change: 1 addition & 0 deletions src/modules/print/PrintView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class PrintView {
this.bgSource = _.get(this.data, 'metaData.bgSources.current');
this.latestPumpUpload = _.get(this.data, 'metaData.latestPumpUpload');
this.manufacturer = _.get(this.latestPumpUpload, 'manufacturer');
this.devices = _.get(this.data, 'metaData.devices', []);

this.stats = {};
const statsData = _.get(this.data, 'data.current.stats', {});
Expand Down
2 changes: 2 additions & 0 deletions src/utils/DataUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,7 @@ export class DataUtil {
const isContinuous = _.get(upload, 'dataSetType') === 'continuous';
const deviceManufacturer = _.get(upload, 'deviceManufacturers.0', '');
const deviceModel = _.get(upload, 'deviceModel', '');
const deviceName = _.get(upload, 'deviceName', '');
let label = key;

if (deviceManufacturer || deviceModel) {
Expand All @@ -1707,6 +1708,7 @@ export class DataUtil {
cgm: _.includes(upload.deviceTags, 'cgm'),
oneMinCgmSampleInterval: isOneMinCGMSampleIntervalDevice(upload),
id: key,
deviceName,
label,
pump: _.includes(upload.deviceTags, 'insulin-pump'),
serialNumber: upload.deviceSerialNumber,
Expand Down