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

SAW - Auto-refresh bug for Modified Rate, Add/Delete Services #2176

Merged
merged 9 commits into from
Feb 5, 2020
Merged

SAW - Auto-refresh bug for Modified Rate, Add/Delete Services #2176

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e3747f
Non-clinical services tab refresh works for adding and deleting
SamWord Jan 22, 2020
649e8f4
Modified service cost refresh works
SamWord Jan 22, 2020
d3d8125
Clinical service tab cost refresh works
SamWord Jan 22, 2020
06cda4a
Merge branch 'v3.7.0' into saw-dashboard-refresh-bug
Stuart-Johnson Jan 23, 2020
61ab94f
Merge branch 'v3.7.0' into saw-dashboard-refresh-bug
SamWord Jan 24, 2020
5689e84
Merge branch 'v3.7.0' into saw-dashboard-refresh-bug
Stuart-Johnson Jan 29, 2020
3915e10
Merge branch 'v3.7.0' into saw-dashboard-refresh-bug
SamWord Jan 30, 2020
e05ee6d
made changes to make all specs pass locally
SamWord Jan 31, 2020
fe58a53
Merge branch 'saw-dashboard-refresh-bug' of https://github.com/sparc-…
SamWord Jan 31, 2020
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
5 changes: 5 additions & 0 deletions app/views/dashboard/clinical_line_items/create.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,9 @@ loadServiceCalendar()

$("#modalContainer").modal('hide')
$("#flashContainer").replaceWith("<%= j render 'layouts/flash' %>")

# Re-render Admin Edit SSR header to update costs
if $("#subServiceRequestSummary").length
$("#subServiceRequestSummary").replaceWith("<%= j render 'dashboard/sub_service_requests/header', sub_service_request: @sub_service_request %>")

<% end %>
5 changes: 5 additions & 0 deletions app/views/dashboard/clinical_line_items/destroy.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,9 @@ loadServiceCalendar()

$("#modalContainer").modal('hide')
$("#flashContainer").replaceWith("<%= j render 'layouts/flash' %>")

# Re-render Admin Edit SSR header to update costs
if $("#subServiceRequestSummary").length
$("#subServiceRequestSummary").replaceWith("<%= j render 'dashboard/sub_service_requests/header', sub_service_request: @sub_service_request %>")

<% end %>
6 changes: 6 additions & 0 deletions app/views/dashboard/study_level_activities/create.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ $('#studyLevelActivitiesTab').html('<%= j render "dashboard/sub_service_requests
<% else %>
$('#studyLevelActivitiesTable').bootstrapTable('refresh')
<% end %>

$("#modalContainer").modal('hide')
$("#flashContainer").replaceWith("<%= j render 'layouts/flash' %>")

# Re-render Admin Edit SSR header to update costs
if $("#subServiceRequestSummary").length
$("#subServiceRequestSummary").replaceWith("<%= j render 'dashboard/sub_service_requests/header', sub_service_request: @sub_service_request %>")

<% end %>
6 changes: 6 additions & 0 deletions app/views/dashboard/study_level_activities/destroy.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,10 @@ $('#studyLevelActivitiesTab').html('<%= j render "dashboard/sub_service_requests
$('#studyLevelActivitiesTable').bootstrapTable('refresh')
<% end %>

# Re-render Admin Edit SSR header to update costs
if $("#subServiceRequestSummary").length
$("#subServiceRequestSummary").replaceWith("<%= j render 'dashboard/sub_service_requests/header', sub_service_request: @sub_service_request %>")

$("#flashContainer").replaceWith("<%= j render 'layouts/flash' %>")

$(document).trigger('ajax:complete') # rails-ujs element replacement bug fix
5 changes: 5 additions & 0 deletions app/views/line_items/update.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,9 @@ $(".line-item-<%= @line_item.id %>:visible .total-per-study").replaceWith("<%= j
$('.one-time-fees-container:visible .max-total-direct').replaceWith("<%= j render 'service_calendars/master_calendar/otf/totals/max_total_direct_one_time_fee', service_request: @service_request %>")
$('.one-time-fees-container:visible .max-total-per-study').replaceWith("<%= j render 'service_calendars/master_calendar/otf/totals/total_cost_per_study', service_request: @service_request %>")
<% end %>

# Re-render Admin Edit SSR header to update costs
if $("#subServiceRequestSummary").length
$("#subServiceRequestSummary").replaceWith("<%= j render 'dashboard/sub_service_requests/header', sub_service_request: @sub_service_request %>")

<% end %>