Merge pull request #340 from bmic-development/kg-indirect_cost_calcul…

…ation KG - Max Totals Indirect Cost Incorrect
bmic-development · Jun 20, 2017 · 2c31f2b · 2c31f2b
2 parents 1c4eae2 + b4c4a2b
commit 2c31f2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...ews/service_calendars/master_calendar/pppv/totals/_max_total_direct_per_patient.html.haml b/...ews/service_calendars/master_calendar/pppv/totals/_max_total_direct_per_patient.html.haml
@@ -25,7 +25,7 @@
     - visit_groups.includes(visits: { line_items_visit: { line_item: [:admin_rates, service: [:pricing_maps, organization: [:pricing_setups, parent: [:pricing_setups, parent: [:pricing_setups, parent: :pricing_setups]]]], service_request: :protocol] } }).each do |vg|
       %td.text-center.visit-width{ class: "max-direct-per-patient visit-#{vg.id}" }
         %strong
-          = currency_converter(vg.per_patient_subtotals * (1 + (arm.protocol.indirect_cost_rate || 0)))
+          = currency_converter(vg.per_patient_subtotals)
     - (VisitGroup.per_page - visit_groups.length).times do
       %td.visit-width
     %td.text-center.total-width

diff --git a/app/views/service_calendars/master_calendar/pppv/totals/_max_total_per_patient.html.haml b/app/views/service_calendars/master_calendar/pppv/totals/_max_total_per_patient.html.haml
@@ -24,7 +24,10 @@
   - visit_groups.each do |vg|
     %td.text-center.visit-width{ class: "max-total-per-patient visit-#{vg.id}" }
       %strong
-        = currency_converter(vg.per_patient_subtotals)
+        - if USE_INDIRECT_COST
+          = currency_converter(vg.per_patient_subtotals * (1 + ((arm.protocol.indirect_cost_rate / 100) || 0)))
+        - else
+          = currency_converter(vg.per_patient_subtotals)
   - (VisitGroup.per_page - visit_groups.length).times do
     %td.visit-width
   %td.text-center.total-width