diff --git a/README.md b/README.md index 58b74978..6b62fc1e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ max_input_vars = 5000 + *Version*: 3.3.11 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **84140** ++ *Line count*: **84128** + *File count*: **559** + *Folder count*: **101** diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index f1d8ae94..dd7b25ea 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -1042,7 +1042,7 @@ class Sum // unscaled /////////////// // set each gender and age group morbidity_unscaled $this->items[$id]->$gender->$age->cost_morbidity_unscaled = $this->items[$id]->$gender->$age->morbidity_unscaled - * ( $this->company->total_salary / (( $this->company->males + $this->company->females) + * (( $this->company->total_salary / (( $this->company->males + $this->company->females) * $this->company->working_days)) + $this->company->total_healthcare / $this->totals['total_morbidity_unscaled']); // set total each cause/risk cost_morbidity_unscaled diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini index f533e624..73ae001a 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -1147,7 +1147,7 @@ COM_COSTBENEFITPROJECTION_NO_CAUSERISK_SELECTED="No Cause/Risk Selected" COM_COSTBENEFITPROJECTION_NO_DISEASERISK_SELECTED="No Disease/Risk Selected" COM_COSTBENEFITPROJECTION_NO_INTERVENTION_SELECTED="No Intervention Selected" COM_COSTBENEFITPROJECTION_NUMBER_OF_WORK_DAYS_LOST="Number of work days lost" -COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN="Percent of Estimated Burden" +COM_COSTBENEFITPROJECTION_PERCENT_OF_BESTIMATED_BURDENB_BEING_TARGETED_BY_THIS_DISEASERISK_SELECTION="Percent of Estimated Burden being targeted by this Disease/Risk selection" COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_COST="Percent of Total Cost" COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST="Percent of Total Days Lost" COM_COSTBENEFITPROJECTION_PLEASE_WAIT="please wait" diff --git a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index d5d7e1db..11898e30 100644 --- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -25,9 +25,9 @@ $scaled = array('unscaled','scaled'); ?>

- results->items) && CostbenefitprojectionHelper::checkObject($this->results->items)) : ?> +
(results->totals->total_estimated_burden,3).'%'; ?>) @@ -40,7 +40,6 @@ $scaled = array('unscaled','scaled'); - @@ -55,7 +54,6 @@ $scaled = array('unscaled','scaled'); - @@ -70,7 +68,6 @@ $scaled = array('unscaled','scaled'); - diff --git a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php index d5d7e1db..11898e30 100644 --- a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -25,9 +25,9 @@ $scaled = array('unscaled','scaled'); ?>

- results->items) && CostbenefitprojectionHelper::checkObject($this->results->items)) : ?> +
(results->totals->total_estimated_burden,3).'%'; ?>)
' >{'female_days_lost_'.$scale},3); ?> ' >{'subtotal_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale})*100; ?>' >{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?>subtotal_estimated_burden,3).'%'; ?> _tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?>
results->totals->{'females_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?>results->totals->total_estimated_burden,3).'%'; ?>   
@@ -40,7 +40,6 @@ $scaled = array('unscaled','scaled'); - @@ -55,7 +54,6 @@ $scaled = array('unscaled','scaled'); - @@ -70,7 +68,6 @@ $scaled = array('unscaled','scaled'); - diff --git a/site/language/en-GB/en-GB.com_costbenefitprojection.ini b/site/language/en-GB/en-GB.com_costbenefitprojection.ini index 67ac5dd7..3165c9ad 100644 --- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -1216,7 +1216,7 @@ COM_COSTBENEFITPROJECTION_ONLY_ME="Only Me" COM_COSTBENEFITPROJECTION_OPEN_FREE_ACCOUNT_NOW="Open free account now!" COM_COSTBENEFITPROJECTION_PA_SERVICE_PROVIDER_OR_COUNTRY_ADMINISTRATOR_MUST_SETUP_AN_ACCOUNT_FOR_YOUPPTHEREFORE_PLEASE_SELECT_YOUR_COUNTRY_AND_PREFERRED_SERVICE_PROVIDER_SHOULD_YOU_BE_UNSURE_WHICH_SERVICE_PROVIDER_TO_CONTACT_YOU_CAN_SIMPLY_CONTACT_THE_COUNTRY_ADMINISTRATORP="

A service provider or country administrator must setup an account for you!

Therefore please select your country, and preferred service provider. Should you be unsure which service provider to contact, you can simply contact the country administrator

" COM_COSTBENEFITPROJECTION_PERCENT="Percent" -COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN="Percent of Estimated Burden" +COM_COSTBENEFITPROJECTION_PERCENT_OF_BESTIMATED_BURDENB_BEING_TARGETED_BY_THIS_DISEASERISK_SELECTION="Percent of Estimated Burden being targeted by this Disease/Risk selection" COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_COST="Percent of Total Cost" COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST="Percent of Total Days Lost" COM_COSTBENEFITPROJECTION_PLEASE_PUBLISH_A_MODULE_TO_SPAN_CLASS_UKTEXTBOLD_PUBLICCOSTNOTE_SPAN_POSITION_OF_THIS_PAGE_WITH_YOUR_PUBLIC_NOTICE_TEXT="Please publish a module to [ publicCostNote ] position of this page with your public notice text!" diff --git a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index d5d7e1db..11898e30 100644 --- a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -25,9 +25,9 @@ $scaled = array('unscaled','scaled'); ?>

- results->items) && CostbenefitprojectionHelper::checkObject($this->results->items)) : ?> +
(results->totals->total_estimated_burden,3).'%'; ?>)
' >{'female_days_lost_'.$scale},3); ?> ' >{'subtotal_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale})*100; ?>' >{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?>subtotal_estimated_burden,3).'%'; ?> _tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?>
results->totals->{'females_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?>results->totals->total_estimated_burden,3).'%'; ?>   
@@ -40,7 +40,6 @@ $scaled = array('unscaled','scaled'); - @@ -55,7 +54,6 @@ $scaled = array('unscaled','scaled'); - @@ -70,7 +68,6 @@ $scaled = array('unscaled','scaled'); - diff --git a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php index d5d7e1db..11898e30 100644 --- a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -25,9 +25,9 @@ $scaled = array('unscaled','scaled'); ?>

- results->items) && CostbenefitprojectionHelper::checkObject($this->results->items)) : ?> +
(results->totals->total_estimated_burden,3).'%'; ?>)
' >{'female_days_lost_'.$scale},3); ?> ' >{'subtotal_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale})*100; ?>' >{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?>subtotal_estimated_burden,3).'%'; ?> _tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?>
results->totals->{'females_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?>results->totals->total_estimated_burden,3).'%'; ?>   
@@ -40,7 +40,6 @@ $scaled = array('unscaled','scaled'); - @@ -55,7 +54,6 @@ $scaled = array('unscaled','scaled'); - @@ -70,7 +68,6 @@ $scaled = array('unscaled','scaled'); -
' >{'female_days_lost_'.$scale},3); ?> ' >{'subtotal_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale})*100; ?>' >{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?>subtotal_estimated_burden,3).'%'; ?> _tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?>
results->totals->{'females_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale},3); ?> results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?>results->totals->total_estimated_burden,3).'%'; ?>