Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Fix 1023 #1039

Merged
merged 139 commits into from
Apr 3, 2017
Merged

Fix 1023 #1039

merged 139 commits into from
Apr 3, 2017

Conversation

adeolabadmus
Copy link
Contributor

Fixes #1023

cc @HospitalRun/core-maintainers

Chima1707 and others added 30 commits January 26, 2017 16:23
@Chima1707
added basic translations for report
ce9b90d
@Chima1707
feat: added report model
3dd4032
@Chima1707
feat: added report tabs to visit page
e883089
@Chima1707
feat: added report route to router
0774d1c
@Chima1707
feat: added report page
7d4d07a
@Chima1707
feat: reports to visits children
80de01f
@Chima1707
feat: added add/delete report capabilities
1495e89
@Chima1707
fix: fixed diagnosisContainer issue on browser back history button
7c46622
@Chima1707
fix: display different report title based on type of visit
f24c59e
@Chima1707
Merge remote-tracking branch 'origin/master' into feat/opd-report
d16bc06
@mofesola
Modified Package.json for new NPM Deployment
1107c53
@Chima1707
fix: added next appointment and operative plans to opd form
bf614b5
@Chima1707
Merge remote-tracking branch 'origin/dev' into feat/opd-report
63f5571
@adeolabadmus
Restore package.json to working state
d9268c2
@adeolabadmus
Implement custom forms for OPD Report
4ab6026
@adeolabadmus
Add custom forms attribute to report model
32bf618
Merge pull request #1 from eHealthAfrica/opd-custom-form
3be61a1 
OPD Reports Custom Forms
@Chima1707
fix: saved report object
4e94eae
@Chima1707
fix: added preview report feat
6da7b88
@Chima1707
fix: added report by visit view
32f96a2
@Chima1707
fix: added logic to show different report sections
dd25475
@Chima1707
fix: added some report translations
07b23c9
@Chima1707
fix: edited report model
8ac82d8
@Chima1707
fix: implemented logic to toggle between show report and new report
f6f2dac
@adeolabadmus
Merge outpatient fix from upstream repo
1a6c955
@adeolabadmus
Remove preview functionality from OPD Reports
ccb0b05
@adeolabadmus
Implement print button
0e49768
@adeolabadmus
Remove print section header
bac66a6
@adeolabadmus
Write styles and markup for print page
5b2efbb
@adeolabadmus
Refactor report header into partial
6d6e851
Chima1707 and others added 27 commits March 10, 2017 11:50
@Chima1707
fix: update visit template with testing attributes on fields
299aa25
@Chima1707
fix: implemented acceptance tests for opd and discharge reports
e94be73
@Chima1707
Merge remote-tracking branch 'origin/dev' into fix/report-acceptance-…
2163458 
…tests
@adeolabadmus
Implement acceptance tests for OPD Report
79d52a4
@adeolabadmus
Merge pull request #37 from eHealthAfrica/fix/report-acceptance-tests
e2d8131 
Fix/report acceptance tests
@adeolabadmus
Merge remote-tracking branch 'upstream/master' into refactor-code
ad1d00e
@adeolabadmus
Refactor code to conform with style guide
7895b24
@adeolabadmus
Fix nextAppointment bug
6463268
Merge pull request #38 from eHealthAfrica/refactor-code
d9e1baf 
Refactor code
@adeolabadmus
change edit to view; add print button on visit page
9d75b9c
@adeolabadmus
Merge remote-tracking branch 'upstream/master' into fix-996
fae2ab5
@adeolabadmus
Merge remote-tracking branch 'upstream/master' into fix-996
308149e
@adeolabadmus
Merge remote-tracking branch 'upstream/master' into refactor-code
ec84494
@adeolabadmus
Add new fields to OPD Report
892295f
@adeolabadmus
Remove old code
ac3f841
@adeolabadmus
Refactor localization strings
d2145a9
@adeolabadmus
Merge remote-tracking branch 'upstream/master' into fix-997
7710b68
@adeolabadmus
Merge branch 'fix-997' into fix-996
7debd70
@adeolabadmus
Merge remote-tracking branch 'upstream/master' into fix-996
a204fbb
@adeolabadmus
Update template.hbs
4ee6869
@adeolabadmus
Change print-this component
b26dc74
@adeolabadmus
Merge branch 'fix-996' of https://github.com/eHealthAfrica/hospitalru…
03bd65b 
…n-frontend into fix-996
@adeolabadmus
Replace surgeon lookuplist with value from visit examiner
d5e3843
@adeolabadmus
Merge remote-tracking branch 'upstream/master' into fix-1014
62292b4
@adeolabadmus
Change examiner label; remove hard-coded date-format
3337fec
@adeolabadmus
Merge remote-tracking branch 'upstream/master' into latest
4f25f5f
@adeolabadmus
Remove print header checkboxes
ba0c19f
jkleinsc
jkleinsc approved these changes Apr 3, 2017
View reviewed changes
Copy link
Member

@jkleinsc jkleinsc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Thanks for the PR @adeolabadmus!

@jkleinsc jkleinsc merged commit 507c821 into HospitalRun:master Apr 3, 2017
jkleinsc added a commit that referenced this pull request Apr 3, 2017
@jkleinsc
Removed unused labels
1d1bf2d 
Cleanup for #1039
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jkleinsc jkleinsc jkleinsc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@adeolabadmus @jkleinsc @Chima1707 @mofesola