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

Jump to bottom

extra '' causing error on calendar consolidated request tab #653

Merged
merged 2 commits into from
Sep 12, 2016
Merged

extra '' causing error on calendar consolidated request tab #653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0786d4
extra '' causing error on calendar consolidated request tab
ying-pbrc Aug 29, 2016
12b176e
only filter out the first draft SSRs
ying-pbrc Aug 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/service_calendars/master_calendar/_otf_line_items.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
- @protocol.service_requests.each do |service_request|
- service_request.service_list(true).each do |_, value| # get only one time fee services
- value[:line_items].each do |line_item|
- next if %w('first_draft' 'draft').include?(line_item.sub_service_request.status)
- next if %w(first_draft).include?(line_item.sub_service_request.status)
%tr.line_item.otfs{ class: cycle('odd', '', name: 'otfs'), :"data-unit_factor" => line_item.service.displayed_pricing_map.unit_factor }
%td.service_name
= line_item.service.name
Expand Down Expand Up @@ -158,7 +158,7 @@
%th.otf{ colspan: (@study_tracker) ? 13 : 16 }
= value[:name]
- value[:line_items].each do |line_item|
- next if %w('first_draft' 'draft').include?(line_item.sub_service_request.status)
- next if %w(first_draft).include?(line_item.sub_service_request.status)
- locked = !line_item.sub_service_request.can_be_edited? || line_item.sub_service_request.is_complete?
%tr.line_item.otfs{ class: [cycle('odd', '', name: 'otfs'), locked ? 'locked' : ''], :"data-unit_factor" => line_item.service.displayed_pricing_map.unit_factor }
%td.service_name
Expand Down