bckelley/cgm-remote-monitor
1
0
Fork 0
mirror of https://github.com/bckelley/cgm-remote-monitor.git synced 2026-08-24 03:14:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

use utils.scaleMgdl since there are times where client.sbx hasn't been defined yet

Browse Source
This commit is contained in:
Jason Calabrese
2016-12-19 20:00:02 -08:00
parent 5e8d15cac5
commit fc6a936d6a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/client/renderer.js
+2 -2
View File
@@ -174,7 +174,7 @@ function init (client, d3) {
return '<strong>'+translate('Time')+':</strong> ' + client.formatTime(new Date(d.mills)) + '<br/>' +
(d.eventType ? '<strong>'+translate('Treatment type')+':</strong> ' + translate(client.careportal.resolveEventName(d.eventType)) + '<br/>' : '') +
(d.reason ? '<strong>'+translate('Reason')+':</strong> ' + translate(d.reason) + '<br/>' : '') +
(d.glucose ? '<strong>'+translate('BG')+':</strong> ' + client.sbx.scaleMgdl(d.glucose) + (d.glucoseType ? ' (' + translate(d.glucoseType) + ')': '') + '<br/>' : '') +
(d.glucose ? '<strong>'+translate('BG')+':</strong> ' + utils.scaleMgdl(d.glucose) + (d.glucoseType ? ' (' + translate(d.glucoseType) + ')': '') + '<br/>' : '') +
(d.enteredBy ? '<strong>'+translate('Entered By')+':</strong> ' + d.enteredBy + '<br/>' : '') +
(d.targetTop ? '<strong>'+translate('Target Top')+':</strong> ' + d.targetTop + '<br/>' : '') +
(d.targetBottom ? '<strong>'+translate('Target Bottom')+':</strong> ' + d.targetBottom + '<br/>' : '') +
@@ -493,7 +493,7 @@ function init (client, d3) {
(treatment.carbs ? '<strong>' + translate('Carbs') + ':</strong> ' + treatment.carbs + '<br/>' : '') +
(treatment.insulin ? '<strong>' + translate('Insulin') + ':</strong> ' + treatment.insulin + '<br/>' : '') +
(treatment.enteredinsulin ? '<strong>' + translate('Combo Bolus') + ':</strong> ' + treatment.enteredinsulin + 'U, ' + treatment.splitNow + '% : ' + treatment.splitExt + '%, ' + translate('Duration') + ': ' + treatment.duration + '<br/>' : '') +
(treatment.glucose ? '<strong>' + translate('BG') + ':</strong> ' + client.sbx.scaleMgdl(treatment.glucose) + (treatment.glucoseType ? ' (' + translate(treatment.glucoseType) + ')' : '') + '<br/>' : '') +
(treatment.glucose ? '<strong>' + translate('BG') + ':</strong> ' + utils.scaleMgdl(treatment.glucose) + (treatment.glucoseType ? ' (' + translate(treatment.glucoseType) + ')' : '') + '<br/>' : '') +
(treatment.enteredBy ? '<strong>' + translate('Entered By') + ':</strong> ' + treatment.enteredBy + '<br/>' : '') +
(treatment.notes ? '<strong>' + translate('Notes') + ':</strong> ' + treatment.notes : '') +
boluscalcTooltip(treatment)
lib/report_plugins/treatments.js
+1 -1
View File
@@ -306,7 +306,7 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op
)
.append($('<td>').append(new Date(tr.created_at).toLocaleTimeString().replace(/([\d]+:[\d]{2})(:[\d]{2})(.*)/, '$1$3')))
.append($('<td>').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) : ''))
.append($('<td>').attr('align','center').append(tr.glucose ? client.sbx.scaleMgdl(tr.glucose) + ' ('+translate(tr.glucoseType)+')' : ''))
.append($('<td>').attr('align','center').append(tr.glucose ? client.utils.scaleMgdl(tr.glucose) + ' ('+translate(tr.glucoseType)+')' : ''))
.append($('<td>').attr('align','center').append(tr.insulin ? tr.insulin.toFixed(2) : ''))
.append($('<td>').attr('align','center').append(tr.carbs ? tr.carbs : ''))
.append($('<td>').attr('align','center').append(tr.duration ? tr.duration : ''))