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

Added sensor code transmitter ID fields #6780

Merged
merged 20 commits into from
Jan 26, 2021
Merged

Added sensor code transmitter ID fields #6780

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5fa81e7
Merge pull request #3 from nightscout/master
inventor96 Oct 16, 2019
66a758b
Merge branch 'master' of github.com:inventor96/cgm-remote-monitor
inventor96 Dec 17, 2019
7e96d9d
Merge branch 'master' of github.com:inventor96/cgm-remote-monitor
inventor96 Dec 18, 2019
538fcdd
Merge pull request #12 from nightscout/master
inventor96 Sep 15, 2020
4d61845
Merge pull request #13 from nightscout/master
inventor96 Sep 16, 2020
e3ff4ee
Merge pull request #14 from nightscout/master
inventor96 Sep 16, 2020
a69379b
Merge pull request #17 from nightscout/master
inventor96 Sep 23, 2020
6544a40
Merge pull request #18 from nightscout/master
inventor96 Sep 28, 2020
86b35c2
Merge pull request #20 from nightscout/master
inventor96 Sep 30, 2020
e004d03
Merge pull request #21 from nightscout/master
inventor96 Oct 5, 2020
ffea59c
Merge branch 'master' of github.com:inventor96/cgm-remote-monitor
inventor96 Nov 16, 2020
fe9e512
Merge branch 'master' of github.com:inventor96/cgm-remote-monitor
inventor96 Jan 21, 2021
b1ac0fa
Copied #5442 - Duplicated @c-robertson's work
inventor96 Jan 21, 2021
67dc81d
Added tx id and sensor code to tooltip
inventor96 Jan 21, 2021
6f35484
Added swagger docs for the new fields
inventor96 Jan 21, 2021
7a74075
Merge branch 'dev' into wip/sensor-code-transmitter-id-fields
inventor96 Jan 21, 2021
d7f5ac1
Added missing language keys
inventor96 Jan 21, 2021
dc080a6
Merge branch 'wip/sensor-code-transmitter-id-fields' of github.com:in…
inventor96 Jan 21, 2021
8890f8f
Added new fields to sage plugin display
inventor96 Jan 21, 2021
bdba791
Merge branch 'dev' into wip/sensor-code-transmitter-id-fields
sulkaharo Jan 26, 2021
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
Prev Previous commit
Next Next commit
Copied #5442 - Duplicated @c-robertson's work
  • Loading branch information
@inventor96
inventor96 committed Jan 21, 2021
commit b1ac0fa0e0e8f611982b2bb79088f239912d8aa0
12 changes: 11 additions & 1 deletion lib/client/careportal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function init (client, $) {
submitHooks = {};

_.forEach(careportal.allEventTypes, function each (event) {
inputMatrix[event.val] = _.pick(event, ['otp','remoteCarbs', 'remoteAbsorption', 'remoteBolus', 'bg', 'insulin', 'carbs', 'protein', 'fat', 'prebolus', 'duration', 'percent', 'absolute', 'profile', 'split', 'reasons', 'targets']);
inputMatrix[event.val] = _.pick(event, ['otp','remoteCarbs', 'remoteAbsorption', 'remoteBolus', 'bg', 'insulin', 'carbs', 'protein', 'fat', 'prebolus', 'duration', 'percent', 'absolute', 'profile', 'split', 'sensor', 'reasons', 'targets']);
submitHooks[event.val] = event.submitHook;
});
}
Expand Down Expand Up @@ -92,6 +92,8 @@ function init (client, $) {
$('#proteinGivenLabel').css('display', displayType(inputMatrix[eventType]['protein']));
$('#fatGivenLabel').css('display', displayType(inputMatrix[eventType]['fat']));

$('#sensorInfo').css('display', displayType(inputMatrix[eventType]['sensor']));

$('#durationLabel').css('display', displayType(inputMatrix[eventType]['duration']));
$('#percentLabel').css('display', displayType(inputMatrix[eventType]['percent'] && $('#absolute').val() === ''));
$('#absoluteLabel').css('display', displayType(inputMatrix[eventType]['absolute'] && $('#percent').val() === ''));
Expand All @@ -115,6 +117,8 @@ function init (client, $) {
resetIfHidden(inputMatrix[eventType]['carbs'], '#carbsGiven');
resetIfHidden(inputMatrix[eventType]['protein'], '#proteinGiven');
resetIfHidden(inputMatrix[eventType]['fat'], '#fatGiven');
resetIfHidden(inputMatrix[eventType]['sensor'], '#sensorCode');
resetIfHidden(inputMatrix[eventType]['sensor'], '#transmitterId');
resetIfHidden(inputMatrix[eventType]['duration'], '#duration');
resetIfHidden(inputMatrix[eventType]['absolute'], '#absolute');
resetIfHidden(inputMatrix[eventType]['percent'], '#percent');
Expand Down Expand Up @@ -213,6 +217,8 @@ function init (client, $) {
$('#carbsGiven').val('');
$('#proteinGiven').val('');
$('#fatGiven').val('');
$('#sensorCode').val('');
$('#transmitterId').val('');
$('#insulinGiven').val('');
$('#duration').val('');
$('#percent').val('');
Expand Down Expand Up @@ -244,6 +250,8 @@ function init (client, $) {
, carbs: $('#carbsGiven').val()
, protein: $('#proteinGiven').val()
, fat: $('#fatGiven').val()
, sensorCode: $('#sensorCode').val()
, transmitterId: $('#transmitterId').val()
, insulin: $('#insulinGiven').val()
, duration: times.msecs(parse_duration($('#duration').val())).mins < 1 ? $('#duration').val() : times.msecs(parse_duration($('#duration').val())).mins
, percent: $('#percent').val()
Expand Down Expand Up @@ -415,6 +423,8 @@ function init (client, $) {
pushIf(data.carbs, translate('Carbs Given') + ': ' + data.carbs);
pushIf(data.protein, translate('Protein Given') + ': ' + data.protein);
pushIf(data.fat, translate('Fat Given') + ': ' + data.fat);
pushIf(data.sensorCode, translate('Sensor Code') + ': ' + data.sensorCode);
pushIf(data.transmitterId, translate('Transmitter ID') + ': ' + data.transmitterId);
pushIf(data.insulin, translate('Insulin Given') + ': ' + data.insulin);
pushIf(data.eventType === 'Combo Bolus', translate('Combo Bolus') + ': ' + data.splitNow + '% : ' + data.splitExt + '%');
pushIf(data.duration, translate('Duration') + ': ' + data.duration + ' ' + translate('mins'));
Expand Down
42 changes: 21 additions & 21 deletions lib/plugins/careportal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,87 +15,87 @@ function init() {
return [
{ val: '<none>'
, name: '<none>'
, bg: true, insulin: true, carbs: true, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: true, carbs: true, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'BG Check'
, name: 'BG Check'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Snack Bolus'
, name: 'Snack Bolus'
, bg: true, insulin: true, carbs: true, protein: true, fat: true, prebolus: true, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: true, carbs: true, protein: true, fat: true, prebolus: true, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Meal Bolus'
, name: 'Meal Bolus'
, bg: true, insulin: true, carbs: true, protein: true, fat: true, prebolus: true, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: true, carbs: true, protein: true, fat: true, prebolus: true, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Correction Bolus'
, name: 'Correction Bolus'
, bg: true, insulin: true, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: true, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Carb Correction'
, name: 'Carb Correction'
, bg: true, insulin: false, carbs: true, protein: true, fat: true, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: true, protein: true, fat: true, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Combo Bolus'
, name: 'Combo Bolus'
, bg: true, insulin: true, carbs: true, protein: true, fat: true, prebolus: true, duration: true, percent: false, absolute: false, profile: false, split: true
, bg: true, insulin: true, carbs: true, protein: true, fat: true, prebolus: true, duration: true, percent: false, absolute: false, profile: false, split: true, sensor: false
}
, { val: 'Announcement'
, name: 'Announcement'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Note'
, name: 'Note'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Question'
, name: 'Question'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Exercise'
, name: 'Exercise'
, bg: false, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: false, absolute: false, profile: false, split: false
, bg: false, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Site Change'
, name: 'Pump Site Change'
, bg: true, insulin: true, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: true, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Sensor Start'
, name: 'CGM Sensor Start'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: true
}
, { val: 'Sensor Change'
, name: 'CGM Sensor Insert'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Sensor Stop'
, name: 'CGM Sensor Stop'
, bg: true, insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Pump Battery Change'
, name: 'Pump Battery Change'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Insulin Change'
, name: 'Insulin Cartridge Change'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Temp Basal Start'
, name: 'Temp Basal Start'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: true, absolute: true, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: true, absolute: true, profile: false, split: false, sensor: false
}
, { val: 'Temp Basal End'
, name: 'Temp Basal End'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: false, absolute: false, profile: false, split: false, sensor: false
}
, { val: 'Profile Switch'
, name: 'Profile Switch'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: false, absolute: false, profile: true, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: true, percent: false, absolute: false, profile: true, split: false, sensor: false
}
, { val: 'D.A.D. Alert'
, name: 'D.A.D. Alert'
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
, bg: true, insulin: false, carbs: false, protein: false, fat: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false, sensor: false
}
];

Expand Down
12 changes: 12 additions & 0 deletions views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,18 @@
</label>
</fieldset>

<fieldset id="sensorInfo">
<legend class="translate">Sensor</legend>
<label id="sensorCodeLabel" for="sensorCode" class="left-column short-label">
<span class="translate">Sensor Code</span>
<input type="text" id="sensorCode" />
</label>
<label id="txIdLabel" for="transmitterId" class="left-column short-label">
<span class="translate">Tx ID</span>
<input type="text" id="transmitterId" />
</label>
</fieldset>

<label id="insulinGivenLabel" for="insulinGiven" class="left-column short-label">
<span class="translate">Insulin Given</span>
<input type="number" step="any" min="0" id="insulinGiven" placeholder="Amount in units" class="titletranslate" pattern="[0-9.,]*">
Expand Down