mdube56/Cost-Benefit-Projection
1
0
Fork 0
forked from joomla/Cost-Benefit-Projection
Code Pull Requests Activity

resolves #11 We removed the burden of disease column on work days lost and added it as a total burden of diseases targeted at the top of the table.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2016-05-02 16:10:54 +01:00
parent 434762da52
commit 40e96ecf59
8 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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**

2
admin/helpers/sum.php
View File

@ -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

2
admin/language/en-GB/en-GB.com_costbenefitprojection.ini
View File

@ -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 <b>Estimated Burden</b> 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"

5
admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
View File

@ -25,9 +25,9 @@ $scaled = array('unscaled','scaled');
?>
<div id="view_wdls">
<h1><?php echo JText::_('COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST_SUMMARY'); ?></h1>
<?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_AND_CONTRIBUTION_OF_MORBIDITY_MORTALITY_AND_RISK_FACTORS'); ?>
<?php if (isset($this->results->items) && CostbenefitprojectionHelper::checkObject($this->results->items)) : ?>
<br /><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_BESTIMATED_BURDENB_BEING_TARGETED_BY_THIS_DISEASERISK_SELECTION'); ?> <b>(<?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?>)</b>
<?php foreach ($scaled as $scale): ?>
<table id="theTableWDLS_<?php echo $scale; ?>" class="footable table data metro-blue <?php echo $scale; ?>" style="display: <?php echo ($scale == 'unscaled') ? 'table' : 'none'; ?>;" data-page-size="50">
<thead>
@ -40,7 +40,6 @@ $scaled = array('unscaled','scaled');
<th width="11%" data-hide="phone,tablet"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DAYS_LOST_FEMALE_EMPLOYEES'); ?></th>
<th width="11%" data-hide="phone"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR'); ?></th>
<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST'); ?></th>
<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN'); ?></th>
<th data-hide="all"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DATA'); ?></th>
</tr>
</thead>
@ -55,7 +54,6 @@ $scaled = array('unscaled','scaled');
<td data-value='<?php echo $item->{'female_days_lost_'.$scale}; ?>' ><?php echo round($item->{'female_days_lost_'.$scale},3); ?></td>
<td data-value='<?php echo $item->{'subtotal_days_lost_'.$scale}; ?>' ><?php echo round($item->{'subtotal_days_lost_'.$scale},3); ?></td>
<td data-value='<?php echo ($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100; ?>' ><?php echo round(($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
<td data-value='<?php echo $item->subtotal_estimated_burden; ?>' ><?php echo round($item->subtotal_estimated_burden,3).'%'; ?></td>
<td data-value='0' ><?php $item->_tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?></td>
</tr>
<?php endforeach; ?>
@ -70,7 +68,6 @@ $scaled = array('unscaled','scaled');
<td><?php echo round($this->results->totals->{'females_days_lost_'.$scale},3); ?></td>
<td><?php echo round($this->results->totals->{'total_days_lost_'.$scale},3); ?></td>
<td><?php echo round(($this->results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
<td><?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?></td>
<td>&nbsp;&nbsp;</td>
</tr>
</tfoot>

5
admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php
View File

@ -25,9 +25,9 @@ $scaled = array('unscaled','scaled');
?>
<div id="view_wdls">
<h1><?php echo JText::_('COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST_SUMMARY'); ?></h1>
<?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_AND_CONTRIBUTION_OF_MORBIDITY_MORTALITY_AND_RISK_FACTORS'); ?>
<?php if (isset($this->results->items) && CostbenefitprojectionHelper::checkObject($this->results->items)) : ?>
<br /><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_BESTIMATED_BURDENB_BEING_TARGETED_BY_THIS_DISEASERISK_SELECTION'); ?> <b>(<?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?>)</b>
<?php foreach ($scaled as $scale): ?>
<table id="theTableWDLS_<?php echo $scale; ?>" class="footable table data metro-blue <?php echo $scale; ?>" style="display: <?php echo ($scale == 'unscaled') ? 'table' : 'none'; ?>;" data-page-size="50">
<thead>
@ -40,7 +40,6 @@ $scaled = array('unscaled','scaled');
<th width="11%" data-hide="phone,tablet"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DAYS_LOST_FEMALE_EMPLOYEES'); ?></th>
<th width="11%" data-hide="phone"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR'); ?></th>
<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST'); ?></th>
<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN'); ?></th>
<th data-hide="all"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DATA'); ?></th>
</tr>
</thead>
@ -55,7 +54,6 @@ $scaled = array('unscaled','scaled');
<td data-value='<?php echo $item->{'female_days_lost_'.$scale}; ?>' ><?php echo round($item->{'female_days_lost_'.$scale},3); ?></td>
<td data-value='<?php echo $item->{'subtotal_days_lost_'.$scale}; ?>' ><?php echo round($item->{'subtotal_days_lost_'.$scale},3); ?></td>
<td data-value='<?php echo ($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100; ?>' ><?php echo round(($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
<td data-value='<?php echo $item->subtotal_estimated_burden; ?>' ><?php echo round($item->subtotal_estimated_burden,3).'%'; ?></td>
<td data-value='0' ><?php $item->_tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?></td>
</tr>
<?php endforeach; ?>
@ -70,7 +68,6 @@ $scaled = array('unscaled','scaled');
<td><?php echo round($this->results->totals->{'females_days_lost_'.$scale},3); ?></td>
<td><?php echo round($this->results->totals->{'total_days_lost_'.$scale},3); ?></td>
<td><?php echo round(($this->results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
<td><?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?></td>
<td>&nbsp;&nbsp;</td>
</tr>
</tfoot>

2
site/language/en-GB/en-GB.com_costbenefitprojection.ini
View File

@ -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="<p>A service provider or country administrator must setup an account for you!</p><p>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</p>"
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 <b>Estimated Burden</b> 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 [<span class ="uk-text-bold"> publicCostNote </span>] position of this page with your public notice text!"

5
site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php
View File

@ -25,9 +25,9 @@ $scaled = array('unscaled','scaled');
?>
<div id="view_wdls">
<h1><?php echo JText::_('COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST_SUMMARY'); ?></h1>
<?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_AND_CONTRIBUTION_OF_MORBIDITY_MORTALITY_AND_RISK_FACTORS'); ?>
<?php if (isset($this->results->items) && CostbenefitprojectionHelper::checkObject($this->results->items)) : ?>
<br /><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_BESTIMATED_BURDENB_BEING_TARGETED_BY_THIS_DISEASERISK_SELECTION'); ?> <b>(<?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?>)</b>
<?php foreach ($scaled as $scale): ?>
<table id="theTableWDLS_<?php echo $scale; ?>" class="footable table data metro-blue <?php echo $scale; ?>" style="display: <?php echo ($scale == 'unscaled') ? 'table' : 'none'; ?>;" data-page-size="50">
<thead>
@ -40,7 +40,6 @@ $scaled = array('unscaled','scaled');
<th width="11%" data-hide="phone,tablet"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DAYS_LOST_FEMALE_EMPLOYEES'); ?></th>
<th width="11%" data-hide="phone"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR'); ?></th>
<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST'); ?></th>
<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN'); ?></th>
<th data-hide="all"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DATA'); ?></th>
</tr>
</thead>
@ -55,7 +54,6 @@ $scaled = array('unscaled','scaled');
<td data-value='<?php echo $item->{'female_days_lost_'.$scale}; ?>' ><?php echo round($item->{'female_days_lost_'.$scale},3); ?></td>
<td data-value='<?php echo $item->{'subtotal_days_lost_'.$scale}; ?>' ><?php echo round($item->{'subtotal_days_lost_'.$scale},3); ?></td>
<td data-value='<?php echo ($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100; ?>' ><?php echo round(($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
<td data-value='<?php echo $item->subtotal_estimated_burden; ?>' ><?php echo round($item->subtotal_estimated_burden,3).'%'; ?></td>
<td data-value='0' ><?php $item->_tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?></td>
</tr>
<?php endforeach; ?>
@ -70,7 +68,6 @@ $scaled = array('unscaled','scaled');
<td><?php echo round($this->results->totals->{'females_days_lost_'.$scale},3); ?></td>
<td><?php echo round($this->results->totals->{'total_days_lost_'.$scale},3); ?></td>
<td><?php echo round(($this->results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
<td><?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?></td>
<td>&nbsp;&nbsp;</td>
</tr>
</tfoot>

5
site/views/companyresults/tmpl/default_table_work_days_lost_summary.php
View File

@ -25,9 +25,9 @@ $scaled = array('unscaled','scaled');
?>
<div id="view_wdls">
<h1><?php echo JText::_('COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST_SUMMARY'); ?></h1>
<?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_AND_CONTRIBUTION_OF_MORBIDITY_MORTALITY_AND_RISK_FACTORS'); ?>
<?php if (isset($this->results->items) && CostbenefitprojectionHelper::checkObject($this->results->items)) : ?>
<br /><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_BESTIMATED_BURDENB_BEING_TARGETED_BY_THIS_DISEASERISK_SELECTION'); ?> <b>(<?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?>)</b>
<?php foreach ($scaled as $scale): ?>
<table id="theTableWDLS_<?php echo $scale; ?>" class="footable table data metro-blue <?php echo $scale; ?>" style="display: <?php echo ($scale == 'unscaled') ? 'table' : 'none'; ?>;" data-page-size="50">
<thead>
@ -40,7 +40,6 @@ $scaled = array('unscaled','scaled');
<th width="11%" data-hide="phone,tablet"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DAYS_LOST_FEMALE_EMPLOYEES'); ?></th>
<th width="11%" data-hide="phone"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR'); ?></th>
<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST'); ?></th>
<th width="11%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_PERCENT_OF_ESTIMATED_BURDEN'); ?></th>
<th data-hide="all"><?php echo JText::_('COM_COSTBENEFITPROJECTION_DATA'); ?></th>
</tr>
</thead>
@ -55,7 +54,6 @@ $scaled = array('unscaled','scaled');
<td data-value='<?php echo $item->{'female_days_lost_'.$scale}; ?>' ><?php echo round($item->{'female_days_lost_'.$scale},3); ?></td>
<td data-value='<?php echo $item->{'subtotal_days_lost_'.$scale}; ?>' ><?php echo round($item->{'subtotal_days_lost_'.$scale},3); ?></td>
<td data-value='<?php echo ($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100; ?>' ><?php echo round(($item->{'subtotal_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
<td data-value='<?php echo $item->subtotal_estimated_burden; ?>' ><?php echo round($item->subtotal_estimated_burden,3).'%'; ?></td>
<td data-value='0' ><?php $item->_tmpType = 'day'; $item->_tmpScale = $scale; echo JLayoutHelper::render('databreakdownmalefemale', $item); ?></td>
</tr>
<?php endforeach; ?>
@ -70,7 +68,6 @@ $scaled = array('unscaled','scaled');
<td><?php echo round($this->results->totals->{'females_days_lost_'.$scale},3); ?></td>
<td><?php echo round($this->results->totals->{'total_days_lost_'.$scale},3); ?></td>
<td><?php echo round(($this->results->totals->{'total_days_lost_'.$scale} / $this->results->totals->{'total_days_lost_'.$scale})*100,3).'%'; ?></td>
<td><?php echo round($this->results->totals->total_estimated_burden,3).'%'; ?></td>
<td>&nbsp;&nbsp;</td>
</tr>
</tfoot>