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

Fix rendering of Care Portal entries that do not define BG... #479

Closed
wants to merge 9 commits into from
Closed

Fix rendering of Care Portal entries that do not define BG... #479

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fd42312
isNaN fixes
sulkaharo Mar 14, 2015
3eddb90
start script
sulkaharo Mar 14, 2015
d377135
Merge branch 'dev' of https://github.com/sulkaharo/cgm-remote-monitor…
sulkaharo Mar 14, 2015
6cebde2
Merge branch 'dev' of https://github.com/nightscout/cgm-remote-monito…
sulkaharo Mar 14, 2015
748ab59
Fix rendering issue for careportal entries with no glucose value
sulkaharo Mar 14, 2015
409a206
Going with Jason's log line
sulkaharo Mar 14, 2015
37601d0
Removing my start script
sulkaharo Mar 14, 2015
26f9e35
I hate merging. :D One more commit to be in line with Jason's code
sulkaharo Mar 14, 2015
ca5b688
Now really removing the start script :D
sulkaharo Mar 14, 2015
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
11 changes: 10 additions & 1 deletion static/js/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,16 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
//TODO: store units in db per treatment, and use that for conversion, until then assume glucose doesn't need to be scaled
// Care Portal treatment form does ask for the display units to be used
// other option is to convert on entry, but then need to correctly identify/handel old data
return treatment.glucose || scaleBg(calcBGByTime(treatment.created_at.getTime()));
var rval = treatment.glucose || scaleBg(calcBGByTime(treatment.created_at.getTime()));

// Deal with careportal entries that don't define contain a BG value
if (isNaN(rval)) {
var ceiling = 450;
if (browserSettings.units == 'mmol') ceiling = 22;
return ceiling;
}

return rval;
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down