resolves #9 updated the sum to make use of consistent calculation in operator precedence.

This commit is contained in:
Llewellyn van der Merwe 2016-05-02 15:29:04 +01:00
parent ef2a4506a0
commit 434762da52
413 changed files with 531 additions and 433 deletions

View File

@ -22,11 +22,11 @@ max_input_vars = 5000
+ *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io) + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io)
+ *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/) + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/)
+ *First Build*: 15th June, 2012 + *First Build*: 15th June, 2012
+ *Last Build*: 9th April, 2016 + *Last Build*: 2nd May, 2016
+ *Version*: 3.3.11 + *Version*: 3.3.11
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+ *Line count*: **84042** + *Line count*: **84140**
+ *File count*: **559** + *File count*: **559**
+ *Folder count*: **101** + *Folder count*: **101**

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage admin.css @subpackage admin.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage causerisk.css @subpackage causerisk.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage causesrisks.css @subpackage causesrisks.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage combinedresults.css @subpackage combinedresults.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage companies.css @subpackage companies.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage company.css @subpackage company.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage companyresults.css @subpackage companyresults.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage countries.css @subpackage countries.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage country.css @subpackage country.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage currencies.css @subpackage currencies.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage currency.css @subpackage currency.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage dashboard.css @subpackage dashboard.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage health_data.css @subpackage health_data.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage health_data_sets.css @subpackage health_data_sets.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage help_document.css @subpackage help_document.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage help_documents.css @subpackage help_documents.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage intervention.css @subpackage intervention.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage interventions.css @subpackage interventions.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage scaling_factor.css @subpackage scaling_factor.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage scaling_factors.css @subpackage scaling_factors.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage service_provider.css @subpackage service_provider.css

View File

@ -3,7 +3,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage service_providers.css @subpackage service_providers.css

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage controller.php @subpackage controller.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage ajax.json.php @subpackage ajax.json.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage causerisk.php @subpackage causerisk.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage causesrisks.php @subpackage causesrisks.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage combinedresults.php @subpackage combinedresults.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage companies.php @subpackage companies.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage company.php @subpackage company.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage companyresults.php @subpackage companyresults.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage costbenefitprojection.php @subpackage costbenefitprojection.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage countries.php @subpackage countries.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage country.php @subpackage country.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage currencies.php @subpackage currencies.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage currency.php @subpackage currency.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage health_data.php @subpackage health_data.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage health_data_sets.php @subpackage health_data_sets.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage help.php @subpackage help.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage help_document.php @subpackage help_document.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage help_documents.php @subpackage help_documents.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage import.php @subpackage import.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage intervention.php @subpackage intervention.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage interventions.php @subpackage interventions.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage scaling_factor.php @subpackage scaling_factor.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage scaling_factors.php @subpackage scaling_factors.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage service_provider.php @subpackage service_provider.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage service_providers.php @subpackage service_providers.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage costbenefitprojection.php @subpackage costbenefitprojection.php

View File

@ -7,8 +7,8 @@
* *
**/ **/
// No direct access. // No direct access to this file
defined('_JEXEC') or die; defined('_JEXEC') or die('Restricted access');
class Chartbuilder class Chartbuilder
{ {

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage costbenefitprojection.php @subpackage costbenefitprojection.php
@ -947,6 +947,55 @@ abstract class CostbenefitprojectionHelper
return $was; return $was;
} }
/**
* Update user values
*/
public static function updateUser($new)
{
// load the user component language files if there is an error.
$lang = JFactory::getLanguage();
$extension = 'com_users';
$base_dir = JPATH_ADMINISTRATOR;
$language_tag = 'en-GB';
$reload = true;
$lang->load($extension, $base_dir, $language_tag, $reload);
// load the user model
$model = self::getModel('user', JPATH_ADMINISTRATOR . '/components/com_users', 'Users');
// Check if password was set
if (isset($new['password']) && isset($new['password2']) && self::checkString($new['password']) && self::checkString($new['password2']))
{
// Use the users passwords
$password = $new['password'];
$password2 = $new['password2'];
}
// set username
if (isset($new['username']) && self::checkString($new['username']))
{
$new['username'] = self::safeString($new['username']);
}
else
{
$new['username'] = self::safeString($new['name']);
}
// linup update user data
$data = array(
'id' => $new['id'],
'username' => $new['username'],
'name' => $new['name'],
'email' => $new['email'],
'password1' => $password, // First password field
'password2' => $password2, // Confirm password field
'block' => 0 );
// register the new user
$done = $model->save($data);
// if user is updated
if ($done)
{
return $new['id'];
}
return $model->getError();
}
/** /**
* UIKIT Component Classes * UIKIT Component Classes
**/ **/
@ -1967,7 +2016,7 @@ abstract class CostbenefitprojectionHelper
$w .= ' '; $w .= ' ';
if($r < 100) if($r < 100)
{ {
$word .= 'and '; $w .= 'and ';
} }
$w .= self::numberToString($r); $w .= self::numberToString($r);
} }

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage batch_.php @subpackage batch_.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage sum.php @subpackage sum.php
@ -1042,8 +1042,8 @@ class Sum
// unscaled /////////////// // unscaled ///////////////
// set each gender and age group morbidity_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->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->working_days))
+ $this->company->total_healthcare / $this->totals['total_morbidity_unscaled']); + $this->company->total_healthcare / $this->totals['total_morbidity_unscaled']);
// set total each cause/risk cost_morbidity_unscaled // set total each cause/risk cost_morbidity_unscaled
if(!isset($this->items[$id]->subtotal_cost_morbidity_unscaled)) if(!isset($this->items[$id]->subtotal_cost_morbidity_unscaled))

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage sumcombine.php @subpackage sumcombine.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage batchselection.php @subpackage batchselection.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_above.php @subpackage details_above.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_left.php @subpackage details_left.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publishing.php @subpackage publishing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publlshing.php @subpackage publlshing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage age_groups_percentages_fullwidth.php @subpackage age_groups_percentages_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage age_groups_percentages_left.php @subpackage age_groups_percentages_left.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage age_groups_percentages_right.php @subpackage age_groups_percentages_right.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage causerisk_selection_fullwidth.php @subpackage causerisk_selection_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_above.php @subpackage details_above.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_left.php @subpackage details_left.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_right.php @subpackage details_right.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_under.php @subpackage details_under.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage interventions_fullwidth.php @subpackage interventions_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publishing.php @subpackage publishing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publlshing.php @subpackage publlshing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage scaling_factors_fullwidth.php @subpackage scaling_factors_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage age_groups_percentages_left.php @subpackage age_groups_percentages_left.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage age_groups_percentages_right.php @subpackage age_groups_percentages_right.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage causerisk_selection_fullwidth.php @subpackage causerisk_selection_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage companies_fullwidth.php @subpackage companies_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_above.php @subpackage details_above.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_left.php @subpackage details_left.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_right.php @subpackage details_right.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage health_data_totals_left.php @subpackage health_data_totals_left.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage health_data_totals_right.php @subpackage health_data_totals_right.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage interventions_fullwidth.php @subpackage interventions_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage public_details_fullwidth.php @subpackage public_details_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publishing.php @subpackage publishing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publlshing.php @subpackage publlshing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage service_providers_fullwidth.php @subpackage service_providers_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_above.php @subpackage details_above.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_left.php @subpackage details_left.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_right.php @subpackage details_right.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publishing.php @subpackage publishing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publlshing.php @subpackage publlshing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage databreakdownmalefemale.php @subpackage databreakdownmalefemale.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_above.php @subpackage details_above.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_left.php @subpackage details_left.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_right.php @subpackage details_right.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_rightside.php @subpackage details_rightside.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publishing.php @subpackage publishing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage publlshing.php @subpackage publlshing.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_above.php @subpackage details_above.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_fullwidth.php @subpackage details_fullwidth.php

View File

@ -4,7 +4,7 @@
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.11 @version 3.3.11
@build 9th April, 2016 @build 2nd May, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@subpackage details_left.php @subpackage details_left.php

Some files were not shown because too many files have changed in this diff Show More