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

Fix/space in username #1004

Merged
merged 128 commits into from
Mar 20, 2017
Merged

Fix/space in username #1004

merged 128 commits into from
Mar 20, 2017

Conversation

Chima1707
Copy link
Contributor

Fixes #922

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 21 commits March 7, 2017 12:47
@Chima1707
fix: fix new user title bug after a new user has been added
ac35a25
@adeolabadmus
Merge pull request #29 from eHealthAfrica/retro-fix
2d78c4a 
Fixes from retrospective feedback
@adeolabadmus
Merge pull request #30 from eHealthAfrica/fix/user
a85da20 
fix: fix  new user title bug after a new user has been added
@mofesola
Added deploy branches to .travis.yml
3241938
@mofesola
Merge pull request #32 from eHealthAfrica/conf/deploy
7575a2b 
Added deploy branches to .travis.yml
@Chima1707
fix: fix test for new user title bug
b7bbbc7
@adeolabadmus
Merge pull request #36 from eHealthAfrica/fix/user-edit-title-test
b751d50 
fix: fix  test for new user title bug
@Chima1707
fix: updated report template with testing attributes on fields
3d12782
@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
@Chima1707
fix: trimmed username
b0b4bf6
@Chima1707
fix: test for trimmed username bug
47010ef
@adeolabadmus
Fix nextAppointment bug
6463268
Merge pull request #38 from eHealthAfrica/refactor-code
d9e1baf 
Refactor code
@Chima1707
Merge remote-tracking branch 'origin/master' into fix/space-in-username
6ed5592
@Chima1707
Merge remote-tracking branch 'hospitalrun/master' into fix/space-in-u…
b8f2063 
…sername

# Conflicts:
#	app/users/edit/controller.js
jkleinsc
jkleinsc suggested changes Mar 20, 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.

@Chima1707 the change looks good, but please remove the changes you made to app/services/database.js and config/environment.js because I removed those when I merged in eHealth Africa's new reports. I removed them on merge because someone else added a PR to allow these values to be edited in the admin, so we do not need the default values anymore.

@Chima1707
Copy link
Contributor Author

@jkleinsc I have updated it now

@jkleinsc
Copy link
Member

Thanks for updating @Chima1707! Can you also update #1005?

@Chima1707
Copy link
Contributor Author

@jkleinsc Updated #1005 too

jkleinsc
jkleinsc approved these changes Mar 20, 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 @Chima1707!

@jkleinsc jkleinsc merged commit 89d6b90 into HospitalRun:master Mar 20, 2017
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.
4 participants
@Chima1707 @jkleinsc @mofesola @adeolabadmus