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

Sj view ssr calendar bug #77

Merged
merged 2 commits into from
Feb 15, 2017
Merged

Sj view ssr calendar bug #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c4a989
fixing bug where 'admin' condition was incorrectly set as true for no…
Stuart-Johnson Feb 8, 2017
b5bb73f
Merge branch 'master' into sj-view_ssr_calendar_bug
Stuart-Johnson Feb 10, 2017
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
8 changes: 7 additions & 1 deletion app/controllers/service_calendars_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,13 @@ def table
@tab = params[:tab]
@review = params[:review] == 'true'
@portal = params[:portal] == 'true'
@admin = @portal && @sub_service_request.present?

if params[:admin]
@admin = params[:admin] == 'true'
else
@admin = @portal && @sub_service_request.present?
end

@merged = false
@consolidated = false

Expand Down
2 changes: 1 addition & 1 deletion app/views/service_calendars/master_calendar/pppv/_billing_strategy_header.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
%th.col-sm-1.text-center{ rowspan: 2 }
= t(:calendars)[:pppv][:header_fields][:subject_count]
%th.col-sm-5.text-center.visit-group-select{ colspan: 5 }
= render 'service_calendars/master_calendar/pppv/visit_group_page_select', service_request: service_request, sub_service_request: sub_service_request, arm: arm, tab: tab, page: page, pages: pages, review: review, portal: portal
= render 'service_calendars/master_calendar/pppv/visit_group_page_select', service_request: service_request, sub_service_request: sub_service_request, arm: arm, tab: tab, page: page, pages: pages, review: review, portal: portal, admin: admin

- unless portal
%th.col-sm-1.text-center{ rowspan: 2 }
Expand Down
2 changes: 1 addition & 1 deletion app/views/service_calendars/master_calendar/pppv/_calendar_header.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
%th.col-sm-1.text-center{ rowspan: 2 }
= t(:calendars)[:pppv][:header_fields][:subject_count]
%th.col-sm-5.text-center.visit-group-select{ colspan: 5 }
= render 'service_calendars/master_calendar/pppv/visit_group_page_select', service_request: service_request, sub_service_request: sub_service_request, arm: arm, tab: tab, page: page, pages: pages, review: review, portal: portal
= render 'service_calendars/master_calendar/pppv/visit_group_page_select', service_request: service_request, sub_service_request: sub_service_request, arm: arm, tab: tab, page: page, pages: pages, review: review, portal: portal, admin: admin
%th.col-sm-1.text-center{ rowspan: 2 }
= t(:calendars)[:pppv][:header_fields][:total_per_patient]
%th.col-sm-1.text-center{ rowspan: 2 }
Expand Down
2 changes: 1 addition & 1 deletion app/views/service_calendars/master_calendar/pppv/_pppv_calendar.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
= render "service_calendars/master_calendar/pppv/#{tab}_header",
service_request: service_request, sub_service_request: sub_service_request,
arm: arm, tab: tab, pages: pages, page: page, review: review,
portal: portal, visit_groups: visit_groups
portal: portal, visit_groups: visit_groups, admin: admin
%tbody
= render "service_calendars/master_calendar/pppv/#{tab}_line_items",
service_request: service_request, sub_service_request: sub_service_request,
Expand Down
4 changes: 2 additions & 2 deletions app/views/service_calendars/master_calendar/pppv/_template_header.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
- unless portal
%th.col-sm-1.text-center{ rowspan: 2 }
= t(:calendars)[:pppv][:header_fields][:quantity_type]

%th.text-center{ class: portal ? 'col-sm-1' : 'subject-count-header', rowspan: 2 }
= t(:calendars)[:pppv][:header_fields][:subject_count]
%th.select-row-header{ rowspan: 2 }
%th.visit-group-select.col-sm-5.text-center{ colspan: 5 }
= render 'service_calendars/master_calendar/pppv/visit_group_page_select', service_request: service_request, sub_service_request: sub_service_request, arm: arm, tab: tab, page: page, pages: pages, review: review, portal: portal
= render 'service_calendars/master_calendar/pppv/visit_group_page_select', service_request: service_request, sub_service_request: sub_service_request, arm: arm, tab: tab, page: page, pages: pages, review: review, portal: portal, admin: admin

- unless portal
%th.col-sm-1.text-center{ rowspan: 2 }
Expand Down
2 changes: 1 addition & 1 deletion app/views/service_calendars/master_calendar/pppv/_visit_group_page_select.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- path_method = method(:table_service_calendars_path)
- url_data = { sub_service_request_id: sub_service_request.try(:id), service_request_id: service_request.try(:id), pages: pages, arm_id: arm.id, tab: tab, portal: portal, format: :js }
- url_data = { sub_service_request_id: sub_service_request.try(:id), service_request_id: service_request.try(:id), pages: pages, arm_id: arm.id, tab: tab, portal: portal, admin: admin, format: :js }

.col-xs-2
.page-change-arrow.btn.btn-info.glyphicon.glyphicon-arrow-left{ title: t(:calendars)[:pppv][:header_fields][:page_select][:previous], type: 'button', disabled: page == 1 ? true : nil, role: 'button', aria: { label: t(:calendars)[:pppv][:header_fields][:page_select][:previous] }, data: { toggle: 'tooltip', animation: 'false', url: path_method.call(url_data.merge(page: page - 1)) } }
Expand Down