diff --git a/README.md b/README.md index 9a4bc6db..c27a420a 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ 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*: 12th June, 2019 ++ *Last Build*: 14th August, 2019 + *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*: **82923** ++ *Line count*: **84429** + *File count*: **585** + *Folder count*: **103** diff --git a/admin/README.txt b/admin/README.txt index 9a4bc6db..c27a420a 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -22,11 +22,11 @@ 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*: 12th June, 2019 ++ *Last Build*: 14th August, 2019 + *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*: **82923** ++ *Line count*: **84429** + *File count*: **585** + *Folder count*: **103** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index eba5c966..1a3d9214 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.css diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css index 7974f572..6144a31f 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.css diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css index f9f7a69f..60c0028b 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.css diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css index 0387da54..b5791fe7 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css index 838356a6..a12e989f 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.css diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css index a60ef11e..203893e2 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css index f2b70027..a123dd57 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 40c34a28..d3c76b0a 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.css diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index e9945ac2..1b0e3ef6 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.css diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index ac85ce95..15f9d6f0 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.css diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 4a8ad05d..d9bfc66f 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 8e0cfb53..82dd233a 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage dashboard.css diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css index 06847842..202fe1e3 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.css diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css index 00c3628b..7cb2fec8 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index fcf2e1b6..6bbbb8bb 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 88af9c0d..4f8866d5 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.css diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css index fab44751..3892d803 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css index 4caa1ecb..c7117c71 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.css diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css index bc402654..11ab16f2 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css index 8b22e316..7d8530b9 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.css diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css index 7af32aed..004fcd44 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.css diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css index 7d07f5c6..decde5b0 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 849df40b..96d2668c 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.js diff --git a/admin/controller.php b/admin/controller.php index e5fbd51a..273fa837 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 4f8c2665..71706dff 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php @@ -47,7 +47,7 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy // Check Token! $token = JSession::getFormToken(); $call_token = $jinput->get('token', 0, 'ALNUM'); - if($token == $call_token) + if($jinput->get($token, 0, 'ALNUM') || $token === $call_token) { $task = $this->getTask(); switch($task) diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index a22e9b17..b5bd1ca7 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index 82115fac..5d490b88 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index e7d8bedb..6d9db9b9 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index 635e095c..4bf80c54 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/controllers/company.php b/admin/controllers/company.php index f81d5124..5d5d9af3 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index df693bb9..dfb17b82 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index 521d5788..abef6147 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 0942a5d0..4bf05dbe 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/controllers/country.php b/admin/controllers/country.php index 0889f97e..a0623769 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index f3c8974c..7685b6de 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 499f2cf6..3f0d277a 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php index 772aa8a6..1d5a40e5 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php index 387be1f2..600788c9 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index cb627d30..0955bfd0 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index d86aa890..f5242874 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 2899f3bd..c6e8ab10 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index f72a9e17..64028fef 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/controllers/import_health_data_sets.php b/admin/controllers/import_health_data_sets.php index 9b7144c0..0919dd32 100644 --- a/admin/controllers/import_health_data_sets.php +++ b/admin/controllers/import_health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import_health_data_sets.php diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index c93161fa..ce5246ad 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index 3f85878c..9788ff67 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php index 6193e34d..7cbe76bd 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php index 730dc58b..397a7499 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php index 02af9976..4d111ebd 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php index 9c71e77b..a8b32623 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index 196532c5..301e4434 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index b02cc69d..66c16b57 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -1752,38 +1752,42 @@ abstract class CostbenefitprojectionHelper /** * Get any component's model **/ - public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $component = 'Costbenefitprojection', $config = array()) + public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $Component = 'Costbenefitprojection', $config = array()) { // fix the name $name = self::safeString($name); - // full path - $fullPath = $path . '/models'; - // set prefix - $prefix = $component.'Model'; + // full path to models + $fullPathModels = $path . '/models'; // load the model file - JModelLegacy::addIncludePath($fullPath, $prefix); + JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model'); + // make sure the table path is loaded + if (!isset($config['table_path']) || !self::checkString($config['table_path'])) + { + // This is the JCB default path to tables in Joomla 3.x + $config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables'; + } // get instance - $model = JModelLegacy::getInstance($name, $prefix, $config); + $model = JModelLegacy::getInstance($name, $Component . 'Model', $config); // if model not found (strange) if ($model == false) { jimport('joomla.filesystem.file'); // get file path - $filePath = $path.'/'.$name.'.php'; - $fullPath = $fullPath.'/'.$name.'.php'; + $filePath = $path . '/' . $name . '.php'; + $fullPathModel = $fullPathModels . '/' . $name . '.php'; // check if it exists if (JFile::exists($filePath)) { // get the file require_once $filePath; } - elseif (JFile::exists($fullPath)) + elseif (JFile::exists($fullPathModel)) { // get the file - require_once $fullPath; + require_once $fullPathModel; } // build class names - $modelClass = $prefix.$name; + $modelClass = $Component . 'Model' . $name; if (class_exists($modelClass)) { // initialize the model diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index f716d5d2..fa5f07da 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 1f4e0492..91ad7a94 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batch_.php diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index 3d43b327..73063a51 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sum.php diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index 2f23685b..b2e472dd 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sumcombine.php diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini index 356b1548..4eaffe11 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -117,11 +117,11 @@ COM_COSTBENEFITPROJECTION_CLOSE_NEW="Close & New" COM_COSTBENEFITPROJECTION_COMBINEDRESULTS="Combined results" COM_COSTBENEFITPROJECTION_COMBINEDRESULTS_DESC="The companies combine results" COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS="Combined Results Access" -COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_DESC="Allows the users in this group to access Combined Results" +COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_DESC="Allows the users in this group to access combined results." COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_SITE="Combined Results (Site) Access" -COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_SITE_DESC=" Allows the users in this group to access site combined results." +COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_SITE_DESC="Allows the users in this group to access site combined results." COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_COMPANIES_BUTTON_ACCESS="Combined Results Companies Button Access" -COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_COMPANIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the companies button." +COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_COMPANIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the companies button." COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_DASHBOARD_LIST="Combined Results Dashboard List" COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Combined Results" COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_OF="Combined results of" @@ -292,13 +292,13 @@ COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_LABEL="Medical Turnover Co COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_MESSAGE="Error! Please add medical turnover cost factor here." COM_COSTBENEFITPROJECTION_COMPANY_PUBLISHING="Publishing" COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS="Company Results Access" -COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_DESC="Allows the users in this group to access Company Results" +COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_DESC="Allows the users in this group to access company results." COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE="Company results (Site) Access" -COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE_DESC=" Allows the users in this group to access site company results." +COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE_DESC="Allows the users in this group to access site company results." COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_COMPANIES_BUTTON_ACCESS="Company Results Companies Button Access" -COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_COMPANIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the companies button." +COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_COMPANIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the companies button." COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_EDIT_BUTTON_ACCESS="Company Results Edit Button Access" -COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_EDIT_BUTTON_ACCESS_DESC=" Allows the users in this group to access the edit button." +COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_EDIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the edit button." COM_COSTBENEFITPROJECTION_COMPANY_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Company to customise the alias." COM_COSTBENEFITPROJECTION_COMPANY_SCALING_FACTORS="Scaling Factors" COM_COSTBENEFITPROJECTION_COMPANY_SERVICE_PROVIDER="Service Provider" @@ -344,7 +344,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_WORKING_DAYS_LABEL="Work Days" COM_COSTBENEFITPROJECTION_CONFIG_ADMIN_CHART_NOTE_DESC="The following settings are used on the back-end of the site called (admin)." COM_COSTBENEFITPROJECTION_CONFIG_ADMIN_CHART_NOTE_LABEL="Admin Settings" COM_COSTBENEFITPROJECTION_CONFIG_ADVANCEDMEMBERGROUP_DESCRIPTION="Select the member advanced group/s" -COM_COSTBENEFITPROJECTION_CONFIG_ADVANCEDMEMBERGROUP_LABEL=" User Member Advanced Group" +COM_COSTBENEFITPROJECTION_CONFIG_ADVANCEDMEMBERGROUP_LABEL="User Member Advanced Group" COM_COSTBENEFITPROJECTION_CONFIG_ALMOST_FLAT_LOAD="Almost Flat" COM_COSTBENEFITPROJECTION_CONFIG_AUTHOR="Author Info" COM_COSTBENEFITPROJECTION_CONFIG_AUTHOR_EMAIL_DESC="The email address of the author of this component." @@ -425,7 +425,7 @@ COM_COSTBENEFITPROJECTION_CONFIG_MAINWIDTH_DESC="Set the width of the entire cha COM_COSTBENEFITPROJECTION_CONFIG_MAINWIDTH_HINT="1000" COM_COSTBENEFITPROJECTION_CONFIG_MAINWIDTH_LABEL="Chart Area Width" COM_COSTBENEFITPROJECTION_CONFIG_MEMBERBASICGROUP_DESCRIPTION="Select the member basic group/s" -COM_COSTBENEFITPROJECTION_CONFIG_MEMBERBASICGROUP_LABEL=" User Member Basic Group" +COM_COSTBENEFITPROJECTION_CONFIG_MEMBERBASICGROUP_LABEL="User Member Basic Group" COM_COSTBENEFITPROJECTION_CONFIG_NO="No" COM_COSTBENEFITPROJECTION_CONFIG_ONLY_EXTRA="Only Extra" COM_COSTBENEFITPROJECTION_CONFIG_RESULTPATH_DESCRIPTION="Please set the path where the result json files should be stored, make sure it is outside the public folder." @@ -465,7 +465,7 @@ COM_COSTBENEFITPROJECTION_COST_MORTALITY="Cost Mortality" COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION="Cost of Intervention" COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM="Cost of Problem" COM_COSTBENEFITPROJECTION_COST_PERCENT="Cost Percent" -COM_COSTBENEFITPROJECTION_COST_PER_EMPLOYEE="Cost Per Employee" +COM_COSTBENEFITPROJECTION_COST_PER_EMPLOYEE="Cost per Employee" COM_COSTBENEFITPROJECTION_COST_PRESENTEEISM_DUE_TO_MORBIDITY="Cost Presenteeism (due to morbidity)" COM_COSTBENEFITPROJECTION_COST_SUMMARY="Cost Summary" COM_COSTBENEFITPROJECTION_COUNTRIES="Countries" @@ -583,7 +583,7 @@ COM_COSTBENEFITPROJECTION_COUNTRY_MODIFIED_BY_DESC="The last user that modified COM_COSTBENEFITPROJECTION_COUNTRY_MODIFIED_BY_LABEL="Modified By" COM_COSTBENEFITPROJECTION_COUNTRY_MODIFIED_DATE_DESC="The date this Country was modified." COM_COSTBENEFITPROJECTION_COUNTRY_MODIFIED_DATE_LABEL="Modified Date" -COM_COSTBENEFITPROJECTION_COUNTRY_NAME="Name" +COM_COSTBENEFITPROJECTION_COUNTRY_NAME="Country Name" COM_COSTBENEFITPROJECTION_COUNTRY_NAME_DESCRIPTION="Enter Name Here" COM_COSTBENEFITPROJECTION_COUNTRY_NAME_HINT="Name Here" COM_COSTBENEFITPROJECTION_COUNTRY_NAME_LABEL="Name" @@ -679,9 +679,9 @@ COM_COSTBENEFITPROJECTION_COUNTRY_WORLDZONE_MESSAGE="Error! Please add zone code COM_COSTBENEFITPROJECTION_COUNTRY_YEAR_LABEL="Data Year" COM_COSTBENEFITPROJECTION_COVERAGE_S="Coverage: %s" COM_COSTBENEFITPROJECTION_CPANEL_ACCESS_SITE="cPanel (Site) Access" -COM_COSTBENEFITPROJECTION_CPANEL_ACCESS_SITE_DESC=" Allows the users in this group to access site cpanel." +COM_COSTBENEFITPROJECTION_CPANEL_ACCESS_SITE_DESC="Allows the users in this group to access site cpanel." COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE="Create Account (giz) (Site) Access" -COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE_DESC=" Allows the users in this group to access site create account giz." +COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE_DESC="Allows the users in this group to access site create account giz." COM_COSTBENEFITPROJECTION_CREATE_NEW_S="Create New %s" COM_COSTBENEFITPROJECTION_CURRENCIES="Currencies" COM_COSTBENEFITPROJECTION_CURRENCIES_ACCESS="Currencies Access" @@ -741,12 +741,12 @@ COM_COSTBENEFITPROJECTION_CURRENCY_CREATED_BY_LABEL="Created By" COM_COSTBENEFITPROJECTION_CURRENCY_CREATED_DATE_DESC="The date this Currency was created." COM_COSTBENEFITPROJECTION_CURRENCY_CREATED_DATE_LABEL="Created Date" COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALPLACE="Decimalplace" -COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALPLACE_DESCRIPTION=" The position of a digit to the right of a decimal point, usually identified by successive ascending ordinal numbers with the digit immediately to the right of the decimal point being first: a figure accurate to the third decimal place." +COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALPLACE_DESCRIPTION="The position of a digit to the right of a decimal point, usually identified by successive ascending ordinal numbers with the digit immediately to the right of the decimal point being first: a figure accurate to the third decimal place." COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALPLACE_HINT="2" COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALPLACE_LABEL="Decimal place" COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALPLACE_MESSAGE="Error! Please add currency decimal place here." COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALSYMBOL="Decimalsymbol" -COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALSYMBOL_DESCRIPTION=" The symbol used to separate the integer part of a decimal number from its fractional part is called the decimal point." +COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALSYMBOL_DESCRIPTION="The symbol used to separate the integer part of a decimal number from its fractional part is called the decimal point." COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALSYMBOL_HINT="." COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALSYMBOL_LABEL="Decimal symbol" COM_COSTBENEFITPROJECTION_CURRENCY_DECIMALSYMBOL_MESSAGE="Error! Please add currency decimal symbol here." @@ -791,7 +791,7 @@ COM_COSTBENEFITPROJECTION_CURRENCY_SYMBOL_HINT="N$" COM_COSTBENEFITPROJECTION_CURRENCY_SYMBOL_LABEL="Symbol" COM_COSTBENEFITPROJECTION_CURRENCY_SYMBOL_MESSAGE="Error! Please add currency symbol here." COM_COSTBENEFITPROJECTION_CURRENCY_THOUSANDS="Thousands" -COM_COSTBENEFITPROJECTION_CURRENCY_THOUSANDS_HINT=" " +COM_COSTBENEFITPROJECTION_CURRENCY_THOUSANDS_HINT="" COM_COSTBENEFITPROJECTION_CURRENCY_THOUSANDS_LABEL="Thousands separator" COM_COSTBENEFITPROJECTION_CURRENCY_THOUSANDS_MESSAGE="Error! Please add currency thousands separator here." COM_COSTBENEFITPROJECTION_CURRENCY_VERSION_DESC="A count of the number of times this Currency has been revised." @@ -826,14 +826,14 @@ COM_COSTBENEFITPROJECTION_DURATION_S_YEAR="Duration: %s year" COM_COSTBENEFITPROJECTION_DURATION_S_YEARS="Duration: %s years" COM_COSTBENEFITPROJECTION_EDIT="Edit" COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY="Edit Created By" -COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by." +COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY_DESC="Allows users in this group to edit created by." COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE="Edit Created Date" -COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date." +COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE_DESC="Allows users in this group to edit created date." COM_COSTBENEFITPROJECTION_EDIT_S="Edit %s" COM_COSTBENEFITPROJECTION_EDIT_VERSIONS="Edit Version" -COM_COSTBENEFITPROJECTION_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions." +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_EXPORT_DATA_DESC="Allows users in this group to export data." COM_COSTBENEFITPROJECTION_EXPORT_FAILED="Export Failed" COM_COSTBENEFITPROJECTION_FEMALES_AGE_GROUP="Females Age Group" COM_COSTBENEFITPROJECTION_GENDER_ID="Gender id" @@ -1071,7 +1071,7 @@ COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TITLE_MESSAGE="Error! Please add title h COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TYPE="Type" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TYPE_DESCRIPTION="Select the help type." COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_TYPE_LABEL="Type" -COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL="Url" +COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL="URL" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL_DESCRIPTION="Enter url" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL_HINT="http://www.example.com" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL_LABEL="URL" @@ -1082,7 +1082,7 @@ COM_COSTBENEFITPROJECTION_HELP_MANAGER="Help" COM_COSTBENEFITPROJECTION_HERE_YOU_CAN_SET_THE_IMPORT_RELATIONSHIPS_TO_ALL_ADVANCED_DATA_MAPPING_AND_RECONSTRUCTION="Here you can set the import relationships to all advanced data mapping and reconstruction." COM_COSTBENEFITPROJECTION_IMPORT_CONTINUE="Continue" COM_COSTBENEFITPROJECTION_IMPORT_DATA="Import Data" -COM_COSTBENEFITPROJECTION_IMPORT_DATA_DESC=" Allows users in this group to import data." +COM_COSTBENEFITPROJECTION_IMPORT_DATA_DESC="Allows users in this group to import data." COM_COSTBENEFITPROJECTION_IMPORT_ERROR="Import error." COM_COSTBENEFITPROJECTION_IMPORT_FAILED="Import Failed" COM_COSTBENEFITPROJECTION_IMPORT_FILE_COLUMNS="File Columns" @@ -1264,7 +1264,7 @@ COM_COSTBENEFITPROJECTION_NET_BENEFIT="Net Benefit" COM_COSTBENEFITPROJECTION_NEW="New" COM_COSTBENEFITPROJECTION_NEW_ISSUE="New Issue" COM_COSTBENEFITPROJECTION_NONE_LOADED="None Loaded..." -COM_COSTBENEFITPROJECTION_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!" +COM_COSTBENEFITPROJECTION_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied." COM_COSTBENEFITPROJECTION_NO_ACCESS_GRANTED="No Access Granted!" COM_COSTBENEFITPROJECTION_NO_CAUSERISK_SELECTED="No Cause/Risk Selected" COM_COSTBENEFITPROJECTION_NO_COMPANIES_SELECTED="No companies selected!" @@ -1531,7 +1531,7 @@ 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" COM_COSTBENEFITPROJECTION_USE_BATCH="Use Batch" -COM_COSTBENEFITPROJECTION_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method." +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_WARNING="Warning" diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.sys.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.sys.ini index e48d3c8a..34d0020b 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.sys.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.sys.ini @@ -26,11 +26,11 @@ COM_COSTBENEFITPROJECTION_CAUSESRISKS_IMPORT_DESC="Allows the users in this grou COM_COSTBENEFITPROJECTION_CAUSESRISKS_SUBMENU="Causesrisks Submenu" COM_COSTBENEFITPROJECTION_CAUSESRISKS_SUBMENU_DESC="Allows the users in this group to submenu of causerisk" COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS="Combined Results Access" -COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_DESC="Allows the users in this group to access Combined Results" +COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_DESC="Allows the users in this group to access combined results." COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_SITE="Combined Results (Site) Access" -COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_SITE_DESC=" Allows the users in this group to access site combined results." +COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_ACCESS_SITE_DESC="Allows the users in this group to access site combined results." COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_COMPANIES_BUTTON_ACCESS="Combined Results Companies Button Access" -COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_COMPANIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the companies button." +COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_COMPANIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the companies button." COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_DASHBOARD_LIST="Combined Results Dashboard List" COM_COSTBENEFITPROJECTION_COMBINED_RESULTS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Combined Results" COM_COSTBENEFITPROJECTION_COMPANIES_ACCESS="Companies Access" @@ -84,13 +84,13 @@ COM_COSTBENEFITPROJECTION_COMPANIES_IMPORT_DESC="Allows the users in this group COM_COSTBENEFITPROJECTION_COMPANIES_SUBMENU="Companies Submenu" COM_COSTBENEFITPROJECTION_COMPANIES_SUBMENU_DESC="Allows the users in this group to submenu of company" COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS="Company Results Access" -COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_DESC="Allows the users in this group to access Company Results" +COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_DESC="Allows the users in this group to access company results." COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE="Company results (Site) Access" -COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE_DESC=" Allows the users in this group to access site company results." +COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE_DESC="Allows the users in this group to access site company results." COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_COMPANIES_BUTTON_ACCESS="Company Results Companies Button Access" -COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_COMPANIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the companies button." +COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_COMPANIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the companies button." COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_EDIT_BUTTON_ACCESS="Company Results Edit Button Access" -COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_EDIT_BUTTON_ACCESS_DESC=" Allows the users in this group to access the edit button." +COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_EDIT_BUTTON_ACCESS_DESC="Allows the users in this group to access the edit button." COM_COSTBENEFITPROJECTION_CONFIGURATION="Cost Benefit Projection Configuration" COM_COSTBENEFITPROJECTION_COUNTRIES_ACCESS="Countries Access" COM_COSTBENEFITPROJECTION_COUNTRIES_ACCESS_DESC="Allows the users in this group to access access countries" @@ -117,9 +117,9 @@ COM_COSTBENEFITPROJECTION_COUNTRIES_IMPORT_DESC="Allows the users in this group COM_COSTBENEFITPROJECTION_COUNTRIES_SUBMENU="Countries Submenu" COM_COSTBENEFITPROJECTION_COUNTRIES_SUBMENU_DESC="Allows the users in this group to submenu of country" COM_COSTBENEFITPROJECTION_CPANEL_ACCESS_SITE="cPanel (Site) Access" -COM_COSTBENEFITPROJECTION_CPANEL_ACCESS_SITE_DESC=" Allows the users in this group to access site cpanel." +COM_COSTBENEFITPROJECTION_CPANEL_ACCESS_SITE_DESC="Allows the users in this group to access site cpanel." COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE="Create Account (giz) (Site) Access" -COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE_DESC=" Allows the users in this group to access site create account giz." +COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE_DESC="Allows the users in this group to access site create account giz." COM_COSTBENEFITPROJECTION_CURRENCIES_ACCESS="Currencies Access" COM_COSTBENEFITPROJECTION_CURRENCIES_ACCESS_DESC="Allows the users in this group to access access currencies" COM_COSTBENEFITPROJECTION_CURRENCIES_BATCH_USE="Currencies Batch Use" @@ -145,13 +145,13 @@ COM_COSTBENEFITPROJECTION_CURRENCIES_IMPORT_DESC="Allows the users in this group COM_COSTBENEFITPROJECTION_CURRENCIES_SUBMENU="Currencies Submenu" COM_COSTBENEFITPROJECTION_CURRENCIES_SUBMENU_DESC="Allows the users in this group to submenu of currency" COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY="Edit Created By" -COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by." +COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY_DESC="Allows users in this group to edit created by." COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE="Edit Created Date" -COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date." +COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE_DESC="Allows users in this group to edit created date." COM_COSTBENEFITPROJECTION_EDIT_VERSIONS="Edit Version" -COM_COSTBENEFITPROJECTION_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions." +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_EXPORT_DATA_DESC="Allows users in this group to export data." 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" @@ -215,7 +215,7 @@ COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this g COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu" COM_COSTBENEFITPROJECTION_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document" COM_COSTBENEFITPROJECTION_IMPORT_DATA="Import Data" -COM_COSTBENEFITPROJECTION_IMPORT_DATA_DESC=" Allows users in this group to import data." +COM_COSTBENEFITPROJECTION_IMPORT_DATA_DESC="Allows users in this group to import data." COM_COSTBENEFITPROJECTION_INTERVENTIONS_ACCESS="Interventions Access" COM_COSTBENEFITPROJECTION_INTERVENTIONS_ACCESS_DESC="Allows the users in this group to access access interventions" COM_COSTBENEFITPROJECTION_INTERVENTIONS_BATCH_USE="Interventions Batch Use" @@ -306,4 +306,4 @@ COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_IMPORT_DESC="Allows the users in thi COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_SUBMENU="Service Providers Submenu" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDERS_SUBMENU_DESC="Allows the users in this group to submenu of service provider" COM_COSTBENEFITPROJECTION_USE_BATCH="Use Batch" -COM_COSTBENEFITPROJECTION_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method." \ No newline at end of file +COM_COSTBENEFITPROJECTION_USE_BATCH_DESC="Allows users in this group to use batch copy/update method." \ No newline at end of file diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 88b9fc97..b05f78a7 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batchselection.php diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php index 9cf5ecdf..9a44f740 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'name', 'ref', 'alias' @@ -31,6 +42,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -39,3 +51,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/causerisk/details_fullwidth.php b/admin/layouts/causerisk/details_fullwidth.php index a03e7e37..a5916751 100644 --- a/admin/layouts/causerisk/details_fullwidth.php +++ b/admin/layouts/causerisk/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'description' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index b3b56573..32f6721e 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'importname' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/causerisk/details_right.php b/admin/layouts/causerisk/details_right.php index e96d10d0..522d8afa 100644 --- a/admin/layouts/causerisk/details_right.php +++ b/admin/layouts/causerisk/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'import_id' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index f6f7efa6..3829a139 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'access', @@ -34,9 +45,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index d1a7598e..38b141b4 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'age_groups_note' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index d73cf3de..d857ed31 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'percentmale' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index 8bca5292..4f81622b 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'percentfemale' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index a799c1d3..69c796bf 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'causesrisks', 'cause_risk_selection_note' ); @@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index 605e6fd9..f268c41d 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'name', 'user', 'department' @@ -31,6 +42,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -39,3 +51,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index d5eef54b..c94f58f4 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'per', 'email', 'country', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index d6b38270..6257fba6 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'working_days', 'total_salary', 'total_healthcare', @@ -39,9 +50,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index e2038ef2..38e6aa11 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'not_required' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index a616ffe8..e0cc7196 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index f6f7efa6..3829a139 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'access', @@ -34,9 +45,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index e27deccb..1aed59b1 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index d73cf3de..d857ed31 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'percentmale' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index 8bca5292..4f81622b 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'percentfemale' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index a42e35b7..e42066d5 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'causesrisks' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index 464cf445..281e4c0a 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index c8a12223..d128fec9 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'name', 'alias', 'user' @@ -31,6 +42,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -39,3 +51,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index 618b902b..66096749 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'currency', 'datayear', 'worldzone', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index c755fb7b..fa87aebc 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'working_days', 'presenteeism', 'medical_turnovers', @@ -34,9 +45,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index 3b2da98c..730814cf 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'maledeath', 'maleyld' ); @@ -30,9 +41,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index 52f17ac9..e81a7e6b 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'femaledeath', 'femaleyld' ); @@ -30,9 +41,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index 9709d68d..76841069 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index 52cb2834..db60f41c 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage public_details_fullwidth.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'publicname', 'publicemail', 'publicnumber', @@ -32,6 +43,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -40,3 +52,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index f6f7efa6..3829a139 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'access', @@ -34,9 +45,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index 762c5576..ac2dd17b 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers_fullwidth.php diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 56e5e79f..f3717cda 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'name', 'alias' ); @@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index bb0015df..6781e4a1 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'codethree', 'numericcode', 'symbol', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index 52b8998a..64233b1a 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'decimalplace', 'decimalsymbol', 'positivestyle', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index f6f7efa6..3829a139 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'access', @@ -34,9 +45,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index a37a4415..0a6a00f5 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index b1192e4d..ccb8ea5a 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'causerisk' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index 390951c4..0bc2684d 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'maledeath', 'maleyld' ); @@ -30,9 +41,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index f84adadd..edccd556 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'femaledeath', 'femaleyld' ); @@ -30,9 +41,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index a3429dd9..d9fdc6e7 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_rightside.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'year', 'country' ); @@ -30,9 +41,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index f6f7efa6..3829a139 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'access', @@ -34,9 +45,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index f1c75b82..469a0462 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'title', 'alias' ); @@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 663f3ea2..1f2a2202 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'content' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 5f02d9bb..e7e67dde 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'target', 'groups', 'location', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 099f702a..5fbb995b 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'type', 'url', 'article' @@ -31,9 +42,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index e2038ef2..38e6aa11 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'not_required' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 53bff773..43a81817 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'version', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index 7a945872..14c3969f 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'name', 'company', 'country', @@ -32,6 +43,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -40,3 +52,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index c1748e98..9230bdfe 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'coverage', 'duration', 'share', @@ -33,6 +44,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -41,3 +53,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index e2038ef2..38e6aa11 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'not_required' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index 53bff773..43a81817 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'version', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index 7f543d3b..7776b2d5 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'intervention' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index 5334f6fc..7d5584f0 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'interventions' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index 5be469f1..97f9244b 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'company', 'country' ); @@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index bbf8571b..7f884ba7 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'causerisk', 'reference' ); @@ -30,9 +41,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index 05ea68ab..04bb81aa 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'yld_scaling_factor_males', 'yld_scaling_factor_females', 'mortality_scaling_factor_males', @@ -35,9 +46,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index 53bff773..43a81817 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'version', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index 61a67f0c..c14a4234 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index 7cef1924..31900bd0 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'user', 'country' ); @@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/admin/layouts/service_provider/details_left.php b/admin/layouts/service_provider/details_left.php index c0800020..1b96f16e 100644 --- a/admin/layouts/service_provider/details_left.php +++ b/admin/layouts/service_provider/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'public_details_note', 'publicname', 'publicemail', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/service_provider/details_right.php b/admin/layouts/service_provider/details_right.php index fbbba40f..af6a9223 100644 --- a/admin/layouts/service_provider/details_right.php +++ b/admin/layouts/service_provider/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'testcompanies' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index 069725ec..0d5caa11 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index 53bff773..43a81817 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'version', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/admin/models/ajax.php b/admin/models/ajax.php index a383fc47..698b7640 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index 8db95dca..58f5b940 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php @@ -26,13 +26,37 @@ use Joomla\Registry\Registry; * Costbenefitprojection Causerisk Model */ class CostbenefitprojectionModelCauserisk extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'importname' + ), + 'right' => array( + 'import_id' + ), + 'fullwidth' => array( + 'description' + ), + 'above' => array( + 'name', + 'ref', + 'alias' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 53781d4a..149d2141 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index d1eb2bde..b38d3e0c 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/models/companies.php b/admin/models/companies.php index 150352b6..0e26ff2a 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/models/company.php b/admin/models/company.php index 05b4b8a1..b2d4454c 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -26,13 +26,68 @@ use Joomla\Registry\Registry; * Costbenefitprojection Company Model */ class CostbenefitprojectionModelCompany extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'per', + 'email', + 'country', + 'service_provider', + 'datayear' + ), + 'right' => array( + 'working_days', + 'total_salary', + 'total_healthcare', + 'productivity_losses', + 'males', + 'females', + 'medical_turnovers_males', + 'medical_turnovers_females', + 'turnover_comment', + 'sick_leave_males', + 'sick_leave_females' + ), + 'above' => array( + 'name', + 'user', + 'department' + ), + 'under' => array( + 'not_required' + ) + ), + 'causerisk_selection' => array( + 'fullwidth' => array( + 'causesrisks', + 'cause_risk_selection_note' + ) + ), + 'age_groups_percentages' => array( + 'left' => array( + 'percentmale' + ), + 'right' => array( + 'percentfemale' + ), + 'fullwidth' => array( + 'age_groups_note' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index 801557ce..cc4dcfd1 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index 72a6dc63..f26c4833 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/models/countries.php b/admin/models/countries.php index a27e3cfa..cfaf7865 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/country.php b/admin/models/country.php index aaf127c2..8de903c1 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php @@ -26,13 +26,74 @@ use Joomla\Registry\Registry; * Costbenefitprojection Country Model */ class CostbenefitprojectionModelCountry extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'currency', + 'datayear', + 'worldzone', + 'codethree', + 'codetwo' + ), + 'right' => array( + 'working_days', + 'presenteeism', + 'medical_turnovers', + 'sick_leave', + 'healthcare', + 'productivity_losses' + ), + 'above' => array( + 'name', + 'alias', + 'user' + ) + ), + 'public_details' => array( + 'fullwidth' => array( + 'publicname', + 'publicemail', + 'publicnumber', + 'publicaddress' + ) + ), + 'health_data_totals' => array( + 'left' => array( + 'maledeath', + 'maleyld' + ), + 'right' => array( + 'femaledeath', + 'femaleyld' + ) + ), + 'age_groups_percentages' => array( + 'left' => array( + 'percentmale' + ), + 'right' => array( + 'percentfemale' + ) + ), + 'causerisk_selection' => array( + 'fullwidth' => array( + 'causesrisks' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 1367e0bc..39ed9943 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/models/currency.php b/admin/models/currency.php index be481738..4f90b2ed 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php @@ -26,13 +26,39 @@ use Joomla\Registry\Registry; * Costbenefitprojection Currency Model */ class CostbenefitprojectionModelCurrency extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'codethree', + 'numericcode', + 'symbol', + 'thousands' + ), + 'right' => array( + 'decimalplace', + 'decimalsymbol', + 'positivestyle', + 'negativestyle' + ), + 'above' => array( + 'name', + 'alias' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 4d17505b..ff2126cf 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 04dfdaa3..1004b80d 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage articles.php diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php index 76cc5830..174eb3f8 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php index aa3b0f51..3c2a1a42 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesriskscheck.php diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php index 699ea51b..6eb0d0fb 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -46,15 +46,15 @@ class JFormFieldCompany extends JFormFieldList protected function getInput() { // see if we should add buttons - $setButton = $this->getAttribute('button'); + $set_button = $this->getAttribute('button'); // get html $html = parent::getInput(); // if true set button - if ($setButton === 'true') + if ($set_button === 'true') { $button = array(); $script = array(); - $buttonName = $this->getAttribute('name'); + $button_code_name = $this->getAttribute('name'); // get the input from url $app = JFactory::getApplication(); $jinput = $app->input; @@ -78,55 +78,52 @@ class JFormFieldCompany extends JFormFieldList $ref .= '&return=' . $_return; $refJ .= '&return=' . $_return; } + // get button label + $button_label = trim($button_code_name); + $button_label = preg_replace('/_+/', ' ', $button_label); + $button_label = preg_replace('/\s+/', ' ', $button_label); + $button_label = preg_replace("/[^A-Za-z ]/", '', $button_label); + $button_label = ucfirst(strtolower($button_label)); + // get user object $user = JFactory::getUser(); // only add if user allowed to create company if ($user->authorise('company.create', 'com_costbenefitprojection') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button - $buttonNamee = trim($buttonName); - $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); - $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); - $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); - $buttonNamee = ucfirst(strtolower($buttonNamee)); - $button[] = ' '; } // only add if user allowed to edit company - if (($buttonName === 'company' || $buttonName === 'companies') && $user->authorise('company.edit', 'com_costbenefitprojection') && $app->isAdmin()) // TODO for now only in admin area. + if ($user->authorise('company.edit', 'com_costbenefitprojection') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button - $buttonNamee = trim($buttonName); - $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); - $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); - $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); - $buttonNamee = ucfirst(strtolower($buttonNamee)); - $button[] = ''; // build script $script[] = " jQuery(document).ready(function() { - jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) { e.preventDefault(); - var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); - ".$buttonName."Button(".$buttonName."Value); + var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val(); + ".$button_code_name."Button(".$button_code_name."Value); }); - var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); - ".$buttonName."Button(".$buttonName."Value); + var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val(); + ".$button_code_name."Button(".$button_code_name."Value); }); - function ".$buttonName."Button(value) { + function ".$button_code_name."Button(value) { if (value > 0) { // hide the create button - jQuery('#".$buttonName."Create').hide(); + jQuery('#".$button_code_name."Create').hide(); // show edit button - jQuery('#".$buttonName."Edit').show(); + jQuery('#".$button_code_name."Edit').show(); var url = 'index.php?option=com_costbenefitprojection&view=companies&task=company.edit&id='+value+'".$refJ."'; - jQuery('#".$buttonName."Edit').attr('href', url); + jQuery('#".$button_code_name."Edit').attr('href', url); } else { // show the create button - jQuery('#".$buttonName."Create').show(); + jQuery('#".$button_code_name."Create').show(); // hide edit button - jQuery('#".$buttonName."Edit').hide(); + jQuery('#".$button_code_name."Edit').hide(); } }"; } diff --git a/admin/models/fields/companycheck.php b/admin/models/fields/companycheck.php index 787607d3..5aaf06e3 100644 --- a/admin/models/fields/companycheck.php +++ b/admin/models/fields/companycheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companycheck.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 77bec5ab..e7c7dacc 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php index c1b2363e..7057edb7 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countryuser.php diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index 708d6f0a..344ab198 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php index 2574c90b..27e961b0 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage datayear.php diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php index 50a78bcd..b78036fa 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index 092803f7..f5800f57 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage memberuser.php diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php index 769ce070..88f10009 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovider.php @@ -46,15 +46,15 @@ class JFormFieldServiceprovider extends JFormFieldList protected function getInput() { // see if we should add buttons - $setButton = $this->getAttribute('button'); + $set_button = $this->getAttribute('button'); // get html $html = parent::getInput(); // if true set button - if ($setButton === 'true') + if ($set_button === 'true') { $button = array(); $script = array(); - $buttonName = $this->getAttribute('name'); + $button_code_name = $this->getAttribute('name'); // get the input from url $app = JFactory::getApplication(); $jinput = $app->input; @@ -78,55 +78,52 @@ class JFormFieldServiceprovider extends JFormFieldList $ref .= '&return=' . $_return; $refJ .= '&return=' . $_return; } + // get button label + $button_label = trim($button_code_name); + $button_label = preg_replace('/_+/', ' ', $button_label); + $button_label = preg_replace('/\s+/', ' ', $button_label); + $button_label = preg_replace("/[^A-Za-z ]/", '', $button_label); + $button_label = ucfirst(strtolower($button_label)); + // get user object $user = JFactory::getUser(); // only add if user allowed to create service_provider if ($user->authorise('service_provider.create', 'com_costbenefitprojection') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button - $buttonNamee = trim($buttonName); - $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); - $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); - $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); - $buttonNamee = ucfirst(strtolower($buttonNamee)); - $button[] = ' '; } // only add if user allowed to edit service_provider - if (($buttonName === 'service_provider' || $buttonName === 'service_providers') && $user->authorise('service_provider.edit', 'com_costbenefitprojection') && $app->isAdmin()) // TODO for now only in admin area. + if ($user->authorise('service_provider.edit', 'com_costbenefitprojection') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button - $buttonNamee = trim($buttonName); - $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); - $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); - $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); - $buttonNamee = ucfirst(strtolower($buttonNamee)); - $button[] = ''; // build script $script[] = " jQuery(document).ready(function() { - jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + jQuery('#adminForm').on('change', '#jform_".$button_code_name."',function (e) { e.preventDefault(); - var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); - ".$buttonName."Button(".$buttonName."Value); + var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val(); + ".$button_code_name."Button(".$button_code_name."Value); }); - var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); - ".$buttonName."Button(".$buttonName."Value); + var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val(); + ".$button_code_name."Button(".$button_code_name."Value); }); - function ".$buttonName."Button(value) { + function ".$button_code_name."Button(value) { if (value > 0) { // hide the create button - jQuery('#".$buttonName."Create').hide(); + jQuery('#".$button_code_name."Create').hide(); // show edit button - jQuery('#".$buttonName."Edit').show(); + jQuery('#".$button_code_name."Edit').show(); var url = 'index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit&id='+value+'".$refJ."'; - jQuery('#".$buttonName."Edit').attr('href', url); + jQuery('#".$button_code_name."Edit').attr('href', url); } else { // show the create button - jQuery('#".$buttonName."Create').show(); + jQuery('#".$button_code_name."Create').show(); // hide edit button - jQuery('#".$buttonName."Edit').hide(); + jQuery('#".$button_code_name."Edit').hide(); } }"; } diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index 0df43910..6bfe4575 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovideruser.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index b6b11293..404bc0c5 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage siteviewfolderlist.php diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index d8fa24f0..8c6b92ab 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.js diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js index e1d2d8a9..74b29a80 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js index a3dec587..742124e4 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.js diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js index 42ef302a..d55ebc67 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.js diff --git a/admin/models/forms/health_data.js b/admin/models/forms/health_data.js index 918b8b7b..1ca32a8b 100644 --- a/admin/models/forms/health_data.js +++ b/admin/models/forms/health_data.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.js diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index bb647ae2..d0764b45 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.js @@ -21,8 +21,7 @@ jform_vvvvvwbvwl_required = false; jform_vvvvvwcvwm_required = false; jform_vvvvvwdvwn_required = false; jform_vvvvvwevwo_required = false; -jform_vvvvvwfvwp_required = false; -jform_vvvvvwgvwq_required = false; +jform_vvvvvwgvwp_required = false; // Initial Script jQuery(document).ready(function() @@ -242,28 +241,10 @@ function vvvvvwf(type_vvvvvwf) if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - // add required attribute to content field - if (jform_vvvvvwfvwp_required) - { - updateFieldRequired('content',0); - jQuery('#jform_content').prop('required','required'); - jQuery('#jform_content').attr('aria-required',true); - jQuery('#jform_content').addClass('required'); - jform_vvvvvwfvwp_required = false; - } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - // remove required attribute from content field - if (!jform_vvvvvwfvwp_required) - { - updateFieldRequired('content',1); - jQuery('#jform_content').removeAttr('required'); - jQuery('#jform_content').removeAttr('aria-required'); - jQuery('#jform_content').removeClass('required'); - jform_vvvvvwfvwp_required = true; - } } } @@ -286,26 +267,26 @@ function vvvvvwg(target_vvvvvwg) { jQuery('#jform_groups').closest('.control-group').show(); // add required attribute to groups field - if (jform_vvvvvwgvwq_required) + if (jform_vvvvvwgvwp_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvvwgvwq_required = false; + jform_vvvvvwgvwp_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); // remove required attribute from groups field - if (!jform_vvvvvwgvwq_required) + if (!jform_vvvvvwgvwp_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvvwgvwq_required = true; + jform_vvvvvwgvwp_required = true; } } } diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml index 61c14e07..75d70a08 100644 --- a/admin/models/forms/help_document.xml +++ b/admin/models/forms/help_document.xml @@ -176,7 +176,6 @@ height="300 px" buttons="false" filter="safehtml" - required="true" /> array( + 'left' => array( + 'maledeath', + 'maleyld' + ), + 'right' => array( + 'femaledeath', + 'femaleyld' + ), + 'above' => array( + 'causerisk' + ), + 'rightside' => array( + 'year', + 'country' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index 88016176..c3f2ec0f 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 5561ff57..dfd5105d 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php @@ -26,13 +26,45 @@ use Joomla\Registry\Registry; * Costbenefitprojection Help_document Model */ class CostbenefitprojectionModelHelp_document extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'target', + 'groups', + 'location', + 'admin_view', + 'site_view' + ), + 'right' => array( + 'type', + 'url', + 'article' + ), + 'fullwidth' => array( + 'content' + ), + 'above' => array( + 'title', + 'alias' + ), + 'under' => array( + 'not_required' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index bb1d575b..e42428fb 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 1c50f66f..3d23aa4b 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/models/import_health_data_sets.php b/admin/models/import_health_data_sets.php index d6853e57..d08ea674 100644 --- a/admin/models/import_health_data_sets.php +++ b/admin/models/import_health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import_health_data_sets.php diff --git a/admin/models/intervention.php b/admin/models/intervention.php index 8e24274e..cba4cc54 100644 --- a/admin/models/intervention.php +++ b/admin/models/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php @@ -26,13 +26,47 @@ use Joomla\Registry\Registry; * Costbenefitprojection Intervention Model */ class CostbenefitprojectionModelIntervention extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'fullwidth' => array( + 'coverage', + 'duration', + 'share', + 'description', + 'reference' + ), + 'above' => array( + 'name', + 'company', + 'country', + 'type' + ), + 'under' => array( + 'not_required' + ) + ), + 'settings' => array( + 'left' => array( + 'interventions' + ), + 'fullwidth' => array( + 'intervention' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/interventions.php b/admin/models/interventions.php index e0c052fd..1131c012 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php index 67d20839..104d6b7f 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php @@ -26,13 +26,40 @@ use Joomla\Registry\Registry; * Costbenefitprojection Scaling_factor Model */ class CostbenefitprojectionModelScaling_factor extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'causerisk', + 'reference' + ), + 'right' => array( + 'yld_scaling_factor_males', + 'yld_scaling_factor_females', + 'mortality_scaling_factor_males', + 'mortality_scaling_factor_females', + 'presenteeism_scaling_factor_males', + 'presenteeism_scaling_factor_females', + 'health_scaling_factor' + ), + 'above' => array( + 'company', + 'country' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index 3324c7f9..6b4910b0 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index c91f585b..c5dd2326 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php @@ -26,13 +26,37 @@ use Joomla\Registry\Registry; * Costbenefitprojection Service_provider Model */ class CostbenefitprojectionModelService_provider extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'public_details_note', + 'publicname', + 'publicemail', + 'publicnumber', + 'publicaddress' + ), + 'right' => array( + 'testcompanies' + ), + 'above' => array( + 'user', + 'country' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index 45b3f25e..c0e9a0db 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index d770870a..a40d9c22 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/tables/company.php b/admin/tables/company.php index 26e335e9..0380f710 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/tables/country.php b/admin/tables/country.php index 4c0bb494..79f2d676 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/tables/currency.php b/admin/tables/currency.php index 27b84de7..5fe6cae5 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php index ccb758d8..595ba9c8 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index d32084d5..61b87d4b 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php index 3cd9769a..acc547da 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php index 1a902ab2..996122cf 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php index 32c7e88e..0858baa9 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js index 3b86e7a2..463d366d 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php index 68dcc2b7..a443c465 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php index f0be643d..4533f349 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php index a1494565..d0e11be3 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php index 7bece480..829fc926 100644 --- a/admin/views/causesrisks/tmpl/default_batch_body.php +++ b/admin/views/causesrisks/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php index a437fdab..e433334e 100644 --- a/admin/views/causesrisks/tmpl/default_batch_footer.php +++ b/admin/views/causesrisks/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php index 1a51c48f..540ceb9c 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php index dff697e9..6724e1d9 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php index 38c35531..2605cbaf 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php index 6546134a..70f13f10 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php index 54ed21f0..63d6471b 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php index c2a9d633..1213fd51 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php index 2dd00246..1c1a2b12 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php index 01e3dbc0..dc5cfd63 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index ded2109e..05caf6f6 100644 --- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php index 087e4223..cb7ee1e9 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index 3fca6ed1..4e0e4135 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php index 2d73029a..9fc8dbbb 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index 7c6ef301..05964ff7 100644 --- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php index f66d0817..547fecf8 100644 --- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index 66e778e0..b15eaed0 100644 --- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index 4e42ca02..19ecc203 100644 --- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php index 4ecad342..6fff5e26 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php index 988053e4..1b419033 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php index 1db50e15..5116484e 100644 --- a/admin/views/companies/tmpl/default_batch_body.php +++ b/admin/views/companies/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php index 51e1afc5..275bef8e 100644 --- a/admin/views/companies/tmpl/default_batch_footer.php +++ b/admin/views/companies/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php index 41986143..51a5334c 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php index 9a0eb410..eb54d879 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php index 0045d679..f67432d9 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php index 1da765ca..2e7570b4 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php index f5e7884b..d1e3a025 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js index f1fa589b..e586a92f 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index bd5608af..ae9f116f 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/company/view.html.php b/admin/views/company/view.html.php index 9e1966f1..e0c9ef57 100644 --- a/admin/views/company/view.html.php +++ b/admin/views/company/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companyresults/tmpl/default.php b/admin/views/companyresults/tmpl/default.php index 8fe7a011..fe4d26eb 100644 --- a/admin/views/companyresults/tmpl/default.php +++ b/admin/views/companyresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost.php b/admin/views/companyresults/tmpl/default_chart_cost.php index 2dd00246..1c1a2b12 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost.php +++ b/admin/views/companyresults/tmpl/default_chart_cost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost_percent.php b/admin/views/companyresults/tmpl/default_chart_cost_percent.php index 01e3dbc0..dc5cfd63 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index ded2109e..05caf6f6 100644 --- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php index 087e4223..cb7ee1e9 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index 3fca6ed1..4e0e4135 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/companyresults/tmpl/default_main.php b/admin/views/companyresults/tmpl/default_main.php index 2d73029a..9fc8dbbb 100644 --- a/admin/views/companyresults/tmpl/default_main.php +++ b/admin/views/companyresults/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index 7c6ef301..05964ff7 100644 --- a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/companyresults/tmpl/default_table_cost_summary.php b/admin/views/companyresults/tmpl/default_table_cost_summary.php index f66d0817..547fecf8 100644 --- a/admin/views/companyresults/tmpl/default_table_cost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php index 66e778e0..b15eaed0 100644 --- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php index 4e42ca02..19ecc203 100644 --- a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/companyresults/tmpl/default_variables.php b/admin/views/companyresults/tmpl/default_variables.php index 5d14a897..205d4675 100644 --- a/admin/views/companyresults/tmpl/default_variables.php +++ b/admin/views/companyresults/tmpl/default_variables.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_variables.php diff --git a/admin/views/companyresults/view.html.php b/admin/views/companyresults/view.html.php index 814c345a..76e47880 100644 --- a/admin/views/companyresults/view.html.php +++ b/admin/views/companyresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/costbenefitprojection/tmpl/default.php b/admin/views/costbenefitprojection/tmpl/default.php index 3a3739e8..8933fa6f 100644 --- a/admin/views/costbenefitprojection/tmpl/default.php +++ b/admin/views/costbenefitprojection/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/costbenefitprojection/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/costbenefitprojection/tmpl/default_closed_issues_the_closed_issues_on_github.php index 127a0638..f202aa22 100644 --- a/admin/views/costbenefitprojection/tmpl/default_closed_issues_the_closed_issues_on_github.php +++ b/admin/views/costbenefitprojection/tmpl/default_closed_issues_the_closed_issues_on_github.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_closed_issues_the_closed_issues_on_github.php diff --git a/admin/views/costbenefitprojection/tmpl/default_main.php b/admin/views/costbenefitprojection/tmpl/default_main.php index 54d3f922..a0c12fc1 100644 --- a/admin/views/costbenefitprojection/tmpl/default_main.php +++ b/admin/views/costbenefitprojection/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/costbenefitprojection/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/costbenefitprojection/tmpl/default_open_issues_the_open_issues_on_github.php index c4e42e7b..e5a17889 100644 --- a/admin/views/costbenefitprojection/tmpl/default_open_issues_the_open_issues_on_github.php +++ b/admin/views/costbenefitprojection/tmpl/default_open_issues_the_open_issues_on_github.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_open_issues_the_open_issues_on_github.php diff --git a/admin/views/costbenefitprojection/tmpl/default_readme_information.php b/admin/views/costbenefitprojection/tmpl/default_readme_information.php index 56311a12..f2e3887f 100644 --- a/admin/views/costbenefitprojection/tmpl/default_readme_information.php +++ b/admin/views/costbenefitprojection/tmpl/default_readme_information.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_readme_information.php diff --git a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php index b1542ec7..383d0e3f 100644 --- a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php +++ b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_usage_statistics_table.php diff --git a/admin/views/costbenefitprojection/tmpl/default_vast_development_method_notice_board.php b/admin/views/costbenefitprojection/tmpl/default_vast_development_method_notice_board.php index 413d08df..0c6822c5 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/costbenefitprojection/tmpl/default_vast_development_method_notice_board.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/costbenefitprojection/tmpl/default_vdm.php b/admin/views/costbenefitprojection/tmpl/default_vdm.php index 4afa4ce8..02549f77 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vdm.php +++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_vdm.php diff --git a/admin/views/costbenefitprojection/view.html.php b/admin/views/costbenefitprojection/view.html.php index 9e139eae..e72ed0cf 100644 --- a/admin/views/costbenefitprojection/view.html.php +++ b/admin/views/costbenefitprojection/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php index 28ba158f..ce3787ca 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php index 70a57fd9..50a4001b 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php index 813c609c..0cd22efc 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php index 01fa6dd6..8c360611 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php index 9a0eb410..eb54d879 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php index 47e33a62..2355b2d7 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php index d5a706af..4a9391be 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php index f2e103f1..20f72e18 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js index 29c2d9d4..fa8f569e 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php index 84deeca3..cc6559a6 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php index eaea13db..0780a8c9 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php index 1543f1ca..5e68be0a 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php index 47283a52..b9ec703f 100644 --- a/admin/views/currencies/tmpl/default_batch_body.php +++ b/admin/views/currencies/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php index d6ad7223..437661ad 100644 --- a/admin/views/currencies/tmpl/default_batch_footer.php +++ b/admin/views/currencies/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php index 9006345e..104c81f1 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php index dff697e9..6724e1d9 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php index 8e253590..2c020422 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php index f96bff2f..037179a9 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php index 4a06885b..6d0c8f78 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js index 8661c4b3..a18aea0e 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php index c6f6a9bc..37a53b5e 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php index 3e8f6c73..e49378d1 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/health_data/submitbutton.js b/admin/views/health_data/submitbutton.js index 529c4534..ba41d62a 100644 --- a/admin/views/health_data/submitbutton.js +++ b/admin/views/health_data/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/health_data/tmpl/edit.php b/admin/views/health_data/tmpl/edit.php index aa73f35c..1dc5b6fa 100644 --- a/admin/views/health_data/tmpl/edit.php +++ b/admin/views/health_data/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/health_data/view.html.php b/admin/views/health_data/view.html.php index 629699ea..95928fc8 100644 --- a/admin/views/health_data/view.html.php +++ b/admin/views/health_data/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/health_data_sets/tmpl/default.php b/admin/views/health_data_sets/tmpl/default.php index 9d715a7b..5e0eab39 100644 --- a/admin/views/health_data_sets/tmpl/default.php +++ b/admin/views/health_data_sets/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_body.php b/admin/views/health_data_sets/tmpl/default_batch_body.php index 6bffbdb4..ee2361bb 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_body.php +++ b/admin/views/health_data_sets/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_footer.php b/admin/views/health_data_sets/tmpl/default_batch_footer.php index a8612efd..fcd06cd4 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_footer.php +++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/health_data_sets/tmpl/default_body.php b/admin/views/health_data_sets/tmpl/default_body.php index e5835e18..719963ed 100644 --- a/admin/views/health_data_sets/tmpl/default_body.php +++ b/admin/views/health_data_sets/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/health_data_sets/tmpl/default_foot.php b/admin/views/health_data_sets/tmpl/default_foot.php index 06c86528..b599a941 100644 --- a/admin/views/health_data_sets/tmpl/default_foot.php +++ b/admin/views/health_data_sets/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/health_data_sets/tmpl/default_head.php b/admin/views/health_data_sets/tmpl/default_head.php index f38f31e8..2622c091 100644 --- a/admin/views/health_data_sets/tmpl/default_head.php +++ b/admin/views/health_data_sets/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/health_data_sets/tmpl/default_toolbar.php b/admin/views/health_data_sets/tmpl/default_toolbar.php index 3f6319b9..d98895c0 100644 --- a/admin/views/health_data_sets/tmpl/default_toolbar.php +++ b/admin/views/health_data_sets/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/health_data_sets/view.html.php b/admin/views/health_data_sets/view.html.php index 201e906d..97b05abf 100644 --- a/admin/views/health_data_sets/view.html.php +++ b/admin/views/health_data_sets/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 7455e040..16db239d 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index 09b60f77..cc562464 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 677e1f79..a62c7bf7 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index 8db953fd..f12403cc 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index faf0f476..7281fc1e 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index f289e6af..05ca16e6 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 1dd16847..16491551 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 9a0eb410..eb54d879 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index 59e987ff..a9fdf7a5 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index e057626e..07436881 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 0839f98c..b1a9da13 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 9610e6f1..a1ab1d2c 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index de5666d6..6cbbb5b5 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/import_health_data_sets/tmpl/default.php b/admin/views/import_health_data_sets/tmpl/default.php index 1fc48d41..78a49f2a 100644 --- a/admin/views/import_health_data_sets/tmpl/default.php +++ b/admin/views/import_health_data_sets/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/import_health_data_sets/view.html.php b/admin/views/import_health_data_sets/view.html.php index f04a2d59..df197f31 100644 --- a/admin/views/import_health_data_sets/view.html.php +++ b/admin/views/import_health_data_sets/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js index 2060e348..bf5ddd45 100644 --- a/admin/views/intervention/submitbutton.js +++ b/admin/views/intervention/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/intervention/tmpl/edit.php b/admin/views/intervention/tmpl/edit.php index 00fd3f2b..6cb99440 100644 --- a/admin/views/intervention/tmpl/edit.php +++ b/admin/views/intervention/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/intervention/view.html.php b/admin/views/intervention/view.html.php index bd8fdfb3..a243e0b6 100644 --- a/admin/views/intervention/view.html.php +++ b/admin/views/intervention/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/interventions/tmpl/default.php b/admin/views/interventions/tmpl/default.php index 8d0e57eb..8bc4d786 100644 --- a/admin/views/interventions/tmpl/default.php +++ b/admin/views/interventions/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/interventions/tmpl/default_batch_body.php b/admin/views/interventions/tmpl/default_batch_body.php index 1bc96b51..c1b90494 100644 --- a/admin/views/interventions/tmpl/default_batch_body.php +++ b/admin/views/interventions/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/interventions/tmpl/default_batch_footer.php b/admin/views/interventions/tmpl/default_batch_footer.php index deb00517..d0c256aa 100644 --- a/admin/views/interventions/tmpl/default_batch_footer.php +++ b/admin/views/interventions/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/interventions/tmpl/default_body.php b/admin/views/interventions/tmpl/default_body.php index 09e65844..7e56e295 100644 --- a/admin/views/interventions/tmpl/default_body.php +++ b/admin/views/interventions/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php index 9a0eb410..eb54d879 100644 --- a/admin/views/interventions/tmpl/default_foot.php +++ b/admin/views/interventions/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/interventions/tmpl/default_head.php b/admin/views/interventions/tmpl/default_head.php index 79a4f199..700d7c0d 100644 --- a/admin/views/interventions/tmpl/default_head.php +++ b/admin/views/interventions/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php index 03de794b..34733b4e 100644 --- a/admin/views/interventions/tmpl/default_toolbar.php +++ b/admin/views/interventions/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/interventions/view.html.php b/admin/views/interventions/view.html.php index 7cec1040..0da96966 100644 --- a/admin/views/interventions/view.html.php +++ b/admin/views/interventions/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/scaling_factor/submitbutton.js b/admin/views/scaling_factor/submitbutton.js index b925c3ec..43ac95fa 100644 --- a/admin/views/scaling_factor/submitbutton.js +++ b/admin/views/scaling_factor/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/scaling_factor/tmpl/edit.php b/admin/views/scaling_factor/tmpl/edit.php index 109778b7..b2c4a730 100644 --- a/admin/views/scaling_factor/tmpl/edit.php +++ b/admin/views/scaling_factor/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/scaling_factor/view.html.php b/admin/views/scaling_factor/view.html.php index 5ef20ab8..eca5b3af 100644 --- a/admin/views/scaling_factor/view.html.php +++ b/admin/views/scaling_factor/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/scaling_factors/tmpl/default.php b/admin/views/scaling_factors/tmpl/default.php index 22ebb3f0..3e601254 100644 --- a/admin/views/scaling_factors/tmpl/default.php +++ b/admin/views/scaling_factors/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_body.php b/admin/views/scaling_factors/tmpl/default_batch_body.php index f0d0db6a..72688890 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_body.php +++ b/admin/views/scaling_factors/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_footer.php b/admin/views/scaling_factors/tmpl/default_batch_footer.php index b30231b1..4cb523c0 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_footer.php +++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/scaling_factors/tmpl/default_body.php b/admin/views/scaling_factors/tmpl/default_body.php index 0d1aee57..72277646 100644 --- a/admin/views/scaling_factors/tmpl/default_body.php +++ b/admin/views/scaling_factors/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/scaling_factors/tmpl/default_foot.php b/admin/views/scaling_factors/tmpl/default_foot.php index 0bcfa62d..2f11edcf 100644 --- a/admin/views/scaling_factors/tmpl/default_foot.php +++ b/admin/views/scaling_factors/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/scaling_factors/tmpl/default_head.php b/admin/views/scaling_factors/tmpl/default_head.php index 20477e75..0f56c25a 100644 --- a/admin/views/scaling_factors/tmpl/default_head.php +++ b/admin/views/scaling_factors/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/scaling_factors/tmpl/default_toolbar.php b/admin/views/scaling_factors/tmpl/default_toolbar.php index 6f5f238b..d6526f0a 100644 --- a/admin/views/scaling_factors/tmpl/default_toolbar.php +++ b/admin/views/scaling_factors/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/scaling_factors/view.html.php b/admin/views/scaling_factors/view.html.php index f5172ab9..cf4e97fb 100644 --- a/admin/views/scaling_factors/view.html.php +++ b/admin/views/scaling_factors/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/service_provider/submitbutton.js b/admin/views/service_provider/submitbutton.js index 58edd308..5550b4b2 100644 --- a/admin/views/service_provider/submitbutton.js +++ b/admin/views/service_provider/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/service_provider/tmpl/edit.php b/admin/views/service_provider/tmpl/edit.php index 22325dcb..444c8185 100644 --- a/admin/views/service_provider/tmpl/edit.php +++ b/admin/views/service_provider/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/service_provider/view.html.php b/admin/views/service_provider/view.html.php index 1f5afabb..86955425 100644 --- a/admin/views/service_provider/view.html.php +++ b/admin/views/service_provider/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/service_providers/tmpl/default.php b/admin/views/service_providers/tmpl/default.php index 6ad26954..b68ab4ba 100644 --- a/admin/views/service_providers/tmpl/default.php +++ b/admin/views/service_providers/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/service_providers/tmpl/default_batch_body.php b/admin/views/service_providers/tmpl/default_batch_body.php index 46c6ef8a..47bcff3e 100644 --- a/admin/views/service_providers/tmpl/default_batch_body.php +++ b/admin/views/service_providers/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/service_providers/tmpl/default_batch_footer.php b/admin/views/service_providers/tmpl/default_batch_footer.php index ee2024ef..ba7d2f23 100644 --- a/admin/views/service_providers/tmpl/default_batch_footer.php +++ b/admin/views/service_providers/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/service_providers/tmpl/default_body.php b/admin/views/service_providers/tmpl/default_body.php index 154495bc..0827ea75 100644 --- a/admin/views/service_providers/tmpl/default_body.php +++ b/admin/views/service_providers/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/service_providers/tmpl/default_foot.php b/admin/views/service_providers/tmpl/default_foot.php index 9a0eb410..eb54d879 100644 --- a/admin/views/service_providers/tmpl/default_foot.php +++ b/admin/views/service_providers/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/service_providers/tmpl/default_head.php b/admin/views/service_providers/tmpl/default_head.php index 70ed9188..2be51462 100644 --- a/admin/views/service_providers/tmpl/default_head.php +++ b/admin/views/service_providers/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/service_providers/tmpl/default_toolbar.php b/admin/views/service_providers/tmpl/default_toolbar.php index 854d3908..01f74b3b 100644 --- a/admin/views/service_providers/tmpl/default_toolbar.php +++ b/admin/views/service_providers/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/service_providers/view.html.php b/admin/views/service_providers/view.html.php index 8f874cf2..ac0f4ab4 100644 --- a/admin/views/service_providers/view.html.php +++ b/admin/views/service_providers/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/whmcs.php b/admin/whmcs.php index 2a8ad166..d1ed43b6 100644 --- a/admin/whmcs.php +++ b/admin/whmcs.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage whmcs.php diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml index 7aee0995..7a12d768 100644 --- a/costbenefitprojection.xml +++ b/costbenefitprojection.xml @@ -1,7 +1,7 @@ COM_COSTBENEFITPROJECTION - 12th June, 2019 + 14th August, 2019 Llewellyn van der Merwe joomla@vdm.io http://www.vdm.io @@ -57,9 +57,7 @@ Benefits are calculated based on the model projecting reductions in workdays los index.html router.php costbenefitprojection.php - costbenefitprojection.php - router.php - controller.php + router.php assets helpers controllers @@ -89,11 +87,6 @@ Benefits are calculated based on the model projecting reductions in workdays los whmcs.php index.html costbenefitprojection.php - access.xml - config.xml - controller.php - costbenefitprojection.php - README.txt README.txt assets controllers diff --git a/media/js/table2excel.js b/media/js/table2excel.js index c9d08e18..d420b6cf 100644 --- a/media/js/table2excel.js +++ b/media/js/table2excel.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage table2excel.js diff --git a/script.php b/script.php index 28731934..f3672e39 100644 --- a/script.php +++ b/script.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage script.php @@ -28,21 +28,27 @@ JHTML::_('behavior.modal'); class com_costbenefitprojectionInstallerScript { /** - * method to install the component + * Constructor * - * @return void + * @param JAdapterInstance $parent The object responsible for running this script */ - function install($parent) - { - - } + public function __construct(JAdapterInstance $parent) {} /** - * method to uninstall the component + * Called on installation * - * @return void + * @param JAdapterInstance $parent The object responsible for running this script + * + * @return boolean True on success */ - function uninstall($parent) + public function install(JAdapterInstance $parent) {} + + /** + * Called on uninstallation + * + * @param JAdapterInstance $parent The object responsible for running this script + */ + public function uninstall(JAdapterInstance $parent) { // Get Application object $app = JFactory::getApplication(); @@ -852,57 +858,63 @@ class com_costbenefitprojectionInstallerScript } /** - * method to update the component + * Called on update * - * @return void + * @param JAdapterInstance $parent The object responsible for running this script + * + * @return boolean True on success */ - function update($parent) - { - - } + public function update(JAdapterInstance $parent){} /** - * method to run before an install/update/uninstall method + * Called before any type of action * - * @return void + * @param string $type Which action is happening (install|uninstall|discover_install|update) + * @param JAdapterInstance $parent The object responsible for running this script + * + * @return boolean True on success */ - function preflight($type, $parent) + public function preflight($type, JAdapterInstance $parent) { // get application $app = JFactory::getApplication(); - // is redundant ...hmmm - if ($type == 'uninstall') + // is redundant or so it seems ...hmmm let me know if it works again + if ($type === 'uninstall') { return true; } // the default for both install and update $jversion = new JVersion(); - if (!$jversion->isCompatible('3.6.0')) + if (!$jversion->isCompatible('3.8.0')) { - $app->enqueueMessage('Please upgrade to at least Joomla! 3.6.0 before continuing!', 'error'); + $app->enqueueMessage('Please upgrade to at least Joomla! 3.8.0 before continuing!', 'error'); return false; } // do any updates needed - if ($type == 'update') + if ($type === 'update') { } // do any install needed - if ($type == 'install') + if ($type === 'install') { } + return true; } /** - * method to run after an install/update/uninstall method + * Called after any type of action * - * @return void + * @param string $type Which action is happening (install|uninstall|discover_install|update) + * @param JAdapterInstance $parent The object responsible for running this script + * + * @return boolean True on success */ - function postflight($type, $parent) + public function postflight($type, JAdapterInstance $parent) { // get application $app = JFactory::getApplication(); // set the default component settings - if ($type == 'install') + if ($type === 'install') { // Get The Database object @@ -1036,7 +1048,7 @@ class com_costbenefitprojectionInstallerScript '; } // do any updates needed - if ($type == 'update') + if ($type === 'update') { // Get The Database object @@ -1309,5 +1321,6 @@ class com_costbenefitprojectionInstallerScript

Upgrade to Version 3.4.4 Was Successful! Let us know if anything is not working as expected.

'; } + return true; } } diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css index e547bfa9..e6f07f24 100644 --- a/site/assets/css/combinedresults.css +++ b/site/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/site/assets/css/company.css b/site/assets/css/company.css index a60ef11e..203893e2 100644 --- a/site/assets/css/company.css +++ b/site/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css index 2ad8b033..4f2c9105 100644 --- a/site/assets/css/companyresults.css +++ b/site/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css index 87bb445b..04caf597 100644 --- a/site/assets/css/cpanel.css +++ b/site/assets/css/cpanel.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.css diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css index af0f4cd2..1b7c17de 100644 --- a/site/assets/css/createaccount.css +++ b/site/assets/css/createaccount.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.css diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css index fab44751..3892d803 100644 --- a/site/assets/css/intervention.css +++ b/site/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/site/assets/css/publicresults.css b/site/assets/css/publicresults.css index 82497ef3..b6b35667 100644 --- a/site/assets/css/publicresults.css +++ b/site/assets/css/publicresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publicresults.css diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css index bc402654..11ab16f2 100644 --- a/site/assets/css/scaling_factor.css +++ b/site/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index f8272c4e..3a8961bb 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 29d18a67..cbd9e4fe 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.js diff --git a/site/controller.php b/site/controller.php index c9811162..a54c03b8 100644 --- a/site/controller.php +++ b/site/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index d0e27b24..24c6b107 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php @@ -47,7 +47,7 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy // Check Token! $token = JSession::getFormToken(); $call_token = $jinput->get('token', 0, 'ALNUM'); - if($token == $call_token) + if($jinput->get($token, 0, 'ALNUM') || $token === $call_token) { $task = $this->getTask(); switch($task) diff --git a/site/controllers/company.php b/site/controllers/company.php index cc73b598..6c45bb76 100644 --- a/site/controllers/company.php +++ b/site/controllers/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/site/controllers/help.php b/site/controllers/help.php index bf9cb108..294e26b4 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php index e353db5b..6f181025 100644 --- a/site/controllers/intervention.php +++ b/site/controllers/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/site/controllers/scaling_factor.php b/site/controllers/scaling_factor.php index 25b823a7..3f963705 100644 --- a/site/controllers/scaling_factor.php +++ b/site/controllers/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php index 10e4764e..c945c0cd 100644 --- a/site/costbenefitprojection.php +++ b/site/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/site/helpers/category.php b/site/helpers/category.php index 6e869a4f..83247a09 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage category.php diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php index ca24be95..01690e5a 100644 --- a/site/helpers/costbenefitprojection.php +++ b/site/helpers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -776,38 +776,42 @@ abstract class CostbenefitprojectionHelper /** * Get any component's model **/ - public static function getModel($name, $path = JPATH_COMPONENT_SITE, $component = 'Costbenefitprojection', $config = array()) + public static function getModel($name, $path = JPATH_COMPONENT_SITE, $Component = 'Costbenefitprojection', $config = array()) { // fix the name $name = self::safeString($name); - // full path - $fullPath = $path . '/models'; - // set prefix - $prefix = $component.'Model'; + // full path to models + $fullPathModels = $path . '/models'; // load the model file - JModelLegacy::addIncludePath($fullPath, $prefix); + JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model'); + // make sure the table path is loaded + if (!isset($config['table_path']) || !self::checkString($config['table_path'])) + { + // This is the JCB default path to tables in Joomla 3.x + $config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables'; + } // get instance - $model = JModelLegacy::getInstance($name, $prefix, $config); + $model = JModelLegacy::getInstance($name, $Component . 'Model', $config); // if model not found (strange) if ($model == false) { jimport('joomla.filesystem.file'); // get file path - $filePath = $path.'/'.$name.'.php'; - $fullPath = $fullPath.'/'.$name.'.php'; + $filePath = $path . '/' . $name . '.php'; + $fullPathModel = $fullPathModels . '/' . $name . '.php'; // check if it exists if (JFile::exists($filePath)) { // get the file require_once $filePath; } - elseif (JFile::exists($fullPath)) + elseif (JFile::exists($fullPathModel)) { // get the file - require_once $fullPath; + require_once $fullPathModel; } // build class names - $modelClass = $prefix.$name; + $modelClass = $Component . 'Model' . $name; if (class_exists($modelClass)) { // initialize the model diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index f716d5d2..fa5f07da 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 1b02cdd2..f253715a 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage route.php diff --git a/site/language/en-GB/en-GB.com_costbenefitprojection.ini b/site/language/en-GB/en-GB.com_costbenefitprojection.ini index 9f5fffdf..9e537986 100644 --- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -77,7 +77,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_DEPARTMENT="Department" COM_COSTBENEFITPROJECTION_COMPANY_DEPARTMENT_LABEL="Department" COM_COSTBENEFITPROJECTION_COMPANY_DETAILS="Details" COM_COSTBENEFITPROJECTION_COMPANY_EDIT="Editing the Company" -COM_COSTBENEFITPROJECTION_COMPANY_EMAIL="Email" +COM_COSTBENEFITPROJECTION_COMPANY_EMAIL="Company Email" COM_COSTBENEFITPROJECTION_COMPANY_EMAIL_DESCRIPTION="Enter Email" COM_COSTBENEFITPROJECTION_COMPANY_EMAIL_HINT="demo@example.com" COM_COSTBENEFITPROJECTION_COMPANY_EMAIL_LABEL="Email" @@ -177,7 +177,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_HINT="You can make a comment COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_LABEL="Turnover Comment" COM_COSTBENEFITPROJECTION_COMPANY_TWENTYTWENTY_FOUR="20-24" COM_COSTBENEFITPROJECTION_COMPANY_TWENTY_FIVETWENTY_NINE="25-29" -COM_COSTBENEFITPROJECTION_COMPANY_USER="User" +COM_COSTBENEFITPROJECTION_COMPANY_USER="Company User" COM_COSTBENEFITPROJECTION_COMPANY_USER_HINT="select a member" COM_COSTBENEFITPROJECTION_COMPANY_USER_LABEL="User (Member)" COM_COSTBENEFITPROJECTION_COMPANY_VERSION_DESC="A count of the number of times this Company has been revised." diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php index 038ad365..eb35430b 100644 --- a/site/layouts/appnotice.php +++ b/site/layouts/appnotice.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage appnotice.php diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php index d1a7598e..38b141b4 100644 --- a/site/layouts/company/age_groups_percentages_fullwidth.php +++ b/site/layouts/company/age_groups_percentages_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'age_groups_note' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php index d73cf3de..d857ed31 100644 --- a/site/layouts/company/age_groups_percentages_left.php +++ b/site/layouts/company/age_groups_percentages_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'percentmale' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php index 8bca5292..4f81622b 100644 --- a/site/layouts/company/age_groups_percentages_right.php +++ b/site/layouts/company/age_groups_percentages_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'percentfemale' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php index a799c1d3..69c796bf 100644 --- a/site/layouts/company/causerisk_selection_fullwidth.php +++ b/site/layouts/company/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'causesrisks', 'cause_risk_selection_note' ); @@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php index 605e6fd9..f268c41d 100644 --- a/site/layouts/company/details_above.php +++ b/site/layouts/company/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'name', 'user', 'department' @@ -31,6 +42,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -39,3 +51,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php index d5eef54b..c94f58f4 100644 --- a/site/layouts/company/details_left.php +++ b/site/layouts/company/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'per', 'email', 'country', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php index d6b38270..6257fba6 100644 --- a/site/layouts/company/details_right.php +++ b/site/layouts/company/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'working_days', 'total_salary', 'total_healthcare', @@ -39,9 +50,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php index e2038ef2..38e6aa11 100644 --- a/site/layouts/company/details_under.php +++ b/site/layouts/company/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'not_required' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php index a616ffe8..e0cc7196 100644 --- a/site/layouts/company/interventions_fullwidth.php +++ b/site/layouts/company/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php index 069725ec..0d5caa11 100644 --- a/site/layouts/company/publishing.php +++ b/site/layouts/company/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php index f6f7efa6..3829a139 100644 --- a/site/layouts/company/publlshing.php +++ b/site/layouts/company/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'access', @@ -34,9 +45,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php index e27deccb..1aed59b1 100644 --- a/site/layouts/company/scaling_factors_fullwidth.php +++ b/site/layouts/company/scaling_factors_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php diff --git a/site/layouts/companydetails.php b/site/layouts/companydetails.php index 082d10e1..34a2d29d 100644 --- a/site/layouts/companydetails.php +++ b/site/layouts/companydetails.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companydetails.php diff --git a/site/layouts/databreakdownmalefemale.php b/site/layouts/databreakdownmalefemale.php index a37a4415..0a6a00f5 100644 --- a/site/layouts/databreakdownmalefemale.php +++ b/site/layouts/databreakdownmalefemale.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php index 7a945872..14c3969f 100644 --- a/site/layouts/intervention/details_above.php +++ b/site/layouts/intervention/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'name', 'company', 'country', @@ -32,6 +43,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -40,3 +52,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php index c1748e98..9230bdfe 100644 --- a/site/layouts/intervention/details_fullwidth.php +++ b/site/layouts/intervention/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'coverage', 'duration', 'share', @@ -33,6 +44,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -41,3 +53,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php index e2038ef2..38e6aa11 100644 --- a/site/layouts/intervention/details_under.php +++ b/site/layouts/intervention/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'not_required' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php index 069725ec..0d5caa11 100644 --- a/site/layouts/intervention/publishing.php +++ b/site/layouts/intervention/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php index 53bff773..43a81817 100644 --- a/site/layouts/intervention/publlshing.php +++ b/site/layouts/intervention/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'version', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php index 7f543d3b..7776b2d5 100644 --- a/site/layouts/intervention/settings_fullwidth.php +++ b/site/layouts/intervention/settings_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php @@ -20,15 +20,27 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'intervention' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -37,3 +49,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php index 5334f6fc..7d5584f0 100644 --- a/site/layouts/intervention/settings_left.php +++ b/site/layouts/intervention/settings_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php @@ -20,18 +20,31 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'interventions' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php index 5be469f1..97f9244b 100644 --- a/site/layouts/scaling_factor/details_above.php +++ b/site/layouts/scaling_factor/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'company', 'country' ); @@ -30,6 +41,7 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> +
@@ -38,3 +50,4 @@ $hiddenFields = $displayData->get('hidden_fields') ?: array(); renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?>
+ diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php index bbf8571b..7f884ba7 100644 --- a/site/layouts/scaling_factor/details_left.php +++ b/site/layouts/scaling_factor/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'causerisk', 'reference' ); @@ -30,9 +41,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php index 05ea68ab..04bb81aa 100644 --- a/site/layouts/scaling_factor/details_right.php +++ b/site/layouts/scaling_factor/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'yld_scaling_factor_males', 'yld_scaling_factor_females', 'mortality_scaling_factor_males', @@ -35,9 +46,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php index 069725ec..0d5caa11 100644 --- a/site/layouts/scaling_factor/publishing.php +++ b/site/layouts/scaling_factor/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'created', 'created_by', 'modified', @@ -32,9 +43,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php index 53bff773..43a81817 100644 --- a/site/layouts/scaling_factor/publlshing.php +++ b/site/layouts/scaling_factor/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php @@ -20,9 +20,20 @@ // No direct access to this file defined('_JEXEC') or die('Restricted access'); +// get the form $form = $displayData->getForm(); -$fields = $displayData->get('fields') ?: array( +// get the layout fields override method name (from layout path/ID) +$layout_path_array = explode('.', $this->getLayoutId()); +// Since we cannot pass the layout and tab names as parameters to the model method +// this name combination of tab and layout in the method name is the only work around +// seeing that JCB uses those two values (tab_name & layout_name) as the layout file name. +// example of layout name: details_left.php +// example of method name: getFields_details_left() +$fields_tab_layout = 'fields_' . $layout_path_array[1]; + +// get the fields +$fields = $displayData->get($fields_tab_layout) ?: array( 'published', 'ordering', 'version', @@ -33,9 +44,11 @@ $fields = $displayData->get('fields') ?: array( $hiddenFields = $displayData->get('hidden_fields') ?: array(); ?> + setFieldAttribute($field, 'type', 'hidden'); ?> renderField($field, null, null, array('class' => 'control-wrapper-' . $field)); ?> + diff --git a/site/models/ajax.php b/site/models/ajax.php index 3afc6baf..dd03dfab 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/site/models/combinedresults.php b/site/models/combinedresults.php index 251ca6fd..22b04302 100644 --- a/site/models/combinedresults.php +++ b/site/models/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/site/models/company.php b/site/models/company.php index 05b4b8a1..b2d4454c 100644 --- a/site/models/company.php +++ b/site/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -26,13 +26,68 @@ use Joomla\Registry\Registry; * Costbenefitprojection Company Model */ class CostbenefitprojectionModelCompany extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'per', + 'email', + 'country', + 'service_provider', + 'datayear' + ), + 'right' => array( + 'working_days', + 'total_salary', + 'total_healthcare', + 'productivity_losses', + 'males', + 'females', + 'medical_turnovers_males', + 'medical_turnovers_females', + 'turnover_comment', + 'sick_leave_males', + 'sick_leave_females' + ), + 'above' => array( + 'name', + 'user', + 'department' + ), + 'under' => array( + 'not_required' + ) + ), + 'causerisk_selection' => array( + 'fullwidth' => array( + 'causesrisks', + 'cause_risk_selection_note' + ) + ), + 'age_groups_percentages' => array( + 'left' => array( + 'percentmale' + ), + 'right' => array( + 'percentfemale' + ), + 'fullwidth' => array( + 'age_groups_note' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/site/models/companyresults.php b/site/models/companyresults.php index 80f6b7a5..121e5061 100644 --- a/site/models/companyresults.php +++ b/site/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/site/models/cpanel.php b/site/models/cpanel.php index 1883f0ef..97d3c067 100644 --- a/site/models/cpanel.php +++ b/site/models/cpanel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.php diff --git a/site/models/createaccount.php b/site/models/createaccount.php index 26f9bf3e..71279299 100644 --- a/site/models/createaccount.php +++ b/site/models/createaccount.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.php diff --git a/site/models/forms/company.js b/site/models/forms/company.js index e1d2d8a9..74b29a80 100644 --- a/site/models/forms/company.js +++ b/site/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/site/models/forms/intervention.js b/site/models/forms/intervention.js index f349530a..368bf6b4 100644 --- a/site/models/forms/intervention.js +++ b/site/models/forms/intervention.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js diff --git a/site/models/forms/scaling_factor.js b/site/models/forms/scaling_factor.js index 355ac706..e7776e87 100644 --- a/site/models/forms/scaling_factor.js +++ b/site/models/forms/scaling_factor.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.js diff --git a/site/models/intervention.php b/site/models/intervention.php index 8e24274e..cba4cc54 100644 --- a/site/models/intervention.php +++ b/site/models/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php @@ -26,13 +26,47 @@ use Joomla\Registry\Registry; * Costbenefitprojection Intervention Model */ class CostbenefitprojectionModelIntervention extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'fullwidth' => array( + 'coverage', + 'duration', + 'share', + 'description', + 'reference' + ), + 'above' => array( + 'name', + 'company', + 'country', + 'type' + ), + 'under' => array( + 'not_required' + ) + ), + 'settings' => array( + 'left' => array( + 'interventions' + ), + 'fullwidth' => array( + 'intervention' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/site/models/publicresults.php b/site/models/publicresults.php index caf1acef..b9e99ad8 100644 --- a/site/models/publicresults.php +++ b/site/models/publicresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publicresults.php diff --git a/site/models/scaling_factor.php b/site/models/scaling_factor.php index 67d20839..104d6b7f 100644 --- a/site/models/scaling_factor.php +++ b/site/models/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php @@ -26,13 +26,40 @@ use Joomla\Registry\Registry; * Costbenefitprojection Scaling_factor Model */ class CostbenefitprojectionModelScaling_factor extends JModelAdmin -{ +{ + /** + * The tab layout fields array. + * + * @var array + */ + protected $tabLayoutFields = array( + 'details' => array( + 'left' => array( + 'causerisk', + 'reference' + ), + 'right' => array( + 'yld_scaling_factor_males', + 'yld_scaling_factor_females', + 'mortality_scaling_factor_males', + 'mortality_scaling_factor_females', + 'presenteeism_scaling_factor_males', + 'presenteeism_scaling_factor_females', + 'health_scaling_factor' + ), + 'above' => array( + 'company', + 'country' + ) + ) + ); + /** * @var string The prefix to use with controller messages. * @since 1.6 */ protected $text_prefix = 'COM_COSTBENEFITPROJECTION'; - + /** * The type alias for this content type. * diff --git a/site/router.php b/site/router.php index ddab8bc3..9092f68c 100644 --- a/site/router.php +++ b/site/router.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage router.php @@ -242,6 +242,8 @@ class CostbenefitprojectionRouter extends JComponentRouterBase { $getTable = '#__categories'; $query->from($db->quoteName($getTable)); + // we need this to target the components categories (TODO will keep an eye on this) + $query->where($db->quoteName('extension') . ' LIKE '. $db->quote((string)'com_' . $main . '%')); } else { diff --git a/site/views/combinedresults/tmpl/default.php b/site/views/combinedresults/tmpl/default.php index 3e77fc2e..0dc41e4b 100644 --- a/site/views/combinedresults/tmpl/default.php +++ b/site/views/combinedresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/combinedresults/tmpl/default_chart_cost.php b/site/views/combinedresults/tmpl/default_chart_cost.php index 2dd00246..1c1a2b12 100644 --- a/site/views/combinedresults/tmpl/default_chart_cost.php +++ b/site/views/combinedresults/tmpl/default_chart_cost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/site/views/combinedresults/tmpl/default_chart_cost_percent.php b/site/views/combinedresults/tmpl/default_chart_cost_percent.php index 01e3dbc0..dc5cfd63 100644 --- a/site/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/site/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index ded2109e..05caf6f6 100644 --- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php index 4c44a322..24664f6d 100644 --- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php +++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_save.php diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php index 087e4223..cb7ee1e9 100644 --- a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index 3fca6ed1..4e0e4135 100644 --- a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index 7c6ef301..05964ff7 100644 --- a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/site/views/combinedresults/tmpl/default_table_cost_summary.php b/site/views/combinedresults/tmpl/default_table_cost_summary.php index f66d0817..547fecf8 100644 --- a/site/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_cost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index 66e778e0..b15eaed0 100644 --- a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index 4e42ca02..19ecc203 100644 --- a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/site/views/combinedresults/view.html.php b/site/views/combinedresults/view.html.php index 7318270e..5a080d99 100644 --- a/site/views/combinedresults/view.html.php +++ b/site/views/combinedresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/company/submitbutton.js b/site/views/company/submitbutton.js index f1fa589b..e586a92f 100644 --- a/site/views/company/submitbutton.js +++ b/site/views/company/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/company/tmpl/edit.php b/site/views/company/tmpl/edit.php index c5bf7914..d69edaf7 100644 --- a/site/views/company/tmpl/edit.php +++ b/site/views/company/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/company/view.html.php b/site/views/company/view.html.php index 44510bf3..4f245b8f 100644 --- a/site/views/company/view.html.php +++ b/site/views/company/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/companyresults/tmpl/default.php b/site/views/companyresults/tmpl/default.php index a3134af9..10c57f69 100644 --- a/site/views/companyresults/tmpl/default.php +++ b/site/views/companyresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/companyresults/tmpl/default_chart_cost.php b/site/views/companyresults/tmpl/default_chart_cost.php index 2dd00246..1c1a2b12 100644 --- a/site/views/companyresults/tmpl/default_chart_cost.php +++ b/site/views/companyresults/tmpl/default_chart_cost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/site/views/companyresults/tmpl/default_chart_cost_percent.php b/site/views/companyresults/tmpl/default_chart_cost_percent.php index 01e3dbc0..dc5cfd63 100644 --- a/site/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/site/views/companyresults/tmpl/default_chart_cost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index ded2109e..05caf6f6 100644 --- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php index 4c44a322..24664f6d 100644 --- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php +++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_save.php diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost.php b/site/views/companyresults/tmpl/default_chart_work_days_lost.php index 087e4223..cb7ee1e9 100644 --- a/site/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/site/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index 3fca6ed1..4e0e4135 100644 --- a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index 7c6ef301..05964ff7 100644 --- a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/site/views/companyresults/tmpl/default_table_cost_summary.php b/site/views/companyresults/tmpl/default_table_cost_summary.php index f66d0817..547fecf8 100644 --- a/site/views/companyresults/tmpl/default_table_cost_summary.php +++ b/site/views/companyresults/tmpl/default_table_cost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php index 66e778e0..b15eaed0 100644 --- a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php index 4e42ca02..19ecc203 100644 --- a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/site/views/companyresults/view.html.php b/site/views/companyresults/view.html.php index c0bc14c0..64dbb661 100644 --- a/site/views/companyresults/view.html.php +++ b/site/views/companyresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/cpanel/tmpl/default.php b/site/views/cpanel/tmpl/default.php index 9b183374..9ef0aace 100644 --- a/site/views/cpanel/tmpl/default.php +++ b/site/views/cpanel/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/cpanel/view.html.php b/site/views/cpanel/view.html.php index 98044cb7..585064e3 100644 --- a/site/views/cpanel/view.html.php +++ b/site/views/cpanel/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/createaccount/tmpl/default.php b/site/views/createaccount/tmpl/default.php index 2844ea79..442d5865 100644 --- a/site/views/createaccount/tmpl/default.php +++ b/site/views/createaccount/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/createaccount/tmpl/default_cbpmenumodule.php b/site/views/createaccount/tmpl/default_cbpmenumodule.php index 95096693..3c9a25f9 100644 --- a/site/views/createaccount/tmpl/default_cbpmenumodule.php +++ b/site/views/createaccount/tmpl/default_cbpmenumodule.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_cbpmenumodule.php diff --git a/site/views/createaccount/view.html.php b/site/views/createaccount/view.html.php index 9833c5e6..302496c5 100644 --- a/site/views/createaccount/view.html.php +++ b/site/views/createaccount/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/intervention/submitbutton.js b/site/views/intervention/submitbutton.js index 2060e348..bf5ddd45 100644 --- a/site/views/intervention/submitbutton.js +++ b/site/views/intervention/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/intervention/tmpl/edit.php b/site/views/intervention/tmpl/edit.php index 48d348ad..1041628e 100644 --- a/site/views/intervention/tmpl/edit.php +++ b/site/views/intervention/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/intervention/view.html.php b/site/views/intervention/view.html.php index be4d60f3..441d2262 100644 --- a/site/views/intervention/view.html.php +++ b/site/views/intervention/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/publicresults/tmpl/default.php b/site/views/publicresults/tmpl/default.php index 7f0c65dc..f980e587 100644 --- a/site/views/publicresults/tmpl/default.php +++ b/site/views/publicresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/publicresults/tmpl/default_cbpmenumodule.php b/site/views/publicresults/tmpl/default_cbpmenumodule.php index 95096693..3c9a25f9 100644 --- a/site/views/publicresults/tmpl/default_cbpmenumodule.php +++ b/site/views/publicresults/tmpl/default_cbpmenumodule.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_cbpmenumodule.php diff --git a/site/views/publicresults/tmpl/default_chart_cost_public.php b/site/views/publicresults/tmpl/default_chart_cost_public.php index 426c96b8..b2b46264 100644 --- a/site/views/publicresults/tmpl/default_chart_cost_public.php +++ b/site/views/publicresults/tmpl/default_chart_cost_public.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_public.php diff --git a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php index f725e950..597e41a3 100644 --- a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php +++ b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_public.php diff --git a/site/views/publicresults/tmpl/default_contact_form_public.php b/site/views/publicresults/tmpl/default_contact_form_public.php index 360d2299..a67b6723 100644 --- a/site/views/publicresults/tmpl/default_contact_form_public.php +++ b/site/views/publicresults/tmpl/default_contact_form_public.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_contact_form_public.php diff --git a/site/views/publicresults/view.html.php b/site/views/publicresults/view.html.php index 5952f3df..c2b8f57f 100644 --- a/site/views/publicresults/view.html.php +++ b/site/views/publicresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/scaling_factor/submitbutton.js b/site/views/scaling_factor/submitbutton.js index b925c3ec..43ac95fa 100644 --- a/site/views/scaling_factor/submitbutton.js +++ b/site/views/scaling_factor/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/scaling_factor/tmpl/edit.php b/site/views/scaling_factor/tmpl/edit.php index b19a5986..8170abba 100644 --- a/site/views/scaling_factor/tmpl/edit.php +++ b/site/views/scaling_factor/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/scaling_factor/view.html.php b/site/views/scaling_factor/view.html.php index 75913edb..798ca420 100644 --- a/site/views/scaling_factor/view.html.php +++ b/site/views/scaling_factor/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 12th June, 2019 + @build 14th August, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php