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

wth - Admin edit sending SSR back to Draft bug #841

Merged
merged 1 commit into from
Dec 29, 2016
Merged

wth - Admin edit sending SSR back to Draft bug #841

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/controllers/dashboard/line_items_visits_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ def update
@service_request = ServiceRequest.find( params[:srid] )

if @line_items_visit.update_attributes( params[:line_items_visit] )
@service_request.update_attributes(status: 'draft')
@line_items_visit.sub_service_request.update_attributes(status: 'draft')
unless params[:portal] == 'true'
@service_request.update_attributes(status: 'draft')
@line_items_visit.sub_service_request.update_attributes(status: 'draft')
end
render json: { success: true }
else
render json: @line_items_visit.errors, status: :unprocessable_entity
Expand Down
4 changes: 3 additions & 1 deletion app/controllers/dashboard/visits_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ def update
admin = params[:service_request_id] ? false : true

if @visit.update_attributes( params[:visit] )
@visit.line_items_visit.sub_service_request.set_to_draft(@admin)
unless params[:portal] == 'true'
@visit.line_items_visit.sub_service_request.set_to_draft(@admin)
end
render nothing: true
else
render json: @visit.errors, status: :unprocessable_entity
Expand Down
2 changes: 1 addition & 1 deletion app/views/service_calendars/master_calendar/pppv/_billing_strategy_line_items.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
- if locked
= liv.subject_count
- else
%a.edit-subject-count{ href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'subject_count', title: t(:calendars)[:pppv][:editable_fields][:subject_count], value: liv.subject_count, url: dashboard_line_items_visit_path(liv, srid: service_request.id) } }
%a.edit-subject-count{ href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'subject_count', title: t(:calendars)[:pppv][:editable_fields][:subject_count], value: liv.subject_count, url: dashboard_line_items_visit_path(liv, srid: service_request.id, portal: @portal) } }
- visits = liv.visits.paginate(page: page.to_i, per_page: 5)
- totals_hash = liv.try(:per_subject_subtotals, visits)
- visits.each_with_index do |v, index|
Expand Down
6 changes: 3 additions & 3 deletions app/views/service_calendars/master_calendar/pppv/_line_item_visit_input.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
= visit.effort_billing_qty
- else
.col-xs-4.text-center.no-padding
%a.edit-research-billing-qty{ href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'research_qty', title: t(:calendars)[:pppv][:editable_fields][:research], value: visit.research_billing_qty, url: dashboard_visit_path(visit) } }
%a.edit-research-billing-qty{ href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'research_qty', title: t(:calendars)[:pppv][:editable_fields][:research], value: visit.research_billing_qty, url: dashboard_visit_path(visit, portal: @portal) } }
.col-xs-4.text-center.no-padding
%a.edit-insurance-billing-qty{ href: 'javascript:void(0)', data: { name: 'third_party_qty', title: t(:calendars)[:pppv][:editable_fields][:third_party], value: visit.insurance_billing_qty, url: dashboard_visit_path(visit) } }
%a.edit-insurance-billing-qty{ href: 'javascript:void(0)', data: { name: 'third_party_qty', title: t(:calendars)[:pppv][:editable_fields][:third_party], value: visit.insurance_billing_qty, url: dashboard_visit_path(visit, portal: @portal) } }
.col-xs-4.text-center.no-padding
%a.edit-effort-billing-qty{ href: 'javascript:void(0)', data: { name: 'percent_effort_qty', title: t(:calendars)[:pppv][:editable_fields][:percent], value: visit.effort_billing_qty, url: dashboard_visit_path(visit) } }
%a.edit-effort-billing-qty{ href: 'javascript:void(0)', data: { name: 'percent_effort_qty', title: t(:calendars)[:pppv][:editable_fields][:percent], value: visit.effort_billing_qty, url: dashboard_visit_path(visit, portal: @portal) } }
- when 'calendar'
= label_tag nil, qty_cost_label(visit.research_billing_qty + visit.insurance_billing_qty, currency_converter(totals_hash["#{visit.id}"])) || "0 - $0.00", class: 'line_item_visit_pricing'
2 changes: 1 addition & 1 deletion app/views/service_calendars/master_calendar/pppv/_template_line_items.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
- if locked
= liv.subject_count
- else
%a.edit-subject-count{ class: locked ? 'locked' : '', href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'subject_count', title: t(:calendars)[:pppv][:editable_fields][:subject_count], value: liv.subject_count, url: dashboard_line_items_visit_path(liv, srid: service_request.id) } }
%a.edit-subject-count{ class: locked ? 'locked' : '', href: 'javascript:void(0)', data: { arm_id: arm.id, name: 'subject_count', title: t(:calendars)[:pppv][:editable_fields][:subject_count], value: liv.subject_count, url: dashboard_line_items_visit_path(liv, srid: service_request.id, portal: @portal) } }
%td.text-center
= Dashboard::ServiceCalendars.select_row(liv, sub_service_request, portal, locked)
- visits = liv.visits.paginate(page: page.to_i, per_page: 5)
Expand Down