This repository has been archived by the owner on Feb 12, 2024. It is now read-only.
Fix dates mismatch issue where dates for observation’s displayed in the Graph and Table view’s don’t match the observation’s effectiveDateTime as received by the app from service. #17
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
… the Graph and Table view’s don’t match the observation’s effectiveDateTime as received by the app from the service.
kolkheang
reviewed
Nov 8, 2017
| @@ -1398,15 +1398,15 @@ ChartPane.prototype = { | |||
| html = []; | |||
| this.forEachColumn(function( col, colIndex/*, colsLen*/ ) { | |||
| $.each(annotated, function(i, entry) { | |||
| var dateString = entry.hasOwnProperty('dateString') ? entry.dateString : ''; | |||
There was a problem hiding this comment.
Do you need to check entry object?
There was a problem hiding this comment.
We wouldnt need to check entry since its an object in the array and we are doing a $.each on the array.
| @@ -253,8 +253,9 @@ | |||
|
|
|||
| $.each(model, function( index, data ) { | |||
| //debugger; | |||
| var dateString = data.hasOwnProperty('dateString') ? data.dateString : ''; | |||
There was a problem hiding this comment.
We wouldnt need to check data since its an object in the array and we are doing a $.each on the array.
| @@ -478,8 +479,8 @@ | |||
| { | |||
| label : "Date", | |||
| get : function( entry/*, model*/ ) { | |||
| return new XDate(patient.DOB.getTime()) | |||
| .addMonths(entry.agemos) | |||
| var dateString = entry.hasOwnProperty('dateString') ? entry.dateString : ''; | |||
There was a problem hiding this comment.
The entry here represents the model which is pulled from an array of models.
E.g : var entry = model[colIndex], v, x//,
So it should always be available.
js/gc-smart-data.js
Outdated
| @@ -336,6 +344,9 @@ window.GC = window.GC || {}; | |||
|
|
|||
| if (boneAgeList && boneAgeList.length) { | |||
| $.each(boneAgeList, function(i, o) { | |||
| if (o.hasOwnProperty("boneAgeMos") && o.hasOwnProperty("date") && o.hasOwnProperty("dateString")) { | |||
There was a problem hiding this comment.
$.each will guarantee that o always has a value .
js/gc-smart-data.js
Outdated
| @@ -475,6 +486,9 @@ window.GC = window.GC || {}; | |||
| model[ o.agemos ].lengthAndStature = o.value; | |||
| } else { | |||
| model[ o.agemos ] = { "lengthAndStature" : o.value }; | |||
| if (o.hasOwnProperty('dateString')) { | |||
| model[ o.agemos ]['dateString'] = o.dateString; | |||
js/gc-smart-data.js
Outdated
| @@ -484,6 +498,9 @@ window.GC = window.GC || {}; | |||
| model[ o.agemos ].weight = o.value; | |||
| } else { | |||
| model[ o.agemos ] = { "weight" : o.value }; | |||
There was a problem hiding this comment.
Fixed in the entire file.
…eView_Fix_Issue_35 # Conflicts: # js/gc-smart-data.js # load-fhir-data.js
zplata
approved these changes
Nov 28, 2017
…eView_Fix_Issue_35 # Conflicts: # js/gc-smart-data.js
mjhenkes
approved these changes
Dec 1, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Issue : The open source version of growth chart has a mismatch in the observations (i.e height, weight etc) being displayed on the Graph and Table Views. After some investigation, the issue seems to be with the way the app processes date for an observation. The app converts the dateString received from the resource call into
Age in Monthsusing the XDate library. Then the app converts theAge in Monthsback to a Date String for displaying it on the Graph and Table View for that observation. The XDate library computes this Date String incorrectly thus resulting in a date which could be off by a few days from the actual date of the observation.More Info on this Issue : smart-on-fhir#35
Fix : This PR fixes the display to consume the effectiveDateTime received with the observation as a string. We pass down a separate key
dateStringwith the apps object for observations and use it later on to display the string directly thus avoiding any conversions using the XDate library.Consideration: This fix adds a new variable
dateStringand does not alter any of the apps existing logic to handle a date object for an observation.@kpshek
@zplata
@mjhenkes
@kolkheang