From c44b876ab8e1d29a324b30933e1c35ba1eb98209 Mon Sep 17 00:00:00 2001 From: kimberlieskandis Date: Mon, 15 Jun 2020 16:14:47 -0400 Subject: [PATCH 1/7] add carb foodType, absorptionTime to reports --- lib/report_plugins/daytoday.js | 2 ++ lib/report_plugins/treatments.js | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js index b54aea0201e..ed8371aeec7 100644 --- a/lib/report_plugins/daytoday.js +++ b/lib/report_plugins/daytoday.js @@ -739,6 +739,8 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio if (treatment.carbs && options.carbs) { var label = ' ' + treatment.carbs + ' g'; + label += treatment.foodType ? ' ' + treatment.foodType : ''//KS + label += treatment.absorptionTime ? ' ' + (Math.round(treatment.absorptionTime / 60.0 * 10) / 10) + 'h' : ''//KS if (treatment.protein) label += ' / ' + treatment.protein + ' g'; if (treatment.fat) label += ' / ' + treatment.fat + ' g'; diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js index c0215b59b4a..d1c8f175cea 100644 --- a/lib/report_plugins/treatments.js +++ b/lib/report_plugins/treatments.js @@ -316,6 +316,9 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op } for (var t=0; t').addClass('border_bottom') .append($('') .append($('').addClass('deleteTreatment').css('cursor','pointer').attr('title',translate('Delete record')).attr('src',icon_remove).attr('data',JSON.stringify(tr)).attr('day',day)) @@ -326,7 +329,8 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) : '')) .append($('').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : '')) .append($('').attr('align','center').append(tr.insulin ? tr.insulin.toFixed(2) : '')) - .append($('').attr('align','center').append(tr.carbs ? tr.carbs : '')) + //.append($('').attr('align','center').append(tr.carbs ? tr.carbs : '')) + .append($('').attr('align','center').append(carbs))//KS .append($('').attr('align','center').append(tr.protein ? tr.protein : '')) .append($('').attr('align','center').append(tr.fat ? tr.fat : '')) .append($('').attr('align','center').append(tr.duration ? tr.duration.toFixed(0) : '')) From e80f313f747c5db32398f2435eec072a23f1cc07 Mon Sep 17 00:00:00 2001 From: kimberlieskandis Date: Mon, 15 Jun 2020 16:32:13 -0400 Subject: [PATCH 2/7] add carb foodType, absorptionTime to reports --- lib/report_plugins/treatments.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js index d1c8f175cea..715a680a8be 100644 --- a/lib/report_plugins/treatments.js +++ b/lib/report_plugins/treatments.js @@ -293,7 +293,8 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op .append($('').css('width','150px').attr('align','left').append(translate('Event Type'))) .append($('').css('width','150px').attr('align','left').append(translate('Blood Glucose'))) .append($('').css('width','50px').attr('align','left').append(translate('Insulin'))) - .append($('').css('width','50px').attr('align','left').append(translate('Carbs'))) + //.append($('').css('width','50px').attr('align','left').append(translate('Carbs'))) + .append($('').css('width','100px').attr('align','left').append(translate('Carbs/Food/Time'))) .append($('').css('width','50px').attr('align','left').append(translate('Protein'))) .append($('').css('width','50px').attr('align','left').append(translate('Fat'))) .append($('').css('width','50px').attr('align','left').append(translate('Duration'))) From fdf3a164d3e9c83fede872c425ae5c72f43d589d Mon Sep 17 00:00:00 2001 From: kimberlieskandis Date: Mon, 15 Jun 2020 17:03:12 -0400 Subject: [PATCH 3/7] add carb foodType, absorptionTime to reports --- lib/report_plugins/daytoday.js | 4 ++-- lib/report_plugins/treatments.js | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js index ed8371aeec7..47c16cf71a8 100644 --- a/lib/report_plugins/daytoday.js +++ b/lib/report_plugins/daytoday.js @@ -739,8 +739,8 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio if (treatment.carbs && options.carbs) { var label = ' ' + treatment.carbs + ' g'; - label += treatment.foodType ? ' ' + treatment.foodType : ''//KS - label += treatment.absorptionTime ? ' ' + (Math.round(treatment.absorptionTime / 60.0 * 10) / 10) + 'h' : ''//KS + label += treatment.foodType ? ' ' + treatment.foodType : '' + label += treatment.absorptionTime ? ' ' + (Math.round(treatment.absorptionTime / 60.0 * 10) / 10) + 'h' : '' if (treatment.protein) label += ' / ' + treatment.protein + ' g'; if (treatment.fat) label += ' / ' + treatment.fat + ' g'; diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js index 715a680a8be..7b49e32ba2d 100644 --- a/lib/report_plugins/treatments.js +++ b/lib/report_plugins/treatments.js @@ -293,7 +293,6 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op .append($('').css('width','150px').attr('align','left').append(translate('Event Type'))) .append($('').css('width','150px').attr('align','left').append(translate('Blood Glucose'))) .append($('').css('width','50px').attr('align','left').append(translate('Insulin'))) - //.append($('').css('width','50px').attr('align','left').append(translate('Carbs'))) .append($('').css('width','100px').attr('align','left').append(translate('Carbs/Food/Time'))) .append($('').css('width','50px').attr('align','left').append(translate('Protein'))) .append($('').css('width','50px').attr('align','left').append(translate('Fat'))) @@ -317,9 +316,9 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op } for (var t=0; t').addClass('border_bottom') .append($('') .append($('').addClass('deleteTreatment').css('cursor','pointer').attr('title',translate('Delete record')).attr('src',icon_remove).attr('data',JSON.stringify(tr)).attr('day',day)) @@ -330,8 +329,7 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) : '')) .append($('').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : '')) .append($('').attr('align','center').append(tr.insulin ? tr.insulin.toFixed(2) : '')) - //.append($('').attr('align','center').append(tr.carbs ? tr.carbs : '')) - .append($('').attr('align','center').append(carbs))//KS + .append($('').attr('align','center').append(carbs)) .append($('').attr('align','center').append(tr.protein ? tr.protein : '')) .append($('').attr('align','center').append(tr.fat ? tr.fat : '')) .append($('').attr('align','center').append(tr.duration ? tr.duration.toFixed(0) : '')) From 4d663cd345a59d166d7a6902a0ffc107f3062431 Mon Sep 17 00:00:00 2001 From: kimberlieskandis Date: Wed, 17 Jun 2020 16:28:36 -0400 Subject: [PATCH 4/7] add temporary overide reason to treatmeents reports --- lib/report_plugins/treatments.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js index 7b49e32ba2d..a148f311098 100644 --- a/lib/report_plugins/treatments.js +++ b/lib/report_plugins/treatments.js @@ -326,7 +326,7 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op .append($('').addClass('editTreatment').css('cursor','pointer').attr('title',translate('Edit record')).attr('src',icon_edit).attr('data',JSON.stringify(tr)).attr('day',day)) ) .append($('').append(new Date(tr.created_at).toLocaleTimeString().replace(/([\d]+:[\d]{2})(:[\d]{2})(.*)/, '$1$3'))) - .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) : '')) + .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) + (tr.reason ? ' ' + tr.reason : '') : '')) .append($('').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : '')) .append($('').attr('align','center').append(tr.insulin ? tr.insulin.toFixed(2) : '')) .append($('').attr('align','center').append(carbs)) From 40a3b500b26fee0a6dd17ec010a13b79f07aa640 Mon Sep 17 00:00:00 2001 From: kimberlieskandis Date: Wed, 17 Jun 2020 16:39:14 -0400 Subject: [PATCH 5/7] add temporary overide reason to treatmeents reports --- lib/report_plugins/treatments.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js index a148f311098..5a0c7360d39 100644 --- a/lib/report_plugins/treatments.js +++ b/lib/report_plugins/treatments.js @@ -326,7 +326,7 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op .append($('').addClass('editTreatment').css('cursor','pointer').attr('title',translate('Edit record')).attr('src',icon_edit).attr('data',JSON.stringify(tr)).attr('day',day)) ) .append($('').append(new Date(tr.created_at).toLocaleTimeString().replace(/([\d]+:[\d]{2})(:[\d]{2})(.*)/, '$1$3'))) - .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) + (tr.reason ? ' ' + tr.reason : '') : '')) + .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) + (tr.reason ? '
' + tr.reason : '') : '')) .append($('').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : '')) .append($('').attr('align','center').append(tr.insulin ? tr.insulin.toFixed(2) : '')) .append($('').attr('align','center').append(carbs)) From 70577991a399b0804202fbee040c6ce4741e114a Mon Sep 17 00:00:00 2001 From: kimberlieskandis Date: Fri, 19 Jun 2020 15:35:03 -0400 Subject: [PATCH 6/7] add temporary overide insulinNeedsScaleFactor and correctionRange to treatments reports --- lib/report_plugins/treatments.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js index 5a0c7360d39..016df08e994 100644 --- a/lib/report_plugins/treatments.js +++ b/lib/report_plugins/treatments.js @@ -319,6 +319,22 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op var carbs = tr.carbs ? tr.carbs : '' carbs += tr.foodType ? ' ' + tr.foodType : '' carbs += tr.absorptionTime ? ' ' + (Math.round(tr.absorptionTime / 60.0 * 10) / 10) + 'h' : '' + var correctionRangeText; + if (tr.correctionRange) { + var min = tr.correctionRange[0]; + var max = tr.correctionRange[1]; + + if (client.settings.units === 'mmol') { + max = client.utils.roundBGToDisplayFormat(client.utils.scaleMgdl(max)); + min = client.utils.roundBGToDisplayFormat(client.utils.scaleMgdl(min)); + } + + if (tr.correctionRange[0] === tr.correctionRange[1]) { + correctionRangeText = '' + min; + } else { + correctionRangeText = '' + min + ' - ' + max; + } + } table.append($('').addClass('border_bottom') .append($('') .append($('').addClass('deleteTreatment').css('cursor','pointer').attr('title',translate('Delete record')).attr('src',icon_remove).attr('data',JSON.stringify(tr)).attr('day',day)) @@ -326,7 +342,8 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op .append($('').addClass('editTreatment').css('cursor','pointer').attr('title',translate('Edit record')).attr('src',icon_edit).attr('data',JSON.stringify(tr)).attr('day',day)) ) .append($('').append(new Date(tr.created_at).toLocaleTimeString().replace(/([\d]+:[\d]{2})(:[\d]{2})(.*)/, '$1$3'))) - .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) + (tr.reason ? '
' + tr.reason : '') : '')) + .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) + (tr.reason ? '
' + tr.reason : '') + + (tr.insulinNeedsScaleFactor ? '
' + tr.insulinNeedsScaleFactor * 100 + '%' : '') + (correctionRangeText ? ' ' + correctionRangeText : '') : '')) .append($('').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : '')) .append($('').attr('align','center').append(tr.insulin ? tr.insulin.toFixed(2) : '')) .append($('').attr('align','center').append(carbs)) From 5adae2ab8a12c25ff8baef1394158d6b209b6b38 Mon Sep 17 00:00:00 2001 From: kimberlieskandis Date: Fri, 19 Jun 2020 16:02:19 -0400 Subject: [PATCH 7/7] add temporary overide insulinNeedsScaleFactor and correctionRange to treatments reports --- lib/report_plugins/treatments.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js index 016df08e994..59846d97f2e 100644 --- a/lib/report_plugins/treatments.js +++ b/lib/report_plugins/treatments.js @@ -319,7 +319,7 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op var carbs = tr.carbs ? tr.carbs : '' carbs += tr.foodType ? ' ' + tr.foodType : '' carbs += tr.absorptionTime ? ' ' + (Math.round(tr.absorptionTime / 60.0 * 10) / 10) + 'h' : '' - var correctionRangeText; + var correctionRangeText = ''; if (tr.correctionRange) { var min = tr.correctionRange[0]; var max = tr.correctionRange[1]; @@ -343,7 +343,7 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op ) .append($('').append(new Date(tr.created_at).toLocaleTimeString().replace(/([\d]+:[\d]{2})(:[\d]{2})(.*)/, '$1$3'))) .append($('').append(tr.eventType ? translate(client.careportal.resolveEventName(tr.eventType)) + (tr.reason ? '
' + tr.reason : '') + - (tr.insulinNeedsScaleFactor ? '
' + tr.insulinNeedsScaleFactor * 100 + '%' : '') + (correctionRangeText ? ' ' + correctionRangeText : '') : '')) + (tr.insulinNeedsScaleFactor ? '
' + tr.insulinNeedsScaleFactor * 100 + '%' : '') + (tr.correctionRange ? ' ' + correctionRangeText : '') : '')) .append($('').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : '')) .append($('').attr('align','center').append(tr.insulin ? tr.insulin.toFixed(2) : '')) .append($('').attr('align','center').append(carbs))