Update openaps.js to recognize the correct spelling of "received" #2785
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PieterGit
requested changes
Sep 5, 2017
There was a problem hiding this comment.
I found one typo in while you were fixing a typo 😄
Please also try to add a test case for the received version in https://github.com/nightscout/cgm-remote-monitor/blob/master/tests/openaps.test.js
lib/plugins/openaps.js
Outdated
| , enacted: status.openaps.enacted && status.openaps.enacted.timestamp && status.openaps.enacted.recieved && moment(status.openaps.enacted.timestamp) | ||
| , notEnacted: status.openaps.enacted && status.openaps.enacted.timestamp && !status.openaps.enacted.recieved && moment(status.openaps.enacted.timestamp) | ||
| , enacted: status.openaps.enacted && status.openaps.enacted.timestamp && (status.openaps.enacted.recieved || status.openaps.enacted.received) && moment(status.openaps.enacted.timestamp) | ||
| , notEnacted: status.openaps.enacted && status.openaps.enacted.timestamp && !(status.openaps.enacted.recieved || status.openaps.enacted.recieved) && moment(status.openaps.enacted.timestamp) |
There was a problem hiding this comment.
You misspelled recieved in the notEnacted case. Please correct
Test for devicestatus-entries containing the correct spelling of the word "received" instead of "recieved" in OpenAPS versions 0.6.0 and later
|
Hehe, I think I finally got it right :) |
|
@drnoname82 : tested and works. This is required for oref0 0.6.0 because that uses the @jasoncalabrese @sulkaharo can you review and if ok, merge to dev? |
PieterGit
approved these changes
Sep 10, 2017
lib/plugins/openaps.js
Outdated
| , enacted: status.openaps.enacted && status.openaps.enacted.timestamp && status.openaps.enacted.recieved && moment(status.openaps.enacted.timestamp) | ||
| , notEnacted: status.openaps.enacted && status.openaps.enacted.timestamp && !status.openaps.enacted.recieved && moment(status.openaps.enacted.timestamp) | ||
| , enacted: status.openaps.enacted && status.openaps.enacted.timestamp && (status.openaps.enacted.recieved || status.openaps.enacted.received) && moment(status.openaps.enacted.timestamp) | ||
| , notEnacted: status.openaps.enacted && status.openaps.enacted.timestamp && !(status.openaps.enacted.recieved || status.openaps.enacted.recieved) && moment(status.openaps.enacted.timestamp) |
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In OpenAPS the spelling of the word "received" in enacted.json was changed to its correct form from the wrong form "recieved" used in the versions before. This leads to a problem showing OpenAPS as "not enacted" in Nightscout although the OpenAPS rig is working fine (oref0 issue #637)
I made a change to the Nightscout openaps plugin to recognize "recieved" used in the current version of OpenAPS as well as "recieved" used in future versions. Could someone knowledgable please have a thorough look at the changes? It works fine on our heroku Nightscout instance.