Updated with JCB v2.12.4

README.md

@@ -22,12 +22,12 @@ max_input_vars = 5000
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Cost Benefit Projection](https://www.staffhealthcbp.com/)
 + *First Build*: 15th June, 2012
-+ *Last Build*: 30th May, 2020
++ *Last Build*: 6th January, 2021
 + *Version*: 3.4.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **85996**
++ *Line count*: **86905**
-+ *File count*: **585**
++ *File count*: **587**
 + *Folder count*: **103**
 
 > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).

admin/README.txt

@@ -22,12 +22,12 @@ max_input_vars = 5000
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Cost Benefit Projection](https://www.staffhealthcbp.com/)
 + *First Build*: 15th June, 2012
-+ *Last Build*: 30th May, 2020
++ *Last Build*: 6th January, 2021
 + *Version*: 3.4.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **85996**
++ *Line count*: **86905**
-+ *File count*: **585**
++ *File count*: **587**
 + *Folder count*: **103**
 
 > This **component** was build with a Joomla [Automated Component Builder](https://www.vdm.io/joomla-component-builder).

admin/access.xml

@@ -87,6 +87,7 @@
 		<action name="currency.export" title="COM_COSTBENEFITPROJECTION_CURRENCIES_EXPORT" description="COM_COSTBENEFITPROJECTION_CURRENCIES_EXPORT_DESC" />
 		<action name="currency.import" title="COM_COSTBENEFITPROJECTION_CURRENCIES_IMPORT" description="COM_COSTBENEFITPROJECTION_CURRENCIES_IMPORT_DESC" />
 		<action name="currency.submenu" title="COM_COSTBENEFITPROJECTION_CURRENCIES_SUBMENU" description="COM_COSTBENEFITPROJECTION_CURRENCIES_SUBMENU_DESC" />
+		<action name="health_data.bulk_export" title="COM_COSTBENEFITPROJECTION_HEALTH_DATA_BULK_EXPORT_BUTTON_ACCESS" description="COM_COSTBENEFITPROJECTION_HEALTH_DATA_BULK_EXPORT_BUTTON_ACCESS_DESC" />
 		<action name="health_data.access" title="COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_ACCESS" description="COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_ACCESS_DESC" />
 		<action name="health_data.batch" title="COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_BATCH_USE" description="COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_BATCH_USE_DESC" />
 		<action name="health_data.create" title="COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_CREATE" description="COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_CREATE_DESC" />

admin/assets/css/admin.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		admin.css

admin/assets/css/causerisk.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.css

admin/assets/css/causesrisks.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.css

admin/assets/css/combinedresults.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.css

admin/assets/css/companies.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.css

admin/assets/css/company.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.css

admin/assets/css/companyresults.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.css

admin/assets/css/countries.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.css

admin/assets/css/country.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.css

admin/assets/css/currencies.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.css

admin/assets/css/currency.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.css

admin/assets/css/dashboard.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		dashboard.css

admin/assets/css/health_data.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.css

admin/assets/css/health_data_sets.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.css

admin/assets/css/help_document.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.css

admin/assets/css/help_documents.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.css

admin/assets/css/intervention.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.css

admin/assets/css/interventions.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.css

admin/assets/css/scaling_factor.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.css

admin/assets/css/scaling_factors.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.css

admin/assets/css/service_provider.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.css

admin/assets/css/service_providers.css

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.css

admin/assets/js/admin.js

@@ -3,7 +3,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		admin.js

admin/controller.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		controller.php

admin/controllers/ajax.json.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		ajax.json.php

admin/controllers/causerisk.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php

admin/controllers/causesrisks.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerCausesrisks extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Causesrisks');
 			// get the data to export

admin/controllers/combinedresults.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		combinedresults.php

admin/controllers/companies.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerCompanies extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Companies');
 			// get the data to export
@@ -126,7 +126,7 @@ class CostbenefitprojectionControllerCompanies extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// convert to string
 			$ids = implode('_', $pks);
 			$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=combinedresults&cid='.$ids, false));

admin/controllers/company.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		company.php

admin/controllers/companyresults.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companyresults.php

admin/controllers/costbenefitprojection.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php

admin/controllers/countries.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		countries.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerCountries extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Countries');
 			// get the data to export

admin/controllers/country.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		country.php

admin/controllers/currencies.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currencies.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerCurrencies extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Currencies');
 			// get the data to export

admin/controllers/currency.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		currency.php

admin/controllers/health_data.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php

admin/controllers/health_data_sets.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerHealth_data_sets extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Health_data_sets');
 			// get the data to export
@@ -113,4 +113,47 @@ class CostbenefitprojectionControllerHealth_data_sets extends JControllerAdmin
 		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=health_data_sets', false), $message, 'error');
 		return;
 	}
+
+
+	/**
+	 * get a bulk export of health_data_sets
+	 */
+	public function getBulkExport()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+		// check if export is allowed for this user.
+		$user = JFactory::getUser();
+		$status = 'error';
+		if ($user->authorise('health_data.bulk_export', 'com_costbenefitprojection'))
+		{
+			// Get the model
+			$model = $this->getModel('Health_data_sets');
+			// get the data
+			if (($data = $model->getBulkExport()) !== false)
+			{
+				// now set the data to the spreadsheet
+				$date = JFactory::getDate();
+				try
+				{
+					CostbenefitprojectionHelper::xls($data, 'Health_data_sets_' . $date->format('jS_F_Y'), 'Health_data_sets exported (' . $date->format('jS F, Y') . ')', 'health_data_sets');
+				}
+				catch (\RuntimeException $e)
+				{
+					jexit('Error: ' . $e->getMessage());
+				}
+			}
+			else
+			{
+				// Set error message
+				$message = JText::_('COM_COSTBENEFITPROJECTION_BULK_EXPORT_OF_HEALTH_DATA_SETS_FAILED_SHOULD_THIS_ISSUE_CONTINUE_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR');
+			}
+		}
+		else
+		{
+			// Set error message
+			$message = JText::_('COM_COSTBENEFITPROJECTION_YOU_DO_NOT_HAVE_PERMISSION_TO_DO_A_BULK_EXPORT_OF_HEALTH_DATA_SETS');
+		}
+		$this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=health_data_sets', false), $message, $status);
+	}
 }

admin/controllers/help.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		help_documents.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerHelp_documents extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Help_documents');
 			// get the data to export

admin/controllers/import.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		import.php

admin/controllers/import_health_data_sets.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		import_health_data_sets.php

admin/controllers/intervention.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		intervention.php

admin/controllers/interventions.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerInterventions extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Interventions');
 			// get the data to export

admin/controllers/scaling_factor.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factor.php

admin/controllers/scaling_factors.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerScaling_factors extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Scaling_factors');
 			// get the data to export

admin/controllers/service_provider.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_provider.php

admin/controllers/service_providers.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers.php
@@ -63,7 +63,7 @@ class CostbenefitprojectionControllerService_providers extends JControllerAdmin
 			$input = JFactory::getApplication()->input;
 			$pks = $input->post->get('cid', array(), 'array');
 			// Sanitize the input
-			ArrayHelper::toInteger($pks);
+			$pks = ArrayHelper::toInteger($pks);
 			// Get the model
 			$model = $this->getModel('Service_providers');
 			// get the data to export

admin/costbenefitprojection.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
@@ -19,6 +19,7 @@
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+
 JHtml::_('behavior.tabstate');
 
 // Access check.

admin/helpers/costbenefitprojection.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		costbenefitprojection.php
@@ -21,6 +21,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 use Joomla\CMS\Language\Language;
+use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 use PhpOffice\PhpSpreadsheet\IOFactory;
@@ -982,9 +983,33 @@ abstract class CostbenefitprojectionHelper
 
 	/**
 	 * Greate user and update given table
+	 *
+	 * @param   array  $credentials  Array('name' => string, 'username' => string, 'email' => string, 'password' => string, 'password2' => string)
+	 * @param   int    $autologin
+	 * @param   array  $params  Array('useractivation' => int, 'sendpassword' => int, 'allowUserRegistration' => int)
+	 * @param   array  $mode 1 = Site Registrations; 0 = Admin Registration; 2 = Custom Helper Method Called registerUser
+	 *
+	 * @return  int|Error  User ID on success, or an error.
 	 */
-	public static function createUser($new)
+	public static function createUser($credentials, $autologin = 0,
+		$params = array(
+			'useractivation' => 0, 'sendpassword' => 1
+		), $mode = 1
+	)
 	{
+		// Override mode
+		if ($mode == 2 && method_exists(__CLASS__, 'registerUser'))
+		{
+			// Update params
+			$params['autologin'] = $autologin;
+			// Now Register User
+			return self::registerUser($credentials, $params);
+		}
+		elseif ($mode == 2)
+		{
+			// Fallback to Site Registrations
+			$mode = 1;
+		}
 		// load the user component language files if there is an error.
 		$lang = JFactory::getLanguage();
 		$extension = 'com_users';
@@ -992,53 +1017,113 @@ abstract class CostbenefitprojectionHelper
 		$language_tag = 'en-GB';
 		$reload = true;
 		$lang->load($extension, $base_dir, $language_tag, $reload);
-		// load the user regestration model
+		// Load the correct user model.
-		$model = self::getModel('registration', JPATH_ROOT. '/components/com_users', 'Users');
+		if ($mode == 1) // 1 = Site Registrations
-		// make sure no activation is needed
-		$useractivation = self::setParams('com_users','useractivation',0);
-		// make sure password is send
-		$sendpassword = self::setParams('com_users','sendpassword',1);
-		// Check if password was set
-		if (isset($new['password']) && isset($new['password2']) && self::checkString($new['password']) && self::checkString($new['password2']))
 		{
-			// Use the users passwords
+			// Load the user site-registration model
-			$password = $new['password'];
+			$model = self::getModel('registration', $base_dir . '/components/' . $extension, 'Users');
-			$password2 = $new['password2'];
 		}
-		else
+		else // 0 = Admin Registration
 		{
-			// Set random password
+			// Load the backend-user model
-			$password = self::randomkey(8);
+			$model = self::getModel('user', JPATH_ADMINISTRATOR . '/components/' . $extension, 'Users');
-			$password2 = $password;
 		}
-		// set username if not set
+		// Check if we have params/config
-		if (!isset($new['username']) || !self::checkString($new['username']))
+		if (self::checkArray($params))
 		{
-			$new['username'] = self::safeString($new['name']);
+			// Make changes to user config
+			foreach ($params as $param => $set)
+			{
+				// If you know of a better path, let me know
+				$params[$param] = self::setParams($extension, $param, $set);
+			}
 		}
-		// linup new user data
+		// Set username to email if not set
+		if (!isset($credentials['username']) || !self::checkString($credentials['username']))
+		{
+			$credentials['username'] = $credentials['email'];
+		}
+		// Lineup new user data array
 		$data = array(
-			'username' => $new['username'],
+			'username' => $credentials['username'],
-			'name' => $new['name'],
+			'name' => $credentials['name'],
-			'email1' => $new['email'],
-			'password1' => $password, // First password field
-			'password2' => $password2, // Confirm password field
 			'block' => 0 );
-		// register the new user
+		// Added details based on mode
-		$userId = $model->register($data);
+		if ($mode == 1) // 1 = Site-registration mode
-		// set activation back to default
+		{
-		self::setParams('com_users','useractivation',$useractivation);
+			$data['email1'] = $credentials['email'];
-		// set send password back to default
+		}
-		self::setParams('com_users','sendpassword',$sendpassword);
+		else // 0 = Admin-registration mode
+		{
+			$data['email'] = $credentials['email'];
+			$data['registerDate'] = JFactory::getDate()->toSql();
+		}
+		// Check if password was set
+		if ($mode == 1 && (!isset($credentials['password']) || !isset($credentials['password2']) || !self::checkString($credentials['password']) || !self::checkString($credentials['password2'])))
+		{
+			// Set random password when empty password was submitted,
+			// when using the 1 = site-registration mode
+			$credentials['password'] = self::randomkey(8);
+			$credentials['password2'] = $credentials['password'];
+		}
+		// Now Add password if set
+		if (isset($credentials['password']) && isset($credentials['password2'])  && self::checkString($credentials['password']) && self::checkString($credentials['password2']))
+		{
+			if ($mode == 1) // 1 = Site-registration mode
+			{
+				$data['password1'] = $credentials['password'];
+			}
+			else // 0 = Admin-registration mode
+			{
+				$data['password'] = $credentials['password'];
+			}
+			$data['password2'] = $credentials['password2'];
+		}
+		// Load the group/s value if set, only for Admin Registration ($mode == 0)
+		if ($mode == 0 && isset($credentials['groups']) && self::checkArray($credentials['groups']))
+		{
+			$data['groups'] = $credentials['groups'];
+		}
+		// Create the new user
+		if ($mode == 1) // 1 = Site-registration mode
+		{
+			$userId = $model->register($data);
+		}
+		else // 0 = Admin-registration mode
+		{
+			$model->save($data);
+			$userId = $model->getState('user.id', 0);
+		}
+		// Check if we have params
+		if (self::checkArray($params))
+		{
+			// Change user params/config back
+			foreach ($params as $param => $set)
+			{
+				// If you know of a better path, let me know
+				self::setParams($extension, $param, $set);
+			}
+		}
 		// if user is created
 		if ($userId > 0)
 		{
+			// Auto Login if Needed
+			if ($autologin && isset($credentials['password']))
+			{
+				// Try to login
+				try{
+					JFactory::getApplication()->login($credentials);
+				} catch (Exception $exception){
+					// Do noting for now, may want to set redirect.
+				}
+			}
+			// Return ID
 			return $userId;
 		}
 		return $model->getError();
 	}
 
-	protected static function setParams($component,$target,$value)
+	public static function setParams($component,$target,$value)
 	{
 		// Get the params and set the new values
 		$params = JComponentHelper::getParams($component);
@@ -1056,7 +1141,7 @@ abstract class CostbenefitprojectionHelper
 			
 			// Execute the query
 			$db->setQuery($query);
-			$db->query();
+			$db->execute();
 		}
 		return $was;
 	}
@@ -1083,21 +1168,17 @@ abstract class CostbenefitprojectionHelper
 			$password2 = $new['password2'];
 		}
 		// set username
-		if (isset($new['username']) && self::checkString($new['username']))
+		if (!isset($new['username']) || !self::checkString($new['username']))
 		{
-			$new['username'] = self::safeString($new['username']);
+			$new['username'] = $new['email'];
 		}
-		else
+		// lineup update user data
-		{
-			$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
+			'password' => $password, // First password field
 			'password2' => $password2, // Confirm password field
 			'block' => 0 );
 		// set groups if found
@@ -1258,6 +1339,8 @@ abstract class CostbenefitprojectionHelper
 			->setLastModifiedBy($modified)
 			->setTitle($title)
 			->setSubject($subjectTab);
+		// The file type
+		$file_type = 'Xls';
 		// set description
 		if ($description)
 		{
@@ -1297,21 +1380,46 @@ abstract class CostbenefitprojectionHelper
 		));
 
 		// Add some data
-		if (self::checkArray($rows))
+		if (($size = self::checkArray($rows)) !== false)
 		{
 			$i = 1;
-			foreach ($rows as $array){
+
+			// Based on data size we adapt the behaviour.
+			$xls_mode = 1;
+			if ($size > 3000)
+			{
+				$xls_mode = 3;
+				$file_type = 'Csv';
+			}
+			elseif ($size > 2000)
+			{
+				$xls_mode = 2;
+			}
+
+			// Set active sheet and get it.
+			$active_sheet = $spreadsheet->setActiveSheetIndex(0);
+			foreach ($rows as $array)
+			{
 				$a = 'A';
-				foreach ($array as $value){
+				foreach ($array as $value)
-					$spreadsheet->setActiveSheetIndex(0)->setCellValue($a.$i, $value);
+				{
-					if ($i == 1){
+					$active_sheet->setCellValue($a.$i, $value);
-						$spreadsheet->getActiveSheet()->getColumnDimension($a)->setAutoSize(true);
+					if ($xls_mode != 3)
-						$spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($headerStyles);
+					{
-						$spreadsheet->getActiveSheet()->getStyle($a.$i)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+						if ($i == 1)
-					} elseif ($a === 'A'){
+						{
-						$spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($sideStyles);
+							$active_sheet->getColumnDimension($a)->setAutoSize(true);
-					} else {
+							$active_sheet->getStyle($a.$i)->applyFromArray($headerStyles);
-						$spreadsheet->getActiveSheet()->getStyle($a.$i)->applyFromArray($normalStyles);
+							$active_sheet->getStyle($a.$i)->getAlignment()->setHorizontal(PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+						}
+						elseif ($a === 'A')
+						{
+							$active_sheet->getStyle($a.$i)->applyFromArray($sideStyles);
+						}
+						elseif ($xls_mode == 1)
+						{
+							$active_sheet->getStyle($a.$i)->applyFromArray($normalStyles);
+						}
 					}
 					$a++;
 				}
@@ -1331,7 +1439,7 @@ abstract class CostbenefitprojectionHelper
 
 		// Redirect output to a client's web browser (Excel5)
 		header('Content-Type: application/vnd.ms-excel');
-		header('Content-Disposition: attachment;filename="'.$fileName.'.xls"');
+		header('Content-Disposition: attachment;filename="' . $fileName . '.' . strtolower($file_type) .'"');
 		header('Cache-Control: max-age=0');
 		// If you're serving to IE 9, then the following may be needed
 		header('Cache-Control: max-age=1');
@@ -1342,7 +1450,7 @@ abstract class CostbenefitprojectionHelper
 		header ('Cache-Control: cache, must-revalidate'); // HTTP/1.1
 		header ('Pragma: public'); // HTTP/1.0
 
-		$writer = IOFactory::createWriter($spreadsheet, 'Xls');
+		$writer = IOFactory::createWriter($spreadsheet, $file_type);
 		$writer->save('php://output');
 		jexit();
 	}

admin/helpers/headercheck.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		headercheck.php

admin/helpers/html/batch_.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		batch_.php

admin/helpers/sum.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		sum.php

admin/helpers/sumcombine.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		sumcombine.php

admin/language/en-GB/en-GB.com_costbenefitprojection.ini

@@ -14,6 +14,9 @@ COM_COSTBENEFITPROJECTION_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING="A few open i
 COM_COSTBENEFITPROJECTION_BACK="Back"
 COM_COSTBENEFITPROJECTION_BASIC_METHOD="Basic Method"
 COM_COSTBENEFITPROJECTION_BENEFIT="Benefit"
+COM_COSTBENEFITPROJECTION_BETA_RELEASE="Beta Release"
+COM_COSTBENEFITPROJECTION_BULK_EXPORT="Bulk Export"
+COM_COSTBENEFITPROJECTION_BULK_EXPORT_OF_HEALTH_DATA_SETS_FAILED_SHOULD_THIS_ISSUE_CONTINUE_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR="Bulk export of health_data_sets failed should this issue continue, please inform your system administrator."
 COM_COSTBENEFITPROJECTION_CALCULATED_COSTS_IN_DETAIL="Calculated Costs in Detail"
 COM_COSTBENEFITPROJECTION_CAUSERISK="Cause/Risk"
 COM_COSTBENEFITPROJECTION_CAUSERISK_ALIAS="Alias"
@@ -97,6 +100,8 @@ COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_CHECKED_IN_1="%d Cause/Risk succes
 COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_CHECKED_IN_MORE="%d Causes/Risks successfully checked in."
 COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_DELETED="%s Causes/Risks deleted."
 COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_DELETED_1="%s Cause/Risk deleted."
+COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_FAILED_PUBLISHING="%s Causes/Risks failed publishing."
+COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_FAILED_PUBLISHING_1="%s Cause/Risk failed publishing."
 COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_FEATURED="%s Causes/Risks featured."
 COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_FEATURED_1="%s Cause/Risk featured."
 COM_COSTBENEFITPROJECTION_CAUSESRISKS_N_ITEMS_PUBLISHED="%s Causes/Risks published."
@@ -183,6 +188,8 @@ COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_CHECKED_IN_1="%d Company successfull
 COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_CHECKED_IN_MORE="%d Companies successfully checked in."
 COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_DELETED="%s Companies deleted."
 COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_DELETED_1="%s Company deleted."
+COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_FAILED_PUBLISHING="%s Companies failed publishing."
+COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_FAILED_PUBLISHING_1="%s Company failed publishing."
 COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_FEATURED="%s Companies featured."
 COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_FEATURED_1="%s Company featured."
 COM_COSTBENEFITPROJECTION_COMPANIES_N_ITEMS_PUBLISHED="%s Companies published."
@@ -497,6 +504,8 @@ COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_CHECKED_IN_1="%d Country successfull
 COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_CHECKED_IN_MORE="%d Countries successfully checked in."
 COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_DELETED="%s Countries deleted."
 COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_DELETED_1="%s Country deleted."
+COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_FAILED_PUBLISHING="%s Countries failed publishing."
+COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_FAILED_PUBLISHING_1="%s Country failed publishing."
 COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_FEATURED="%s Countries featured."
 COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_FEATURED_1="%s Country featured."
 COM_COSTBENEFITPROJECTION_COUNTRIES_N_ITEMS_PUBLISHED="%s Countries published."
@@ -712,6 +721,8 @@ COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_CHECKED_IN_1="%d Currency successfu
 COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_CHECKED_IN_MORE="%d Currencies successfully checked in."
 COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_DELETED="%s Currencies deleted."
 COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_DELETED_1="%s Currency deleted."
+COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_FAILED_PUBLISHING="%s Currencies failed publishing."
+COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_FAILED_PUBLISHING_1="%s Currency failed publishing."
 COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_FEATURED="%s Currencies featured."
 COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_FEATURED_1="%s Currency featured."
 COM_COSTBENEFITPROJECTION_CURRENCIES_N_ITEMS_PUBLISHED="%s Currencies published."
@@ -819,6 +830,7 @@ COM_COSTBENEFITPROJECTION_DAYS_LOST_MORTALITY="Days Lost Mortality"
 COM_COSTBENEFITPROJECTION_DAYS_LOST_PRESENTEEISM_DUE_TO_MORBIDITY="Days Lost Presenteeism (due to morbidity)"
 COM_COSTBENEFITPROJECTION_DEBUG_MENU="Debug Menu"
 COM_COSTBENEFITPROJECTION_DISEASERISK_FACTOR="Disease/Risk Factor"
+COM_COSTBENEFITPROJECTION_DOWNLOAD="download"
 COM_COSTBENEFITPROJECTION_DURATION_S_YEAR="Duration: %s year"
 COM_COSTBENEFITPROJECTION_DURATION_S_YEARS="Duration: %s years"
 COM_COSTBENEFITPROJECTION_EDIT="Edit"
@@ -837,6 +849,8 @@ COM_COSTBENEFITPROJECTION_GENDER_ID="Gender id"
 COM_COSTBENEFITPROJECTION_GENDER_NAME="Gender name"
 COM_COSTBENEFITPROJECTION_HEALTH_DATA="Health Data"
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_AGE_LABEL="Age Group"
+COM_COSTBENEFITPROJECTION_HEALTH_DATA_BULK_EXPORT_BUTTON_ACCESS="Health Data Bulk Export Button Access"
+COM_COSTBENEFITPROJECTION_HEALTH_DATA_BULK_EXPORT_BUTTON_ACCESS_DESC="Allows the users in this group to access the bulk export button."
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_CAUSERISK="Causerisk"
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_CAUSERISK_LABEL="Cause/Risk"
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_COUNTRY="Country"
@@ -930,6 +944,8 @@ COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_CHECKED_IN_1="%d Health Data
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_CHECKED_IN_MORE="%d Health Data Sets successfully checked in."
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_DELETED="%s Health Data Sets deleted."
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_DELETED_1="%s Health Data deleted."
+COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_FAILED_PUBLISHING="%s Health Data Sets failed publishing."
+COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_FAILED_PUBLISHING_1="%s Health Data failed publishing."
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_FEATURED="%s Health Data Sets featured."
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_FEATURED_1="%s Health Data featured."
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_N_ITEMS_PUBLISHED="%s Health Data Sets published."
@@ -1000,6 +1016,8 @@ COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_CHECKED_IN_1="%d Help Document
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_CHECKED_IN_MORE="%d Help Documents successfully checked in."
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_DELETED="%s Help Documents deleted."
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_DELETED_1="%s Help Document deleted."
+COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_FAILED_PUBLISHING="%s Help Documents failed publishing."
+COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_FAILED_PUBLISHING_1="%s Help Document failed publishing."
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_FEATURED="%s Help Documents featured."
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_FEATURED_1="%s Help Document featured."
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_N_ITEMS_PUBLISHED="%s Help Documents published."
@@ -1046,7 +1064,6 @@ COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_NEW="A New Help Document"
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_NOT_REQUIRED="Not Required"
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ORDERING_LABEL="Ordering"
-COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_PERMISSION="Permissions"
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_PUBLISHING="Publishing"
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Help Document to customise the alias."
 COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_SELECT_AN_OPTION="Select an option"
@@ -1158,6 +1175,8 @@ COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_CHECKED_IN_1="%d Intervention su
 COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_CHECKED_IN_MORE="%d Interventions successfully checked in."
 COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_DELETED="%s Interventions deleted."
 COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_DELETED_1="%s Intervention deleted."
+COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_FAILED_PUBLISHING="%s Interventions failed publishing."
+COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_FAILED_PUBLISHING_1="%s Intervention failed publishing."
 COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_FEATURED="%s Interventions featured."
 COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_FEATURED_1="%s Intervention featured."
 COM_COSTBENEFITPROJECTION_INTERVENTIONS_N_ITEMS_PUBLISHED="%s Interventions published."
@@ -1243,9 +1262,12 @@ COM_COSTBENEFITPROJECTION_INTERVENTION_TYPE_DESCRIPTION="Select the intervention
 COM_COSTBENEFITPROJECTION_INTERVENTION_TYPE_LABEL="Type"
 COM_COSTBENEFITPROJECTION_INTERVENTION_VERSION_DESC="A count of the number of times this Intervention has been revised."
 COM_COSTBENEFITPROJECTION_INTERVENTION_VERSION_LABEL="Version"
+COM_COSTBENEFITPROJECTION_ISSUE="issue"
 COM_COSTBENEFITPROJECTION_KEEP_ORIGINAL_ACCESS="- Keep Original Access -"
 COM_COSTBENEFITPROJECTION_KEEP_ORIGINAL_CATEGORY="- Keep Original Category -"
 COM_COSTBENEFITPROJECTION_KEEP_ORIGINAL_STATE="- Keep Original State -"
+COM_COSTBENEFITPROJECTION_LAST_FEW_RELEASES_FROM_GITHUB_IS_LOADING="Last few releases from Github is loading"
+COM_COSTBENEFITPROJECTION_LATEST_RELEASE="Latest Release"
 COM_COSTBENEFITPROJECTION_LICENSE="License"
 COM_COSTBENEFITPROJECTION_LOCATION_NAME="Location name"
 COM_COSTBENEFITPROJECTION_MAIN_MENU="Main Menu"
@@ -1269,7 +1291,12 @@ COM_COSTBENEFITPROJECTION_NO_DISEASERISK_SELECTED="No Disease/Risk Selected"
 COM_COSTBENEFITPROJECTION_NO_INTERVENTION_SELECTED="No Intervention Selected"
 COM_COSTBENEFITPROJECTION_NUMBER_OF_WORK_DAYS_LOST="Number of work days lost"
 COM_COSTBENEFITPROJECTION_ONLY_USE_THE_ADVANCED_IMPORT_WHEN_IMPORTING_THE_CSV_FILES_FROM_HTTPGHDXHEALTHDATAORG="Only use the advanced import when importing the CSV files from http://ghdx.healthdata.org"
-COM_COSTBENEFITPROJECTION_OPENED_BY="opened by"
+COM_COSTBENEFITPROJECTION_ON_GITHUB="on Github"
+COM_COSTBENEFITPROJECTION_OPEN="Open"
+COM_COSTBENEFITPROJECTION_OPENED="opened"
+COM_COSTBENEFITPROJECTION_OPENED_THIS="opened this"
+COM_COSTBENEFITPROJECTION_OPEN_ON_GITHUB="Open on Github"
+COM_COSTBENEFITPROJECTION_OUT_OF_DATE="Out of date"
 COM_COSTBENEFITPROJECTION_PERCENT_OF_BESTIMATED_BURDENB_BEING_TARGETED_BY_THIS_DISEASERISK_SELECTION="Percent of <b>Estimated Burden</b> being targeted by this Disease/Risk selection"
 COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_COST="Percent of Total Cost"
 COM_COSTBENEFITPROJECTION_PERCENT_OF_TOTAL_DAYS_LOST="Percent of Total Days Lost"
@@ -1280,6 +1307,7 @@ COM_COSTBENEFITPROJECTION_PRESENTEEISM_MORBIDITY="Presenteeism (morbidity)"
 COM_COSTBENEFITPROJECTION_PUBLISHED="Published"
 COM_COSTBENEFITPROJECTION_REDUCTION_IN_MORBIDITY_COSTS="Reduction in Morbidity Costs"
 COM_COSTBENEFITPROJECTION_REDUCTION_IN_MORTALITY_COST="Reduction in Mortality Cost"
+COM_COSTBENEFITPROJECTION_RELEASED_THIS="released this"
 COM_COSTBENEFITPROJECTION_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on Github"
 COM_COSTBENEFITPROJECTION_RESULTS_MENU="Results Menu"
 COM_COSTBENEFITPROJECTION_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github"
@@ -1323,6 +1351,8 @@ COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_CHECKED_IN_1="%d Scaling Facto
 COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_CHECKED_IN_MORE="%d Scaling Factors successfully checked in."
 COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_DELETED="%s Scaling Factors deleted."
 COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_DELETED_1="%s Scaling Factor deleted."
+COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_FAILED_PUBLISHING="%s Scaling Factors failed publishing."
+COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_FAILED_PUBLISHING_1="%s Scaling Factor failed publishing."
 COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_FEATURED="%s Scaling Factors featured."
 COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_FEATURED_1="%s Scaling Factor featured."
 COM_COSTBENEFITPROJECTION_SCALING_FACTORS_N_ITEMS_PUBLISHED="%s Scaling Factors published."
@@ -1436,6 +1466,8 @@ COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_CHECKED_IN_1="%d Service Pro
 COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_CHECKED_IN_MORE="%d Service Providers successfully checked in."
 COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_DELETED="%s Service Providers deleted."
 COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_DELETED_1="%s Service Provider deleted."
+COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_FAILED_PUBLISHING="%s Service Providers failed publishing."
+COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_FAILED_PUBLISHING_1="%s Service Provider failed publishing."
 COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_FEATURED="%s Service Providers featured."
 COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_FEATURED_1="%s Service Provider featured."
 COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_N_ITEMS_PUBLISHED="%s Service Providers published."
@@ -1511,7 +1543,6 @@ COM_COSTBENEFITPROJECTION_TABLES_QUICK_LINKS="Tables ›› Quick Links"
 COM_COSTBENEFITPROJECTION_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading"
 COM_COSTBENEFITPROJECTION_THE_README_IS_LOADING="The readme is loading"
 COM_COSTBENEFITPROJECTION_THE_STATISTICAL_DATA_COULD_NOT_BE_RETURNED_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR="The statistical data could not be returned. Please contact your system administrator."
-COM_COSTBENEFITPROJECTION_THE_WIKI_IS_LOADING="The wiki is loading"
 COM_COSTBENEFITPROJECTION_TOTAL="Total"
 COM_COSTBENEFITPROJECTION_TOTAL_COST="Total Cost"
 COM_COSTBENEFITPROJECTION_TOTAL_COSTS="Total Costs"
@@ -1520,6 +1551,7 @@ COM_COSTBENEFITPROJECTION_TOTAL_COST_PER_DISEASERISK_FACTOR="Total Cost Per Dise
 COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST="Total Days Lost"
 COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_AND_CONTRIBUTION_OF_MORBIDITY_MORTALITY_AND_RISK_FACTORS="Total Days Lost and Contribution of Morbidity, Mortality and Risk Factors"
 COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR="Total Days Lost Per Disease/Risk Factor"
+COM_COSTBENEFITPROJECTION_TOTAL_DOWNLOADS="total downloads"
 COM_COSTBENEFITPROJECTION_TOTAL_EMPLOYEESBR_IN_RELATION_TO_THIS_NUMBER="total employees<br />in relation to this number."
 COM_COSTBENEFITPROJECTION_TOTAL_EMPLOYEESBR_IN_RELATION_TO_THIS_TOTAL="total employees<br />in relation to this total."
 COM_COSTBENEFITPROJECTION_TRASHED="Trashed"
@@ -1533,6 +1565,7 @@ COM_COSTBENEFITPROJECTION_TYPE_INTERVENTION="Intervention"
 COM_COSTBENEFITPROJECTION_TYPE_SCALING_FACTOR="Scaling Factor"
 COM_COSTBENEFITPROJECTION_TYPE_SERVICE_PROVIDER="Service Provider"
 COM_COSTBENEFITPROJECTION_UNAVAILABLE_AT_THIS_TIME="Unavailable at this time."
+COM_COSTBENEFITPROJECTION_UP_TO_DATE="Up to date"
 COM_COSTBENEFITPROJECTION_USER_COUNTRY_GROUP="User Country Group"
 COM_COSTBENEFITPROJECTION_USER_MEMBER_GROUP="User Member Group"
 COM_COSTBENEFITPROJECTION_USER_SERVICE_PROVIDER_GROUP="User Service Provider Group"
@@ -1540,6 +1573,7 @@ COM_COSTBENEFITPROJECTION_USE_BATCH="Use Batch"
 COM_COSTBENEFITPROJECTION_USE_BATCH_DESC="Allows users in this group to use batch copy/update method."
 COM_COSTBENEFITPROJECTION_VERSION="Version"
 COM_COSTBENEFITPROJECTION_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github"
+COM_COSTBENEFITPROJECTION_VIEW_MORE_RELEASES_ON_GITHUB="View more releases on Github"
 COM_COSTBENEFITPROJECTION_WARNING="Warning"
 COM_COSTBENEFITPROJECTION_WEBSITE="Website"
 COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST="Work Days Lost"
@@ -1547,5 +1581,6 @@ COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST_PERCENT="Work Days Lost Percent"
 COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST_SUMMARY="Work Days Lost Summary"
 COM_COSTBENEFITPROJECTION_WORK_DAY_LOST_PERCENT="Work Day Lost Percent"
 COM_COSTBENEFITPROJECTION_YEAR="Year"
+COM_COSTBENEFITPROJECTION_YOU_DO_NOT_HAVE_PERMISSION_TO_DO_A_BULK_EXPORT_OF_HEALTH_DATA_SETS="You do not have permission to do a bulk export of health_data_sets."
 COM_COSTBENEFITPROJECTION__OF_ALL_HEALTHCARE_COSTS_CAUSED_BY_THE_CAUSERISK_FACTOR="% of all healthcare costs caused by the cause/risk factor"
 COM_COSTBENEFITPROJECTION__OF_WORK_DAYS_LOST_DUE_TO_THE_CAUSERISK_FACTOR="% of work days lost due to the cause/risk factor"

admin/language/en-GB/en-GB.com_costbenefitprojection.sys.ini

@@ -152,6 +152,8 @@ COM_COSTBENEFITPROJECTION_EDIT_VERSIONS="Edit Version"
 COM_COSTBENEFITPROJECTION_EDIT_VERSIONS_DESC="Allows users in this group to edit versions."
 COM_COSTBENEFITPROJECTION_EXPORT_DATA="Export Data"
 COM_COSTBENEFITPROJECTION_EXPORT_DATA_DESC="Allows users in this group to export data."
+COM_COSTBENEFITPROJECTION_HEALTH_DATA_BULK_EXPORT_BUTTON_ACCESS="Health Data Bulk Export Button Access"
+COM_COSTBENEFITPROJECTION_HEALTH_DATA_BULK_EXPORT_BUTTON_ACCESS_DESC="Allows the users in this group to access the bulk export button."
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_ACCESS="Health Data Sets Access"
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_ACCESS_DESC="Allows the users in this group to access access health data sets"
 COM_COSTBENEFITPROJECTION_HEALTH_DATA_SETS_BATCH_USE="Health Data Sets Batch Use"

admin/layouts/batchselection.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		batchselection.php

admin/layouts/causerisk/details_above.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php

admin/layouts/causerisk/details_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_fullwidth.php

admin/layouts/causerisk/details_left.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php

admin/layouts/causerisk/details_right.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php

admin/layouts/causerisk/publishing.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
@@ -34,6 +34,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'title',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/causerisk/publlshing.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php

admin/layouts/company/age_groups_percentages_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_fullwidth.php

admin/layouts/company/age_groups_percentages_left.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php

admin/layouts/company/age_groups_percentages_right.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php

admin/layouts/company/causerisk_selection_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php

admin/layouts/company/details_above.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php

admin/layouts/company/details_left.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php

admin/layouts/company/details_right.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php

admin/layouts/company/details_under.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_under.php

admin/layouts/company/interventions_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
@@ -117,25 +117,25 @@ $can = CostbenefitprojectionHelper::getActions('intervention');
 		<td>
 			<?php echo $displayData->escape($item->duration); ?>
 		</td>
-		<?php if ($item->published == 1):?>
+		<?php if ($item->published == 1): ?>
 			<td class="center"  data-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 0):?>
+		<?php elseif ($item->published == 0): ?>
 			<td class="center"  data-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 2):?>
+		<?php elseif ($item->published == 2): ?>
 			<td class="center"  data-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == -2):?>
+		<?php elseif ($item->published == -2): ?>
 			<td class="center"  data-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED'); ?>

admin/layouts/company/publishing.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
@@ -34,6 +34,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'title',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/company/publlshing.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php

admin/layouts/company/scaling_factors_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		scaling_factors_fullwidth.php
@@ -122,25 +122,25 @@ else
 		<td>
 			<?php echo $displayData->escape($item->presenteeism_scaling_factor_females); ?>
 		</td>
-		<?php if ($item->published == 1):?>
+		<?php if ($item->published == 1): ?>
 			<td class="center"  data-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 0):?>
+		<?php elseif ($item->published == 0): ?>
 			<td class="center"  data-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 2):?>
+		<?php elseif ($item->published == 2): ?>
 			<td class="center"  data-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == -2):?>
+		<?php elseif ($item->published == -2): ?>
 			<td class="center"  data-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED'); ?>

admin/layouts/country/age_groups_percentages_left.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_left.php

admin/layouts/country/age_groups_percentages_right.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		age_groups_percentages_right.php

admin/layouts/country/causerisk_selection_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		causerisk_selection_fullwidth.php

admin/layouts/country/companies_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		companies_fullwidth.php
@@ -132,25 +132,25 @@ $can = CostbenefitprojectionHelper::getActions('company');
 		<td>
 			<?php echo JText::_($item->per); ?>
 		</td>
-		<?php if ($item->published == 1):?>
+		<?php if ($item->published == 1): ?>
 			<td class="center"  data-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 0):?>
+		<?php elseif ($item->published == 0): ?>
 			<td class="center"  data-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 2):?>
+		<?php elseif ($item->published == 2): ?>
 			<td class="center"  data-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == -2):?>
+		<?php elseif ($item->published == -2): ?>
 			<td class="center"  data-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED'); ?>

admin/layouts/country/details_above.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php

admin/layouts/country/details_left.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php

admin/layouts/country/details_right.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php

admin/layouts/country/health_data_totals_left.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_totals_left.php

admin/layouts/country/health_data_totals_right.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		health_data_totals_right.php

admin/layouts/country/interventions_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		interventions_fullwidth.php
@@ -121,25 +121,25 @@ $can = CostbenefitprojectionHelper::getActions('intervention');
 		<td>
 			<?php echo $displayData->escape($item->duration); ?>
 		</td>
-		<?php if ($item->published == 1):?>
+		<?php if ($item->published == 1): ?>
 			<td class="center"  data-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 0):?>
+		<?php elseif ($item->published == 0): ?>
 			<td class="center"  data-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 2):?>
+		<?php elseif ($item->published == 2): ?>
 			<td class="center"  data-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == -2):?>
+		<?php elseif ($item->published == -2): ?>
 			<td class="center"  data-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED'); ?>

admin/layouts/country/public_details_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		public_details_fullwidth.php

admin/layouts/country/publishing.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
@@ -34,6 +34,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'title',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/country/publlshing.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php

admin/layouts/country/service_providers_fullwidth.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		service_providers_fullwidth.php
@@ -117,25 +117,25 @@ $can = CostbenefitprojectionHelper::getActions('service_provider');
 		<td>
 			<?php echo $displayData->escape($item->publicaddress); ?>
 		</td>
-		<?php if ($item->published == 1):?>
+		<?php if ($item->published == 1): ?>
 			<td class="center"  data-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_PUBLISHED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 0):?>
+		<?php elseif ($item->published == 0): ?>
 			<td class="center"  data-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_INACTIVE'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == 2):?>
+		<?php elseif ($item->published == 2): ?>
 			<td class="center"  data-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_ARCHIVED'); ?>
 				</span>
 			</td>
-		<?php elseif ($item->published == -2):?>
+		<?php elseif ($item->published == -2): ?>
 			<td class="center"  data-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED');  ?>">
 					<?php echo JText::_('COM_COSTBENEFITPROJECTION_TRASHED'); ?>

admin/layouts/currency/details_above.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php

admin/layouts/currency/details_left.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_left.php

admin/layouts/currency/details_right.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_right.php

admin/layouts/currency/publishing.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publishing.php
@@ -34,6 +34,7 @@ $fields_tab_layout = 'fields_' . $layout_path_array[1];
 
 // get the fields
 $fields = $displayData->get($fields_tab_layout) ?: array(
+	'title',
 	'created',
 	'created_by',
 	'modified',

admin/layouts/currency/publlshing.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		publlshing.php

admin/layouts/databreakdownmalefemale.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		databreakdownmalefemale.php

admin/layouts/health_data/details_above.php

@@ -4,7 +4,7 @@
 /-------------------------------------------------------------------------------------------------------/
 
 	@version		3.4.x
-	@build			30th May, 2020
+	@build			6th January, 2021
 	@created		15th June, 2012
 	@package		Cost Benefit Projection
 	@subpackage		details_above.php