RA-1704: Improved Program Status widget state sorting. #299
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
… to 1.6.1 to get $httpBackend.flush() fix, changes to use a proper promise chain for test
mogoodrich
requested changes
Mar 6, 2020
omod/src/main/web/dashboardwidgets/programstatus/programstatus.controller.js
Outdated
Show resolved
Hide resolved
omod/src/main/web/dashboardwidgets/programstatus/programstatus.controller.js
Outdated
Show resolved
Hide resolved
omod/src/main/web/dashboardwidgets/programstatus/programstatus.controller.js
Outdated
Show resolved
Hide resolved
omod/src/main/web/dashboardwidgets/programstatus/programstatus.controller.js
Outdated
Show resolved
Hide resolved
… avoids ambiguous coercion/eval
…orkflows in the same program), adding logic for angular fallback orderby index, re-order expected order test states
…tate1 endDate == null
mogoodrich
requested changes
Mar 10, 2020
omod/src/main/web/dashboardwidgets/programstatus/programstatus.controller.js
Show resolved
Hide resolved
…y retrieving session use (openmrs#300)
… to 1.6.1 to get $httpBackend.flush() fix, changes to use a proper promise chain for test
… avoids ambiguous coercion/eval
…orkflows in the same program), adding logic for angular fallback orderby index, re-order expected order test states
…tate1 endDate == null
…or not both null and ordering when state1 endDate is null, new order of states in test
kml27
commented
Mar 10, 2020
omod/src/main/web/dashboardwidgets/relationships/relationships.controller.js
Outdated
Show resolved
Hide resolved
mogoodrich
approved these changes
Mar 12, 2020
There was a problem hiding this comment.
I'd good with this, but would be good for @mks-d to review. Also, once it's merged we will need to may sure on the PIH end we test things a bit.
omod/src/main/web/dashboardwidgets/programstatus/programstatus.controller.js
Show resolved
Hide resolved
… to 1.6.1 to get $httpBackend.flush() fix, changes to use a proper promise chain for test
… avoids ambiguous coercion/eval
…orkflows in the same program), adding logic for angular fallback orderby index, re-order expected order test states
…tate1 endDate == null
…or not both null and ordering when state1 endDate is null, new order of states in test
* RA-1724 : Fix NPE/undefined error in obsgraph dashboard widget when some concept do not have associated obs * RA-1724 : Adding null check
…r obsgraph. * Added optional filter encounter type parameter for obsgraph * Added support for multiple encounter types in obsGraph
mks-d
changed the title
mks-d
approved these changes
Mar 19, 2020
mks-d
changed the title
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.
JIRA Ticket: https://issues.openmrs.org/browse/RA-1704
Provides new program workflow state sort logic for ProgramStatus/Enrollment widget.
Observed:
Previously, states were only sorted by start date. This resulted in randomly incorrect order of states when the states were started on the same day, but one ended after the other and also when multiple states were started and ended on the same day.
Expected:
States displayed in the order the patient was entered into them.
Fix:
Sort by start date, those with the same start date then sorted by end date, those with the same end date then sorted by created date.
This also provides a jest/karma/angular/phantomjs test to prevent regression.
Additional changes: