Fixed issue that caused duplicate company creation, also made email field in company profile a required field. All other changes are only random variable name and date changes (due to automation)

This commit is contained in:
Llewellyn van der Merwe 2016-02-22 14:36:00 +02:00
parent 8dbf6f673d
commit 68c2c767d0
411 changed files with 1243 additions and 1168 deletions

View File

@ -1,4 +1,4 @@
# Cost Benefit Projection (3.3.5) # Cost Benefit Projection (3.3.6)
This is a [Joomla 3.x] (http://www.joomla.org/) component. This is a [Joomla 3.x] (http://www.joomla.org/) component.
@ -23,11 +23,11 @@ max_input_vars = 5000
+ *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*: 22nd February, 2016 + *Last Build*: 22nd February, 2016
+ *Version*: 3.3.5 + *Version*: 3.3.6
+ *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*: **83618** + *Line count*: **83710**
+ *File count*: **551** + *File count*: **552**
+ *Folder count*: **101** + *Folder count*: **101**
> This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -2,7 +2,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@ -332,12 +332,34 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
if ($validData['id'] >= 0) if ($validData['id'] >= 0)
{ {
// if id is 0 get id // if id is 0 get id
if (0 == $validData['id']) if (0 >= (int) $validData['id'])
{ {
$validData['id'] = CostbenefitprojectionHelper::getVar('company', $validData['email'], 'email', 'id'); // Get a db connection.
$db = JFactory::getDbo();
// Create a new query object.
$query = $db->getQuery(true);
// Select id of this company
$query->select($db->quoteName(array('id')));
$query->from($db->quoteName('#__costbenefitprojection_company'));
$query->where($db->quoteName('name') . ' = '. $db->quote($validData['name']));
$query->where($db->quoteName('email') . ' = '. $db->quote($validData['email']));
$query->where($db->quoteName('country') . ' = '. (int) $validData['country']);
$query->where($db->quoteName('service_provider') . ' = '. (int) $validData['service_provider']);
$query->where($db->quoteName('created_by') . ' = '. (int) $validData['created_by']);
$query->where($db->quoteName('created') . ' = '. $db->quote($validData['created']));
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
$validData['id'] = $db->loadResult();
}
else
{
return;
}
} }
// user setup if not set // user setup if not set
if (0 >= (int) $validData['user']) if (0 >= (int) $validData['user'] && (int) $validData['id'] > 0)
{ {
// get user object // get user object
$user = JFactory::getUser(); $user = JFactory::getUser();
@ -367,172 +389,175 @@ class CostbenefitprojectionControllerCompany extends JControllerForm
} }
} }
} }
// only continue if we have a company id
// get params if ((int) $validData['id'] > 0)
$params = JComponentHelper::getParams('com_costbenefitprojection');
// get all this users companies
$hisCompanies = CostbenefitprojectionHelper::hisCompanies($validData['user']);
if (CostbenefitprojectionHelper::checkArray($hisCompanies))
{ {
// set the user group based on the overall status of its companies // get params
$departments = CostbenefitprojectionHelper::getVars('company', $hisCompanies, 'id', 'department'); $params = JComponentHelper::getParams('com_costbenefitprojection');
if (in_array(2, $departments)) // get all this users companies
$hisCompanies = CostbenefitprojectionHelper::hisCompanies($validData['user']);
if (CostbenefitprojectionHelper::checkArray($hisCompanies))
{ {
$memberGroups = $params->get('advancedmembergroup'); // set the user group based on the overall status of its companies
} $departments = CostbenefitprojectionHelper::getVars('company', $hisCompanies, 'id', 'department');
else if (in_array(2, $departments))
{
$memberGroups = $params->get('memberbasicgroup');
}
}
else
{
// first company so act simply on this company department status
if (2 == $validData['department'])
{
$memberGroups = $params->get('advancedmembergroup');
}
else
{
$memberGroups = $params->get('memberbasicgroup');
}
}
// update the user groups
JUserHelper::setUserGroups((int)$validData['user'],(array)$memberGroups);
// Get a db connection.
$db = JFactory::getDbo();
// Create a new query object.
$query = $db->getQuery(true);
// Select all records in scaling factors the belong to this company
$query->select($db->quoteName(array('id','causerisk','published')));
$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
$query->where($db->quoteName('company') . ' = '. (int) $validData['id']);
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
// load the scaling factors already set
$already = $db->loadObjectList();
$publish = array();
$archive = array();
$bucket = array();
foreach ($already as $scale)
{
if (CostbenefitprojectionHelper::checkArray($validData['causesrisks']))
{ {
if (in_array($scale->causerisk, $validData['causesrisks']) && $scale->published != 1) $memberGroups = $params->get('advancedmembergroup');
}
else
{
$memberGroups = $params->get('memberbasicgroup');
}
}
else
{
// first company so act simply on this company department status
if (2 == $validData['department'])
{
$memberGroups = $params->get('advancedmembergroup');
}
else
{
$memberGroups = $params->get('memberbasicgroup');
}
}
// update the user groups
JUserHelper::setUserGroups((int)$validData['user'],(array)$memberGroups);
// Get a db connection.
$db = JFactory::getDbo();
// Create a new query object.
$query = $db->getQuery(true);
// Select all records in scaling factors the belong to this company
$query->select($db->quoteName(array('id','causerisk','published')));
$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
$query->where($db->quoteName('company') . ' = '. (int) $validData['id']);
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
// load the scaling factors already set
$already = $db->loadObjectList();
$publish = array();
$archive = array();
$bucket = array();
foreach ($already as $scale)
{
if (CostbenefitprojectionHelper::checkArray($validData['causesrisks']))
{ {
// publish the scaling factor (update) if (in_array($scale->causerisk, $validData['causesrisks']) && $scale->published != 1)
$publish[$scale->id] = $scale->id; {
// publish the scaling factor (update)
$publish[$scale->id] = $scale->id;
}
elseif (!in_array($scale->causerisk, $validData['causesrisks']))
{
// archive the scaling factor (update)
$archive[$scale->id] = $scale->id;
}
$bucket[] = $scale->causerisk;
} }
elseif (!in_array($scale->causerisk, $validData['causesrisks'])) else
{ {
// archive the scaling factor (update) // archive the scaling factor (update)
$archive[$scale->id] = $scale->id; $archive[$scale->id] = $scale->id;
} }
$bucket[] = $scale->causerisk; }
// update the needed records
$types = array('publish' => 1,'archive' => 2);
foreach ($types as $type => $int)
{
if (CostbenefitprojectionHelper::checkArray(${$type}))
{
foreach (${$type} as $id)
{
$query = $db->getQuery(true);
// Fields to update.
$fields = array(
$db->quoteName('published') . ' = ' . (int) $int
);
// Conditions for which records should be updated.
$conditions = array(
$db->quoteName('id') . ' = ' . (int) $id
);
$query->update($db->quoteName('#__costbenefitprojection_scaling_factor'))->set($fields)->where($conditions);
$db->setQuery($query);
$db->execute();
}
}
}
}
if (CostbenefitprojectionHelper::checkArray($validData['causesrisks']))
{
// remove those already set from the saved list of causesrisks
if (CostbenefitprojectionHelper::checkArray($bucket))
{
$insert = array();
foreach ($validData['causesrisks'] as $causerisk)
{
if (!in_array($causerisk,$bucket))
{
$insert[] = $causerisk;
}
}
} }
else else
{ {
// archive the scaling factor (update) $insert = $validData['causesrisks'];
$archive[$scale->id] = $scale->id;
} }
} }
// update the needed records // insert the new records
$types = array('publish' => 1,'archive' => 2); if (CostbenefitprojectionHelper::checkArray($insert))
foreach ($types as $type => $int)
{ {
if (CostbenefitprojectionHelper::checkArray(${$type})) $created = $db->quote(JFactory::getDate()->toSql());
{ $created_by = JFactory::getUser()->get('id');
foreach (${$type} as $id) $company = $validData['id'];
{
$query = $db->getQuery(true);
// Fields to update.
$fields = array(
$db->quoteName('published') . ' = ' . (int) $int
);
// Conditions for which records should be updated.
$conditions = array(
$db->quoteName('id') . ' = ' . (int) $id
);
$query->update($db->quoteName('#__costbenefitprojection_scaling_factor'))->set($fields)->where($conditions); // Create a new query object.
$query = $db->getQuery(true);
// Insert columns.
$columns = array(
'causerisk', 'company', 'mortality_scaling_factor_females',
'mortality_scaling_factor_males', 'presenteeism_scaling_factor_females',
'presenteeism_scaling_factor_males', 'yld_scaling_factor_females',
'yld_scaling_factor_males', 'published',
'created_by', 'created');
// setup the values
$values = array();
foreach ($insert as $new)
{
$array = array($new,$company,1,1,1,1,1,1,1,$created_by,$created);
$values[] = implode(',',$array);
}
// Prepare the insert query.
$query
->insert($db->quoteName('#__costbenefitprojection_scaling_factor'))
->columns($db->quoteName($columns))
->values(implode('), (', $values));
// Set the query using our newly populated query object and execute it.
$db->setQuery($query);
$done = $db->execute();
if ($done)
{
// we must set the assets
foreach ($insert as $causerisk)
{
// get all the ids. Create a new query object.
$query = $db->getQuery(true);
$query->select($db->quoteName(array('id')));
$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
$query->where($db->quoteName('causerisk') . ' = '. (int) $causerisk);
$query->where($db->quoteName('company') . ' = '. (int) $company);
$db->setQuery($query); $db->setQuery($query);
$db->execute(); $db->execute();
} if ($db->getNumRows())
} {
} $aId = $db->loadResult();
} // make sure the access of asset is set
if (CostbenefitprojectionHelper::checkArray($validData['causesrisks'])) CostbenefitprojectionHelper::setAsset($aId,'scaling_factor');
{ }
// remove those already set from the saved list of causesrisks
if (CostbenefitprojectionHelper::checkArray($bucket))
{
$insert = array();
foreach ($validData['causesrisks'] as $causerisk)
{
if (!in_array($causerisk,$bucket))
{
$insert[] = $causerisk;
}
}
}
else
{
$insert = $validData['causesrisks'];
}
}
// insert the new records
if (CostbenefitprojectionHelper::checkArray($insert))
{
$created = $db->quote(JFactory::getDate()->toSql());
$created_by = JFactory::getUser()->get('id');
$company = $validData['id'];
// Create a new query object.
$query = $db->getQuery(true);
// Insert columns.
$columns = array(
'causerisk', 'company', 'mortality_scaling_factor_females',
'mortality_scaling_factor_males', 'presenteeism_scaling_factor_females',
'presenteeism_scaling_factor_males', 'yld_scaling_factor_females',
'yld_scaling_factor_males', 'published',
'created_by', 'created');
// setup the values
$values = array();
foreach ($insert as $new)
{
$array = array($new,$company,1,1,1,1,1,1,1,$created_by,$created);
$values[] = implode(',',$array);
}
// Prepare the insert query.
$query
->insert($db->quoteName('#__costbenefitprojection_scaling_factor'))
->columns($db->quoteName($columns))
->values(implode('), (', $values));
// Set the query using our newly populated query object and execute it.
$db->setQuery($query);
$done = $db->execute();
if ($done)
{
// we must set the assets
foreach ($insert as $causerisk)
{
// get all the ids. Create a new query object.
$query = $db->getQuery(true);
$query->select($db->quoteName(array('id')));
$query->from($db->quoteName('#__costbenefitprojection_scaling_factor'));
$query->where($db->quoteName('causerisk') . ' = '. (int) $causerisk);
$query->where($db->quoteName('company') . ' = '. (int) $company);
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
$aId = $db->loadResult();
// make sure the access of asset is set
CostbenefitprojectionHelper::setAsset($aId,'scaling_factor');
} }
} }
} }

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@ -324,6 +324,30 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm
{ {
if ($validData['id'] >= 0) if ($validData['id'] >= 0)
{ {
// if id is 0 get id
if (0 >= (int) $validData['id'])
{
// Get a db connection.
$db = JFactory::getDbo();
// Create a new query object.
$query = $db->getQuery(true);
// Select id of this service_provider
$query->select($db->quoteName(array('id')));
$query->from($db->quoteName('#__costbenefitprojection_service_provider'));
$query->where($db->quoteName('country') . ' = '. (int) $validData['country']);
$query->where($db->quoteName('created_by') . ' = '. (int) $validData['created_by']);
$query->where($db->quoteName('created') . ' = '. $db->quote($validData['created']));
$db->setQuery($query);
$db->execute();
if ($db->getNumRows())
{
$validData['id'] = $db->loadResult();
}
else
{
return;
}
}
// user setup if not set // user setup if not set
if (0 >= (int) $validData['user']) if (0 >= (int) $validData['user'])
{ {

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->tbginterventions; $items = $displayData->oabinterventions;
$user = JFactory::getUser(); $user = JFactory::getUser();
$id = $displayData->item->id; $id = $displayData->item->id;
$edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->eoascaling_factors; $items = $displayData->tmyscaling_factors;
$user = JFactory::getUser(); $user = JFactory::getUser();
$id = $displayData->item->id; $id = $displayData->item->id;
$edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit"; $edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit";

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->oyfcompanies; $items = $displayData->vmqcompanies;
$user = JFactory::getUser(); $user = JFactory::getUser();
$id = $displayData->item->id; $id = $displayData->item->id;
$edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit";

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->geointerventions; $items = $displayData->jirinterventions;
$user = JFactory::getUser(); $user = JFactory::getUser();
$id = $displayData->item->id; $id = $displayData->item->id;
$edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit";

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection
@ -22,7 +22,7 @@
defined('_JEXEC') or die('Restricted access'); defined('_JEXEC') or die('Restricted access');
// set the defaults // set the defaults
$items = $displayData->kweservice_providers; $items = $displayData->oehservice_providers;
$user = JFactory::getUser(); $user = JFactory::getUser();
$id = $displayData->item->id; $id = $displayData->item->id;
$edit = "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit"; $edit = "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit";

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

View File

@ -3,7 +3,7 @@
Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb
/-------------------------------------------------------------------------------------------------------/ /-------------------------------------------------------------------------------------------------------/
@version 3.3.5 @version 3.3.6
@build 22nd February, 2016 @build 22nd February, 2016
@created 15th June, 2012 @created 15th June, 2012
@package Cost Benefit Projection @package Cost Benefit Projection

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