SAW - Direct Cost Made Configurable #861
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…osts method for price [#134879983]
…ine dependent on USE_INDIRECT_COST in service calendar [#134879983]
kayla-glick
approved these changes
Jan 6, 2017
jayhardee9
reviewed
Jan 6, 2017
| @@ -87,11 +81,6 @@ def display_total_direct_cost_per_study_pppvs service_request | |||
| currency_converter sum | |||
| end | |||
|
|
|||
| def display_total_indirect_cost_per_study_pppvs service_request | |||
There was a problem hiding this comment.
Isn't this being used at app/views/service_requests/calendar_totals.html.haml:44?
| @@ -116,11 +105,6 @@ def display_total_direct_cost_per_study_otfs service_request, line_items | |||
| currency_converter sum | |||
| end | |||
|
|
|||
| def display_total_indirect_cost_per_study_otfs service_request, line_items | |||
There was a problem hiding this comment.
Ditto. app/views/service_requests/calendar_totals.html.haml:62
| @@ -139,11 +123,6 @@ def display_grand_total_direct_costs service_request, line_items | |||
| currency_converter sum | |||
| end | |||
|
|
|||
| def display_grand_total_indirect_costs service_request, line_items | |||
There was a problem hiding this comment.
app/views/service_requests/calendar_totals.html.haml:81
app/views/service_requests/review/_review_totals.html.haml:32
| @@ -154,11 +133,6 @@ def display_study_grand_total_direct_costs protocol, service_request | |||
| currency_converter sum | |||
| end | |||
|
|
|||
| def display_study_grand_total_indirect_costs protocol, service_request | |||
There was a problem hiding this comment.
app/views/service_requests/show.xlsx.axlsx:277
app/views/service_requests/show.xlsx.axlsx:279
|
I added the display_indirect_costs helper methods back for now, but I should check that Wenjun wants indirect totals to be displayed anywhere before properly removing them. |
jleonardw9
approved these changes
Jan 9, 2017
wtholt
approved these changes
Jan 9, 2017
jwiel86
approved these changes
Jan 9, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Total Direct Costs are only displayed when USE_INDIRECT_COST is true, Total Indirect Costs are no longer displayed at all.