Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ensure that past visits and reports subroutes also display the selected nav #53

Closed
wants to merge 1 commit into from
Closed

ensure that past visits and reports subroutes also display the selected nav #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/helpers/application_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ def time_ago_in_words(from_time, include_seconds=false)
end

def tab_item(label, path)
"<li class='#{request.path == path ? 'selected' : ''}'><a href='#{path}'>#{label}</a></li>"
if label === 'Home'
"<li class='#{request.path == path ? 'selected' : ''}'><a href='#{path}'>#{label}</a></li>"
elsif label === 'Visits'
"<li class='#{request.path.include?('/visits/') ? 'selected' : ''}'><a href='#{path}'>#{label}</a></li>"
else
"<li class='#{request.path.start_with?(path) ? 'selected' : ''}'><a href='#{path}'>#{label}</a></li>"
Copy link
Owner

Choose a reason for hiding this comment

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

It seems like this line or something similar should be all that is needed to replace the original request.path == path check. Do we need the three checks?

Copy link
Contributor Author

@jgravois jgravois Jan 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

if we only use start_with, 'Home' will also be selected when folks visit the Visits/Reports/Settings routes.

if I knew as much about ruby as I do about JS I could have condensed the other two by separating the root of the default 'Visits' path from today's date, but I took the easy way out.

Copy link
Contributor Author

@jgravois jgravois Jan 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

this would probably work.

if label === 'Home' || label === 'Settings'
    "<li class='#{request.path == path ? 'selected' : ''}'><a href='#{path}'>#{label}</a></li>"
else
    "<li class='#{request.path.include?('/' + label.downcase + '/') ? 'selected' : ''}'><a href='#{path}'>#{label}</a></li>"

I'll find some time to make sure soon.

Copy link
Contributor Author

@jgravois jgravois Jan 21, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

nope, AFAICT, the two pesky routes below make it pretty tough to cram all the logic you'd need in without a third clause.

  • /[org]/reports
  • /[/org]/reports/visits

if /[org]/reports/ was served up with a trailing slash, it'd be a different story.

edit: I'm a bit hindered here by the fact that I don't even know how to set breakpoints or inspect variables in Ruby/Rails.

if I knew how to do that, I'd imagine I could split the path up using a regex to isolate the portion of the route that comes immediately after the organization name and compare that to the label instead.

end
end

def today_visits_path(params={})
Expand Down