RA-1625: Unable to display inactive conditions #171
Conversation
|
Did you see the travis failure? |
| @@ -374,9 +374,9 @@ private ConditionClinicalStatus convertConditionListStatus(Condition.Status stat | |||
| @RequestMapping(method = RequestMethod.GET, value = "/conditionhistory") | |||
| @ResponseBody | |||
| public List<org.openmrs.module.emrapi.conditionslist.contract.ConditionHistory> getConditionHistory(@RequestParam("patientUuid") String patientUuid) { | |||
| List<org.openmrs.Condition> activeConditions = conditionService.getActiveConditions(patientService.getPatientByUuid(patientUuid)); | |||
| List<org.openmrs.Condition> conditions = conditionService.getAllConditions(patientService.getPatientByUuid(patientUuid)); | |||
There was a problem hiding this comment.
@haripriya999 , Obviously this method doesnt exist any where in the core, it still lives in your PR , theres no way you can call it from here . Until your Pr is merged and at the same time you depend on the latest changes in the master , or probably its back ported to the core version that core apps depends on
There was a problem hiding this comment.
@mozzy11 Thank you for your insight on this. Is it that every time the module build takes places, it uses internet to get the latest changes?
@dkayiwa There is a travis error as it is not able to find getAllConditions fucntions that I defined in core: openmrs/openmrs-core#2996 . As @mozzy11 described we will have to get this PR: openmrs/openmrs-core#2996 merged to fix the travis error. :) |
|
@haripriya999 are you still working on this? |
haripriya999
force-pushed
the
RA-1625
branch
from
d66b74e
to
6fabb24
Compare
|
@dkayiwa This PR is ready to be merged :) |
|
@dkayiwa I'm not sure why I'm seeing this error: https://pastebin.com/jq92mCnR , in travis logs though the implementation of getAllConditions() in core PR:openmrs/openmrs-core#2996 has been merged. |
|
@haripriya999 did you see the merge conflicts? |
|
@dkayiwa , unfortunately i just did this same resolution and it was merged |
|
@haripriya999 , However , Even though i fixed this , |
RA-1625:Unable to display inactive conditions
Description of what I changed
show inactive conditions
Issue I worked on
see https://issues.openmrs.org/browse/RA-1625
Checklist: I completed these to help reviewers :)
My pull request only contains ONE single commit
(the number above, next to the 'Commits' tab is 1).
No? -> read here on how to squash multiple commits into one
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master