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

feat: Added new proposed links to the sidebar #1956

Merged
merged 4 commits into from
Apr 2, 2020
Merged

feat: Added new proposed links to the sidebar #1956

merged 4 commits into from
Apr 2, 2020

Conversation

sotous
Copy link
Contributor

@sotous sotous commented Apr 1, 2020 •
edited by matteovivona
Loading

Fixes #1857

Changes proposed in this pull request:

  • Added two sublinks to Patients link
  • One to display Patients List, the other one to display Patient Creator Module
  • Added two sublinks to Appointment link
  • One to display Schedule and the other one to display the Appointment Generator module
  • New added links are highlighted when these modules are displaying
  • Links at the top navigation bar disappear when the Sidebar is available, otherwise, they'll show up.
  • Added expansion UI dynamics to the Patients and Appointments link

@vercel
Copy link

vercel bot commented Apr 1, 2020 •
edited
Loading

This pull request is being automatically deployed with ZEIT Now (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://zeit.co/hospitalrun/hospitalrun-frontend/h3lc7lt7b
✅ Preview: https://hospitalrun-fr-git-fork-sotous-feature-issue-1857-leftba-17e3da.hospitalrun.now.sh

@sotous
Copy link
Contributor Author

sotous commented Apr 1, 2020

hi!, @jackcmeyer just uploaded the solution, would appreciate a lot that you guys check it out.

@matteovivona matteovivona added the in progress indicates that issue/pull request is currently being worked on label Apr 1, 2020
@matteovivona matteovivona added this to the v2.0 milestone Apr 1, 2020
@jackcmeyer jackcmeyer requested a review from fox1t April 1, 2020 19:58
@jackcmeyer jackcmeyer added the 🚀enhancement an issue/pull request that adds a feature to the application label Apr 1, 2020
fox1t
fox1t reviewed Apr 2, 2020
View reviewed changes
src/locales/enUs/translations/scheduling/index.ts Outdated
@@ -18,18 +16,15 @@ export default {
emergency: 'Emergency',
followUp: 'Follow Up',
routine: 'Routine',
walkIn: 'Walk In',
walkUp: 'Walk Up',
Copy link
Member

@fox1t fox1t Apr 2, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Why you changed "walk in" to "walk up"? We are using "walk" in to describe "walk-in appointments". Can you please revert this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am sorry, I actually didn't, it came with the pull I made to master before pushing my local branch. I'll revert that change right away.

Copy link
Member

Choose a reason for hiding this comment

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

No worries! You don't have to say sorry! :)

fox1t
fox1t approved these changes Apr 2, 2020
View reviewed changes
Copy link
Member

@fox1t fox1t left a comment

Choose a reason for hiding this comment

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

LGTM

@fox1t
Copy link
Member

fox1t commented Apr 2, 2020

Thanks for your contribution!

@jackcmeyer jackcmeyer merged commit c74dec0 into HospitalRun:master Apr 2, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@fox1t fox1t fox1t approved these changes

@jackcmeyer jackcmeyer jackcmeyer approved these changes

Assignees
No one assigned
Labels
🚀enhancement an issue/pull request that adds a feature to the application in progress indicates that issue/pull request is currently being worked on
Projects
None yet
Milestone
v2.0
Development

Successfully merging this pull request may close these issues.

Make left hand sidebar items collapsible and allow for sub-links
4 participants
@sotous @fox1t @jackcmeyer @matteovivona