Made fix to database import values, and fixed error on dashboard of component

README.md

@@ -26,7 +26,7 @@ max_input_vars = 5000
 + *Version*: 3.4.3
 + *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*: **91311**
++ *Line count*: **91317**
 + *File count*: **584**
 + *Folder count*: **103**
 

admin/README.txt

@@ -26,7 +26,7 @@ max_input_vars = 5000
 + *Version*: 3.4.3
 + *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*: **91311**
++ *Line count*: **91317**
 + *File count*: **584**
 + *Folder count*: **103**
 

admin/assets/css/causerisk.css

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.css

admin/assets/css/causesrisks.css

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.css

admin/assets/css/countries.css

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		countries.css

admin/assets/css/country.css

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		country.css

admin/assets/css/currencies.css

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		currencies.css

admin/assets/css/currency.css

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		currency.css

admin/assets/css/health_data.css

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		health_data.css

admin/assets/css/health_data_sets.css

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.css

admin/controllers/causerisk.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php

admin/controllers/causesrisks.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php

admin/controllers/countries.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		countries.php

admin/controllers/country.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		country.php

admin/controllers/currencies.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		currencies.php

admin/controllers/currency.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		currency.php

admin/controllers/health_data.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php

admin/controllers/health_data_sets.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.php

admin/models/causerisk.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php

admin/models/causesrisks.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		causesrisks.php

admin/models/costbenefitprojection.php

@@ -505,7 +505,7 @@ class CostbenefitprojectionModelCostbenefitprojection extends JModelList
 				$query->where('a.id NOT IN (' . implode(',', $remove) . ')');
 			}
 			// Check that we only use the real companies and none of the dummy companies
-			$query->where('a.mode = 1'); // this will insure only real companies are loaded
+			// $query->where('a.mode = 1'); // this will insure only real companies are loaded (TODO) this switch has moved, and I am not sure where
 			// get only from set countries
 			$countryIds = array_keys($this->countries);
 			// limit to only load these countries

admin/models/countries.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		countries.php

admin/models/country.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		country.php

admin/models/currencies.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		currencies.php

admin/models/currency.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		currency.php

admin/models/forms/causerisk.js

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.js

admin/models/forms/country.js

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		country.js

admin/models/forms/currency.js

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		currency.js

admin/models/forms/health_data.js

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		health_data.js

admin/models/health_data.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php

admin/models/health_data_sets.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		health_data_sets.php
@@ -377,31 +377,31 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList
 		return false;
 	}
 
-	/**
+	/**
-	* Method to get header.
+	* Method to get header.
-	*
+	*
-	* @return mixed  An array of data items on success, false on failure.
+	* @return mixed  An array of data items on success, false on failure.
-	*/
+	*/
-	public function getExImPortHeaders()
+	public function getExImPortHeaders()
-	{
+	{
-		// Get a db connection.
+		// Get a db connection.
-		$db = JFactory::getDbo();
+		$db = JFactory::getDbo();
-		// get the columns
+		// get the columns
-		$columns = $db->getTableColumns("#__costbenefitprojection_health_data");
+		$columns = $db->getTableColumns("#__costbenefitprojection_health_data");
-		if (CostbenefitprojectionHelper::checkArray($columns))
+		if (CostbenefitprojectionHelper::checkArray($columns))
-		{
+		{
-			// remove the headers you don't import/export.
+			// remove the headers you don't import/export.
-			unset($columns['asset_id']);
+			unset($columns['asset_id']);
-			unset($columns['checked_out']);
+			unset($columns['checked_out']);
-			unset($columns['checked_out_time']);
+			unset($columns['checked_out_time']);
-			$headers = new stdClass();
+			$headers = new stdClass();
-			foreach ($columns as $column => $type)
+			foreach ($columns as $column => $type)
-			{
+			{
-				$headers->{$column} = $column;
+				$headers->{$column} = $column;
-			}
+			}
-			return $headers;
+			return $headers;
-		}
+		}
-		return false;
+		return false;
 	} 
 	
 	/**

admin/models/import_health_data_sets.php

@@ -363,26 +363,26 @@ class CostbenefitprojectionModelImport_health_data_sets extends JModelLegacy
 		return $check;
 	}
 	
-	/**
+	/**
-	 * Check the extension
+	 * Check the extension
-	 *
+	 *
-	 * @param   string  $file    Name of the uploaded file
+	 * @param   string  $file    Name of the uploaded file
-	 *
+	 *
-	 * @return  boolean  True on success
+	 * @return  boolean  True on success
-	 *
+	 *
-	 */
+	 */
-	protected function checkExtension($file)
+	protected function checkExtension($file)
-	{
+	{
-		// check the extention
+		// check the extention
-		switch(strtolower(pathinfo($file, PATHINFO_EXTENSION)))
+		switch(strtolower(pathinfo($file, PATHINFO_EXTENSION)))
-		{
+		{
-			case 'xls':
+			case 'xls':
-			case 'ods':
+			case 'ods':
-			case 'csv':
+			case 'csv':
-			return true;
+			return true;
-			break;
+			break;
-		}
+		}
-		return false;
+		return false;
 	} 
 	
 	/**

admin/tables/causerisk.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		causerisk.php

admin/tables/country.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		country.php

admin/tables/currency.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		currency.php

admin/tables/health_data.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		health_data.php

admin/views/causerisk/submitbutton.js

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js

admin/views/causerisk/tmpl/edit.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		edit.php

admin/views/causerisk/view.html.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php

admin/views/causesrisks/tmpl/default.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default.php

admin/views/causesrisks/tmpl/default_batch_body.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php

admin/views/causesrisks/tmpl/default_batch_footer.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php

admin/views/causesrisks/tmpl/default_body.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php

admin/views/causesrisks/tmpl/default_foot.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php

admin/views/causesrisks/tmpl/default_head.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php

admin/views/causesrisks/tmpl/default_toolbar.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php

admin/views/causesrisks/view.html.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 20 of this MVC
+	@version		@update number 24 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php

admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php

@@ -21,50 +21,50 @@
 defined('_JEXEC') or die('Restricted access'); 
 
 ?>
-<?php if (isset($this->usagedata->items)): ?>
+<?php if (isset($this->usagedata->items)): ?>
-<table class="table table-striped">
+<table class="table table-striped">
-	<thead>
+	<thead>
-		<tr>
+		<tr>
-			<th class="nowrap" width="20%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_COUNTRY_NAME'); ?></th>
+			<th class="nowrap" width="20%"><?php echo JText::_('COM_COSTBENEFITPROJECTION_COUNTRY_NAME'); ?></th>
-			<?php foreach($this->usagedata->items as $items): ?>
+			<?php foreach($this->usagedata->items as $items): ?>
-			<?php foreach ($items as $key => $value): ?>
+			<?php foreach ($items as $key => $value): ?>
-			<?php if ('name' == $key) { break; } elseif (strpos($key,'employees') !== false){ continue; } ?>
+			<?php if ('name' == $key) { break; } elseif (strpos($key,'employees') !== false){ continue; } ?>
-			<th class="nowrap center" width="16%"><?php echo CostbenefitprojectionHelper::safeString($key, 'Ww'); ?></th>
+			<th class="nowrap center" width="16%"><?php echo CostbenefitprojectionHelper::safeString($key, 'Ww'); ?></th>
-			<?php endforeach; ?>
+			<?php endforeach; ?>
-			<?php break;?>
+			<?php break;?>
-			<?php endforeach; ?>
+			<?php endforeach; ?>
-		</tr>
+		</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-		<?php foreach($this->usagedata->items as $nr => $items): ?>
+		<?php foreach($this->usagedata->items as $nr => $items): ?>
-		<tr>
+		<tr>
-			<th class="nowrap"><?php echo $items['name']; unset($items['name']); ?></th>
+			<th class="nowrap"><?php echo $items['name']; unset($items['name']); ?></th>
-			<?php foreach($items as $key => $value): ?>
+			<?php foreach($items as $key => $value): ?>
-			<?php if ('name' == $key) { break; } elseif (strpos($key,'employees') !== false){ continue; } ?>
+			<?php if ('name' == $key) { break; } elseif (strpos($key,'employees') !== false){ continue; } ?>
-			<td class="nowrap center"><?php echo (int) $value; ?> <small><em><span style="cursor: help;" class="hasTip" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_EMPLOYEESBR_IN_RELATION_TO_THIS_NUMBER'); ?>">(<?php echo (int) $items[$key.'_employees']; ?>)</span></em></small></td>
+			<td class="nowrap center"><?php echo (int) $value; ?> <small><em><span style="cursor: help;" class="hasTip" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_EMPLOYEESBR_IN_RELATION_TO_THIS_NUMBER'); ?>">(<?php echo (int) $items[$key.'_employees']; ?>)</span></em></small></td>
-			<?php endforeach; ?>
+			<?php endforeach; ?>
-		</tr>
+		</tr>
-		<?php endforeach; ?>
+		<?php endforeach; ?>
-	</tbody>
+	</tbody>
-	<?php if (count($this->usagedata->items) > 1): ?>
+	<?php if (count($this->usagedata->items) > 1): ?>
-	<tfoot>
+	<tfoot>
-		<tr>
+		<tr>
-			<th class="nowrap"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL'); ?></th>
+			<th class="nowrap"><?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL'); ?></th>
-			<?php foreach($this->usagedata->items as $items): ?>
+			<?php foreach($this->usagedata->items as $items): ?>
-			<?php foreach ($items as $key => $value): ?>
+			<?php foreach ($items as $key => $value): ?>
-			<?php if ('name' == $key) { break; } elseif (strpos($key,'employees') !== false){ continue; } ?>
+			<?php if ('name' == $key) { break; } elseif (strpos($key,'employees') !== false){ continue; } ?>
-			<th class="nowrap center"><?php echo (int) $this->usagedata->total[$key]; ?> <small><em><span style="cursor: help;" class="hasTip" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_EMPLOYEESBR_IN_RELATION_TO_THIS_TOTAL'); ?>">(<?php echo (int) $this->usagedata->total[$key.'_employees']; ?>)</span></em></small></th>
+			<th class="nowrap center"><?php echo (int) $this->usagedata->total[$key]; ?> <small><em><span style="cursor: help;" class="hasTip" title="<?php echo JText::_('COM_COSTBENEFITPROJECTION_TOTAL_EMPLOYEESBR_IN_RELATION_TO_THIS_TOTAL'); ?>">(<?php echo (int) $this->usagedata->total[$key.'_employees']; ?>)</span></em></small></th>
-			<?php endforeach; ?>
+			<?php endforeach; ?>
-			<?php break;?>
+			<?php break;?>
-			<?php endforeach; ?>
+			<?php endforeach; ?>
-		</tr>
+		</tr>
-	</tfoot>
+	</tfoot>
-	<?php endif; ?>
+	<?php endif; ?>
-</table>
+</table>
-<small>* <?php echo JText::_('COM_COSTBENEFITPROJECTION_ALL_NUMBERS_IN_BRACKETS_ARE_THE_RELATED_EMPLOYEES'); ?></small>
+<small>* <?php echo JText::_('COM_COSTBENEFITPROJECTION_ALL_NUMBERS_IN_BRACKETS_ARE_THE_RELATED_EMPLOYEES'); ?></small>
-<?php else: ?>
+<?php else: ?>
-	<div class="alert alert-warning">
+	<div class="alert alert-warning">
-		<h4 class="alert-heading"><?php echo JText::_('COM_COSTBENEFITPROJECTION_WARNING'); ?></h4>
+		<h4 class="alert-heading"><?php echo JText::_('COM_COSTBENEFITPROJECTION_WARNING'); ?></h4>
-		<p class="alert-message"><?php echo JText::_('COM_COSTBENEFITPROJECTION_THE_STATISTICAL_DATA_COULD_NOT_BE_RETURNED_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR'); ?></p>
+		<p class="alert-message"><?php echo JText::_('COM_COSTBENEFITPROJECTION_THE_STATISTICAL_DATA_COULD_NOT_BE_RETURNED_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR'); ?></p>
-	</div>
+	</div>
 <?php endif; ?>

admin/views/countries/tmpl/default.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default.php

admin/views/countries/tmpl/default_batch_body.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php

admin/views/countries/tmpl/default_batch_footer.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php

admin/views/countries/tmpl/default_body.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php

admin/views/countries/tmpl/default_foot.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php

admin/views/countries/tmpl/default_head.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php

admin/views/countries/tmpl/default_toolbar.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php

admin/views/countries/view.html.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php

admin/views/country/submitbutton.js

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js

admin/views/country/tmpl/edit.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		edit.php

admin/views/country/view.html.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 52 of this MVC
+	@version		@update number 54 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		25th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php

admin/views/currencies/tmpl/default.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default.php

admin/views/currencies/tmpl/default_batch_body.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php

admin/views/currencies/tmpl/default_batch_footer.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php

admin/views/currencies/tmpl/default_body.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php

admin/views/currencies/tmpl/default_foot.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php

admin/views/currencies/tmpl/default_head.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php

admin/views/currencies/tmpl/default_toolbar.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php

admin/views/currencies/view.html.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php

admin/views/currency/submitbutton.js

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js

admin/views/currency/tmpl/edit.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		edit.php

admin/views/currency/view.html.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 19 of this MVC
+	@version		@update number 20 of this MVC
-	@build			25th October, 2017
+	@build			17th May, 2018
 	@created		8th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php

admin/views/health_data/submitbutton.js

@@ -2,8 +2,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		submitbutton.js

admin/views/health_data/tmpl/edit.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		edit.php

admin/views/health_data/view.html.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php

admin/views/health_data_sets/tmpl/default.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default.php

admin/views/health_data_sets/tmpl/default_batch_body.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_body.php

admin/views/health_data_sets/tmpl/default_batch_footer.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_batch_footer.php

admin/views/health_data_sets/tmpl/default_body.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_body.php

admin/views/health_data_sets/tmpl/default_foot.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_foot.php

admin/views/health_data_sets/tmpl/default_head.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_head.php

admin/views/health_data_sets/tmpl/default_toolbar.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		default_toolbar.php

admin/views/health_data_sets/view.html.php

@@ -3,8 +3,8 @@
 	Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb 
 /-------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 109 of this MVC
+	@version		@update number 110 of this MVC
-	@build			23rd May, 2016
+	@build			17th May, 2018
 	@created		15th July, 2015
 	@package		Cost Benefit Projection
 	@subpackage		view.html.php