diff --git a/README.md b/README.md index a6bd4c4a..a9579f53 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ max_input_vars = 5000 + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io) + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 -+ *Last Build*: 19th February, 2016 ++ *Last Build*: 20th February, 2016 + *Version*: 3.3.4 + *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*: **83518** ++ *Line count*: **83590** + *File count*: **550** + *Folder count*: **101** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 260a368f..ff249937 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 fa8f935c..b5aae54f 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 1b926445..b1458931 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 b339ec59..6e59496f 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 f4ad0ad9..7b859861 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 1089ebc1..17f8e751 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 575a35e6..bf6fcced 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 6ad4d73a..a473fa5e 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 d41b270e..c90dbb09 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 6163c992..2e19a46a 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 ee711df6..e245af8c 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 b32e7e55..5f4b0676 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 291a95b0..8e0fe23f 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 4b296b66..9d9f14b1 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 0446f68c..d17284fa 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 7ee2c873..330941b9 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 a022e4bf..362c628d 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 320a9b62..e3b875c7 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 b8f6240e..0f3687c8 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 f8f2ab3c..181e2a08 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 be115c1f..2a4e71f2 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 27f75997..68fdee55 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/controller.php b/admin/controller.php index 181e3d7b..26350f67 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 ac93d7ac..41fb532e 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index f07b8c72..df45e1c7 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index 8f1b5e79..b889a25d 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index 63c50a5d..f83a3316 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index 99610819..897a1b97 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/controllers/company.php b/admin/controllers/company.php index 111024bf..e1bd2310 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index 5d47300f..37e677da 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index bf5e452f..ca40fe72 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 4ff2ee1b..5097d0f8 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/controllers/country.php b/admin/controllers/country.php index d7babc8b..305ff694 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index 205450a9..08c4d342 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index b2e6b774..d23b73e7 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 e35cfc00..3ba67eeb 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 5634aa56..ddf6071b 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 ac8d4cbe..d8318750 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 e4aef41c..b410357e 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 7319aa1f..26ebe8d0 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 7ae8536c..528ff515 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index af25e287..928a99d3 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index d132094d..463b1c6d 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 8bc623c6..e2bd36d6 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 fe8fc71f..1f46adb2 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 f11939c1..ca37b375 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 98fd2fa3..a49eef57 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index 0a5ccec8..f7fdc3d8 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index 88e5a3a3..43488bf7 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index c2155ce5..c43e6e8f 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batch_.php diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index e7d3d083..ee9db118 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sum.php diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index dd9dcc6f..c420c11b 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sumcombine.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index c4009c49..9d659c2b 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 00970e5c..efebdbff 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index 936274e4..3756acab 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index b0035ac5..96850b04 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index 2266f120..20e8333f 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index 15f237c4..be48c7d9 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index 5868fa33..0e64aa0e 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index ec954832..b0f6eef3 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index 125f523b..3810b144 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index 4546f472..afe9c64d 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index b589e8bc..dd15b471 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index 74e2b020..21bff0d6 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index d04be49f..34da3e25 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->qntinterventions; +$items = $displayData->fzxinterventions; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index b0035ac5..96850b04 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index 6bdb2c98..28a70e15 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->olrscaling_factors; +$items = $displayData->kmcscaling_factors; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit"; diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index 15f237c4..be48c7d9 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index 5868fa33..0e64aa0e 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index 581f1ee9..3b356e5b 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index ef94c66d..4296b122 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->iebcompanies; +$items = $displayData->ottcompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 35a4c321..a2974e9e 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index 5a65aa86..b8d7d3b1 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index 06b85825..5534139d 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index cb4bc013..cac921b4 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_left.php diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index 910e623d..01234c7d 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_right.php diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index 7c4ffd09..fa5c56df 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->elvinterventions; +$items = $displayData->bmwinterventions; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index 89a7421b..fa67fecf 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage public_details_fullwidth.php diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index b0035ac5..96850b04 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index f62b9562..a819a97a 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->wnzservice_providers; +$items = $displayData->igvservice_providers; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit"; diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index f2d069aa..26ffcba4 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 5a7f7b5c..61263f06 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index 468b9656..f397e9bf 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index b0035ac5..96850b04 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index 3d476084..8f7b8d03 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 888ce5b7..ce44cd24 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index f7bf50f9..dd72df3e 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index 0180d26d..f40b7748 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index d49aaeb1..021cefa0 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_rightside.php diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index b0035ac5..96850b04 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index cbd15649..b0c19c58 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 8215c33f..9369e892 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 74af54fc..ca3fd783 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 2e56e90e..f038c10d 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 74e2b020..21bff0d6 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 0be6cf1d..348fd9e4 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index 58c7e857..387bfb9e 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index c1e608b2..c313925a 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index 74e2b020..21bff0d6 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index 0be6cf1d..348fd9e4 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index 8f98677f..0f23e1b3 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index 6e2321f8..a520f27f 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index 9b627a18..2c682eea 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index 58cc5ccb..a7c63bcf 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index 5563ad83..6b500867 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index 0be6cf1d..348fd9e4 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index 374070b7..efd44679 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->pbkcompanies; +$items = $displayData->wqkcompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index e9f451f2..62fbd4ae 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php index b87803e6..84cd3333 100644 --- a/admin/layouts/service_provider/details_fullwidth.php +++ b/admin/layouts/service_provider/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index 8c323d72..f68f9e46 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index 0be6cf1d..348fd9e4 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 1fe0ccc7..3cfeabc1 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index 5d185d99..2be72c1a 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php @@ -145,6 +145,12 @@ class CostbenefitprojectionModelCauserisk extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection')) { diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 6912af87..3aa355dd 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index 84f5cb82..1ebf237f 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/models/companies.php b/admin/models/companies.php index c084d3e0..3cf80f00 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/models/company.php b/admin/models/company.php index ce5c6851..05e1f694 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.company'); } } - $this->companyajof = $item->id; - $this->companyyyxj = $item->id; + $this->companymbsd = $item->id; + $this->companyeilg = $item->id; return $item; } @@ -165,7 +165,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getOlrscaling_factors() + public function getKmcscaling_factors() { // Get the user object. $user = JFactory::getUser(); @@ -204,15 +204,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $query->select($db->quoteName('h.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')'); - // Filter by companyajof global. - $companyajof = $this->companyajof; - if (is_numeric($companyajof )) + // Filter by companymbsd global. + $companymbsd = $this->companymbsd; + if (is_numeric($companymbsd )) { - $query->where('a.company = ' . (int) $companyajof ); + $query->where('a.company = ' . (int) $companymbsd ); } - elseif (is_string($companyajof)) + elseif (is_string($companymbsd)) { - $query->where('a.company = ' . $db->quote($companyajof)); + $query->where('a.company = ' . $db->quote($companymbsd)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getQntinterventions() + public function getFzxinterventions() { // Get the user object. $user = JFactory::getUser(); @@ -290,15 +290,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $query->select($db->quoteName('g.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by companyyyxj global. - $companyyyxj = $this->companyyyxj; - if (is_numeric($companyyyxj )) + // Filter by companyeilg global. + $companyeilg = $this->companyeilg; + if (is_numeric($companyeilg )) { - $query->where('a.company = ' . (int) $companyyyxj ); + $query->where('a.company = ' . (int) $companyeilg ); } - elseif (is_string($companyyyxj)) + elseif (is_string($companyeilg)) { - $query->where('a.company = ' . $db->quote($companyyyxj)); + $query->where('a.company = ' . $db->quote($companyeilg)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationQntinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationFzxinterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - public function selectionTranslationQntinterventions($value,$name) + public function selectionTranslationFzxinterventions($value,$name) { // Array of type language strings if ($name == 'type') @@ -429,6 +429,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if ($id != 0 && (!$user->authorise('company.edit.created_by', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.created_by', 'com_costbenefitprojection'))) diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index daffeb3e..034030e3 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index 6923d050..9d1150a4 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/models/countries.php b/admin/models/countries.php index e4d1b239..b2c442f6 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/country.php b/admin/models/country.php index ddbf520d..d860e117 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php @@ -101,9 +101,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.country'); } } - $this->countryozjb = $item->id; - $this->countryhtgc = $item->id; - $this->countryxhbr = $item->id; + $this->countryzmlp = $item->id; + $this->countryzqkx = $item->id; + $this->countryngav = $item->id; return $item; } @@ -113,7 +113,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getElvinterventions() + public function getBmwinterventions() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('g.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by countryozjb global. - $countryozjb = $this->countryozjb; - if (is_numeric($countryozjb )) + // Filter by countryzmlp global. + $countryzmlp = $this->countryzmlp; + if (is_numeric($countryzmlp )) { - $query->where('a.country = ' . (int) $countryozjb ); + $query->where('a.country = ' . (int) $countryzmlp ); } - elseif (is_string($countryozjb)) + elseif (is_string($countryzmlp)) { - $query->where('a.country = ' . $db->quote($countryozjb)); + $query->where('a.country = ' . $db->quote($countryzmlp)); } else { @@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationElvinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationBmwinterventions($item->type, 'type'); } } @@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationElvinterventions($value,$name) + public function selectionTranslationBmwinterventions($value,$name) { // Array of type language strings if ($name == 'type') @@ -246,7 +246,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWnzservice_providers() + public function getIgvservice_providers() { // Get the user object. $user = JFactory::getUser(); @@ -285,15 +285,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('h.name','country_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')'); - // Filter by countryhtgc global. - $countryhtgc = $this->countryhtgc; - if (is_numeric($countryhtgc )) + // Filter by countryzqkx global. + $countryzqkx = $this->countryzqkx; + if (is_numeric($countryzqkx )) { - $query->where('a.country = ' . (int) $countryhtgc ); + $query->where('a.country = ' . (int) $countryzqkx ); } - elseif (is_string($countryhtgc)) + elseif (is_string($countryzqkx)) { - $query->where('a.country = ' . $db->quote($countryhtgc)); + $query->where('a.country = ' . $db->quote($countryzqkx)); } else { @@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getIebcompanies() + public function getOttcompanies() { // Get the user object. $user = JFactory::getUser(); @@ -379,15 +379,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('i.user','service_provider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.service_provider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by countryxhbr global. - $countryxhbr = $this->countryxhbr; - if (is_numeric($countryxhbr )) + // Filter by countryngav global. + $countryngav = $this->countryngav; + if (is_numeric($countryngav )) { - $query->where('a.country = ' . (int) $countryxhbr ); + $query->where('a.country = ' . (int) $countryngav ); } - elseif (is_string($countryxhbr)) + elseif (is_string($countryngav)) { - $query->where('a.country = ' . $db->quote($countryxhbr)); + $query->where('a.country = ' . $db->quote($countryngav)); } else { @@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationIebcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationOttcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationIebcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationOttcompanies($item->per, 'per'); } } @@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationIebcompanies($value,$name) + public function selectionTranslationOttcompanies($value,$name) { // Array of department language strings if ($name == 'department') @@ -535,6 +535,12 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection')) { diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 19360313..56ff4122 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/models/currency.php b/admin/models/currency.php index 0feb7fd8..d916e8a4 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php @@ -145,6 +145,12 @@ class CostbenefitprojectionModelCurrency extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection')) { diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 92aa2966..47c8ed28 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 03267ba6..a2029031 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 5254dbf1..b0420cc4 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 bb13ec71..fff86492 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index c713dd59..fc384418 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 5237c44b..3d00b92e 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 7b5c94e0..89f247d7 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 e3b44472..fff69cd3 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 4a62926a..98e0b746 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 016f7ae7..a65a320a 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 343373e9..ad4409f6 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovider.php diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index c8885153..d940cfa0 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovideruser.php diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index 9cf6fa91..54a253d7 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 2d9c6c45..557710ac 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_KnoPOIjccb_required = false; -jform_KnoPOIjyfw_required = false; -jform_KnoPOIjUoF_required = false; -jform_KnoPOIjRKe_required = false; -jform_KnoPOIjlOb_required = false; -jform_KnoPOIjNTk_required = false; -jform_KnoPOIjaAE_required = false; +jform_wOtXSDyUHv_required = false; +jform_wOtXSDyltm_required = false; +jform_wOtXSDyxVM_required = false; +jform_wOtXSDyNqx_required = false; +jform_wOtXSDyior_required = false; +jform_wOtXSDymVK_required = false; +jform_wOtXSDyyrS_required = false; // Initial Script jQuery(document).ready(function() { - var department_KnoPOIj = jQuery("#jform_department input[type='radio']:checked").val(); - KnoPOIj(department_KnoPOIj); + var department_wOtXSDy = jQuery("#jform_department input[type='radio']:checked").val(); + wOtXSDy(department_wOtXSDy); - var department_hOoOaLC = jQuery("#jform_department input[type='radio']:checked").val(); - hOoOaLC(department_hOoOaLC); + var department_QfTgSnf = jQuery("#jform_department input[type='radio']:checked").val(); + QfTgSnf(department_QfTgSnf); }); -// the KnoPOIj function -function KnoPOIj(department_KnoPOIj) +// the wOtXSDy function +function wOtXSDy(department_wOtXSDy) { // set the function logic - if (department_KnoPOIj == 2) + if (department_wOtXSDy == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_KnoPOIjccb_required) + if (jform_wOtXSDyUHv_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_KnoPOIjccb_required = false; + jform_wOtXSDyUHv_required = false; } jQuery('#jform_percentfemale').closest('.control-group').show(); jQuery('#jform_percentmale').closest('.control-group').show(); jQuery('#jform_productivity_losses').closest('.control-group').show(); - if (jform_KnoPOIjyfw_required) + if (jform_wOtXSDyltm_required) { updateFieldRequired('productivity_losses',0); jQuery('#jform_productivity_losses').prop('required','required'); jQuery('#jform_productivity_losses').attr('aria-required',true); jQuery('#jform_productivity_losses').addClass('required'); - jform_KnoPOIjyfw_required = false; + jform_wOtXSDyltm_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_KnoPOIjUoF_required) + if (jform_wOtXSDyxVM_required) { updateFieldRequired('medical_turnovers_females',0); jQuery('#jform_medical_turnovers_females').prop('required','required'); jQuery('#jform_medical_turnovers_females').attr('aria-required',true); jQuery('#jform_medical_turnovers_females').addClass('required'); - jform_KnoPOIjUoF_required = false; + jform_wOtXSDyxVM_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_KnoPOIjRKe_required) + if (jform_wOtXSDyNqx_required) { updateFieldRequired('medical_turnovers_males',0); jQuery('#jform_medical_turnovers_males').prop('required','required'); jQuery('#jform_medical_turnovers_males').attr('aria-required',true); jQuery('#jform_medical_turnovers_males').addClass('required'); - jform_KnoPOIjRKe_required = false; + jform_wOtXSDyNqx_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_KnoPOIjlOb_required) + if (jform_wOtXSDyior_required) { updateFieldRequired('sick_leave_females',0); jQuery('#jform_sick_leave_females').prop('required','required'); jQuery('#jform_sick_leave_females').attr('aria-required',true); jQuery('#jform_sick_leave_females').addClass('required'); - jform_KnoPOIjlOb_required = false; + jform_wOtXSDyior_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_KnoPOIjNTk_required) + if (jform_wOtXSDymVK_required) { updateFieldRequired('sick_leave_males',0); jQuery('#jform_sick_leave_males').prop('required','required'); jQuery('#jform_sick_leave_males').attr('aria-required',true); jQuery('#jform_sick_leave_males').addClass('required'); - jform_KnoPOIjNTk_required = false; + jform_wOtXSDymVK_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_KnoPOIjaAE_required) + if (jform_wOtXSDyyrS_required) { updateFieldRequired('total_healthcare',0); jQuery('#jform_total_healthcare').prop('required','required'); jQuery('#jform_total_healthcare').attr('aria-required',true); jQuery('#jform_total_healthcare').addClass('required'); - jform_KnoPOIjaAE_required = false; + jform_wOtXSDyyrS_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_KnoPOIjccb_required) + if (!jform_wOtXSDyUHv_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_KnoPOIjccb_required = true; + jform_wOtXSDyUHv_required = true; } jQuery('#jform_percentfemale').closest('.control-group').hide(); jQuery('#jform_percentmale').closest('.control-group').hide(); jQuery('#jform_productivity_losses').closest('.control-group').hide(); - if (!jform_KnoPOIjyfw_required) + if (!jform_wOtXSDyltm_required) { updateFieldRequired('productivity_losses',1); jQuery('#jform_productivity_losses').removeAttr('required'); jQuery('#jform_productivity_losses').removeAttr('aria-required'); jQuery('#jform_productivity_losses').removeClass('required'); - jform_KnoPOIjyfw_required = true; + jform_wOtXSDyltm_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_KnoPOIjUoF_required) + if (!jform_wOtXSDyxVM_required) { updateFieldRequired('medical_turnovers_females',1); jQuery('#jform_medical_turnovers_females').removeAttr('required'); jQuery('#jform_medical_turnovers_females').removeAttr('aria-required'); jQuery('#jform_medical_turnovers_females').removeClass('required'); - jform_KnoPOIjUoF_required = true; + jform_wOtXSDyxVM_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_KnoPOIjRKe_required) + if (!jform_wOtXSDyNqx_required) { updateFieldRequired('medical_turnovers_males',1); jQuery('#jform_medical_turnovers_males').removeAttr('required'); jQuery('#jform_medical_turnovers_males').removeAttr('aria-required'); jQuery('#jform_medical_turnovers_males').removeClass('required'); - jform_KnoPOIjRKe_required = true; + jform_wOtXSDyNqx_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_KnoPOIjlOb_required) + if (!jform_wOtXSDyior_required) { updateFieldRequired('sick_leave_females',1); jQuery('#jform_sick_leave_females').removeAttr('required'); jQuery('#jform_sick_leave_females').removeAttr('aria-required'); jQuery('#jform_sick_leave_females').removeClass('required'); - jform_KnoPOIjlOb_required = true; + jform_wOtXSDyior_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_KnoPOIjNTk_required) + if (!jform_wOtXSDymVK_required) { updateFieldRequired('sick_leave_males',1); jQuery('#jform_sick_leave_males').removeAttr('required'); jQuery('#jform_sick_leave_males').removeAttr('aria-required'); jQuery('#jform_sick_leave_males').removeClass('required'); - jform_KnoPOIjNTk_required = true; + jform_wOtXSDymVK_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_KnoPOIjaAE_required) + if (!jform_wOtXSDyyrS_required) { updateFieldRequired('total_healthcare',1); jQuery('#jform_total_healthcare').removeAttr('required'); jQuery('#jform_total_healthcare').removeAttr('aria-required'); jQuery('#jform_total_healthcare').removeClass('required'); - jform_KnoPOIjaAE_required = true; + jform_wOtXSDyyrS_required = true; } } } -// the hOoOaLC function -function hOoOaLC(department_hOoOaLC) +// the QfTgSnf function +function QfTgSnf(department_QfTgSnf) { // set the function logic - if (department_hOoOaLC == 1) + if (department_QfTgSnf == 1) { jQuery('.age_groups_note').closest('.control-group').show(); jQuery('.cause_risk_selection_note').closest('.control-group').show(); diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js index 931c3910..162d9349 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 56135cd2..d66fab7b 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 50a4e02d..2086b8b0 100644 --- a/admin/models/forms/health_data.js +++ b/admin/models/forms/health_data.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 01bb737e..bceba65e 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.js @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_uejVBuHOGA_required = false; -jform_iaDOoTnQCH_required = false; -jform_noYjlmHfWk_required = false; -jform_artksODZGn_required = false; +jform_FpIPbneirK_required = false; +jform_fgOCQzCsnx_required = false; +jform_XzczrIMrYp_required = false; +jform_BCMduNxxVN_required = false; // Initial Script jQuery(document).ready(function() { - var location_vBwsUmZ = jQuery("#jform_location input[type='radio']:checked").val(); - vBwsUmZ(location_vBwsUmZ); + var location_zJdFpwB = jQuery("#jform_location input[type='radio']:checked").val(); + zJdFpwB(location_zJdFpwB); - var location_UsqRLKW = jQuery("#jform_location input[type='radio']:checked").val(); - UsqRLKW(location_UsqRLKW); + var location_QLgZpKd = jQuery("#jform_location input[type='radio']:checked").val(); + QLgZpKd(location_QLgZpKd); - var type_uejVBuH = jQuery("#jform_type").val(); - uejVBuH(type_uejVBuH); + var type_FpIPbne = jQuery("#jform_type").val(); + FpIPbne(type_FpIPbne); - var type_iaDOoTn = jQuery("#jform_type").val(); - iaDOoTn(type_iaDOoTn); + var type_fgOCQzC = jQuery("#jform_type").val(); + fgOCQzC(type_fgOCQzC); - var type_noYjlmH = jQuery("#jform_type").val(); - noYjlmH(type_noYjlmH); + var type_XzczrIM = jQuery("#jform_type").val(); + XzczrIM(type_XzczrIM); - var target_artksOD = jQuery("#jform_target input[type='radio']:checked").val(); - artksOD(target_artksOD); + var target_BCMduNx = jQuery("#jform_target input[type='radio']:checked").val(); + BCMduNx(target_BCMduNx); }); -// the vBwsUmZ function -function vBwsUmZ(location_vBwsUmZ) +// the zJdFpwB function +function zJdFpwB(location_zJdFpwB) { // set the function logic - if (location_vBwsUmZ == 1) + if (location_zJdFpwB == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function vBwsUmZ(location_vBwsUmZ) } } -// the UsqRLKW function -function UsqRLKW(location_UsqRLKW) +// the QLgZpKd function +function QLgZpKd(location_QLgZpKd) { // set the function logic - if (location_UsqRLKW == 2) + if (location_QLgZpKd == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function UsqRLKW(location_UsqRLKW) } } -// the uejVBuH function -function uejVBuH(type_uejVBuH) +// the FpIPbne function +function FpIPbne(type_FpIPbne) { - if (isSet(type_uejVBuH) && type_uejVBuH.constructor !== Array) + if (isSet(type_FpIPbne) && type_FpIPbne.constructor !== Array) { - var temp_uejVBuH = type_uejVBuH; - var type_uejVBuH = []; - type_uejVBuH.push(temp_uejVBuH); + var temp_FpIPbne = type_FpIPbne; + var type_FpIPbne = []; + type_FpIPbne.push(temp_FpIPbne); } - else if (!isSet(type_uejVBuH)) + else if (!isSet(type_FpIPbne)) { - var type_uejVBuH = []; + var type_FpIPbne = []; } - var type = type_uejVBuH.some(type_uejVBuH_SomeFunc); + var type = type_FpIPbne.some(type_FpIPbne_SomeFunc); // set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_uejVBuHOGA_required) + if (jform_FpIPbneirK_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_uejVBuHOGA_required = false; + jform_FpIPbneirK_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_uejVBuHOGA_required) + if (!jform_FpIPbneirK_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_uejVBuHOGA_required = true; + jform_FpIPbneirK_required = true; } } } -// the uejVBuH Some function -function type_uejVBuH_SomeFunc(type_uejVBuH) +// the FpIPbne Some function +function type_FpIPbne_SomeFunc(type_FpIPbne) { // set the function logic - if (type_uejVBuH == 3) + if (type_FpIPbne == 3) { return true; } return false; } -// the iaDOoTn function -function iaDOoTn(type_iaDOoTn) +// the fgOCQzC function +function fgOCQzC(type_fgOCQzC) { - if (isSet(type_iaDOoTn) && type_iaDOoTn.constructor !== Array) + if (isSet(type_fgOCQzC) && type_fgOCQzC.constructor !== Array) { - var temp_iaDOoTn = type_iaDOoTn; - var type_iaDOoTn = []; - type_iaDOoTn.push(temp_iaDOoTn); + var temp_fgOCQzC = type_fgOCQzC; + var type_fgOCQzC = []; + type_fgOCQzC.push(temp_fgOCQzC); } - else if (!isSet(type_iaDOoTn)) + else if (!isSet(type_fgOCQzC)) { - var type_iaDOoTn = []; + var type_fgOCQzC = []; } - var type = type_iaDOoTn.some(type_iaDOoTn_SomeFunc); + var type = type_fgOCQzC.some(type_fgOCQzC_SomeFunc); // set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_iaDOoTnQCH_required) + if (jform_fgOCQzCsnx_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_iaDOoTnQCH_required = false; + jform_fgOCQzCsnx_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_iaDOoTnQCH_required) + if (!jform_fgOCQzCsnx_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_iaDOoTnQCH_required = true; + jform_fgOCQzCsnx_required = true; } } } -// the iaDOoTn Some function -function type_iaDOoTn_SomeFunc(type_iaDOoTn) +// the fgOCQzC Some function +function type_fgOCQzC_SomeFunc(type_fgOCQzC) { // set the function logic - if (type_iaDOoTn == 1) + if (type_fgOCQzC == 1) { return true; } return false; } -// the noYjlmH function -function noYjlmH(type_noYjlmH) +// the XzczrIM function +function XzczrIM(type_XzczrIM) { - if (isSet(type_noYjlmH) && type_noYjlmH.constructor !== Array) + if (isSet(type_XzczrIM) && type_XzczrIM.constructor !== Array) { - var temp_noYjlmH = type_noYjlmH; - var type_noYjlmH = []; - type_noYjlmH.push(temp_noYjlmH); + var temp_XzczrIM = type_XzczrIM; + var type_XzczrIM = []; + type_XzczrIM.push(temp_XzczrIM); } - else if (!isSet(type_noYjlmH)) + else if (!isSet(type_XzczrIM)) { - var type_noYjlmH = []; + var type_XzczrIM = []; } - var type = type_noYjlmH.some(type_noYjlmH_SomeFunc); + var type = type_XzczrIM.some(type_XzczrIM_SomeFunc); // set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_noYjlmHfWk_required) + if (jform_XzczrIMrYp_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_noYjlmHfWk_required = false; + jform_XzczrIMrYp_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_noYjlmHfWk_required) + if (!jform_XzczrIMrYp_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_noYjlmHfWk_required = true; + jform_XzczrIMrYp_required = true; } } } -// the noYjlmH Some function -function type_noYjlmH_SomeFunc(type_noYjlmH) +// the XzczrIM Some function +function type_XzczrIM_SomeFunc(type_XzczrIM) { // set the function logic - if (type_noYjlmH == 2) + if (type_XzczrIM == 2) { return true; } return false; } -// the artksOD function -function artksOD(target_artksOD) +// the BCMduNx function +function BCMduNx(target_BCMduNx) { // set the function logic - if (target_artksOD == 1) + if (target_BCMduNx == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_artksODZGn_required) + if (jform_BCMduNxxVN_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_artksODZGn_required = false; + jform_BCMduNxxVN_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_artksODZGn_required) + if (!jform_BCMduNxxVN_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_artksODZGn_required = true; + jform_BCMduNxxVN_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index 9bb11f56..473218af 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js @@ -17,58 +17,58 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_lNzcbyVwlf_required = false; -jform_ppTquVJnwy_required = false; +jform_NAdDhyizvd_required = false; +jform_heHZMbDJNS_required = false; // Initial Script jQuery(document).ready(function() { - var type_lNzcbyV = jQuery("#jform_type input[type='radio']:checked").val(); - lNzcbyV(type_lNzcbyV); + var type_NAdDhyi = jQuery("#jform_type input[type='radio']:checked").val(); + NAdDhyi(type_NAdDhyi); - var type_QCpvpjP = jQuery("#jform_type input[type='radio']:checked").val(); - QCpvpjP(type_QCpvpjP); + var type_sMxiLMq = jQuery("#jform_type input[type='radio']:checked").val(); + sMxiLMq(type_sMxiLMq); - var company_ppTquVJ = jQuery("#jform_company").val(); - ppTquVJ(company_ppTquVJ); + var company_heHZMbD = jQuery("#jform_company").val(); + heHZMbD(company_heHZMbD); }); -// the lNzcbyV function -function lNzcbyV(type_lNzcbyV) +// the NAdDhyi function +function NAdDhyi(type_NAdDhyi) { // set the function logic - if (type_lNzcbyV == 2) + if (type_NAdDhyi == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_lNzcbyVwlf_required) + if (jform_NAdDhyizvd_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_lNzcbyVwlf_required = false; + jform_NAdDhyizvd_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_lNzcbyVwlf_required) + if (!jform_NAdDhyizvd_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_lNzcbyVwlf_required = true; + jform_NAdDhyizvd_required = true; } } } -// the QCpvpjP function -function QCpvpjP(type_QCpvpjP) +// the sMxiLMq function +function sMxiLMq(type_sMxiLMq) { // set the function logic - if (type_QCpvpjP == 1) + if (type_sMxiLMq == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } @@ -78,55 +78,55 @@ function QCpvpjP(type_QCpvpjP) } } -// the ppTquVJ function -function ppTquVJ(company_ppTquVJ) +// the heHZMbD function +function heHZMbD(company_heHZMbD) { - if (isSet(company_ppTquVJ) && company_ppTquVJ.constructor !== Array) + if (isSet(company_heHZMbD) && company_heHZMbD.constructor !== Array) { - var temp_ppTquVJ = company_ppTquVJ; - var company_ppTquVJ = []; - company_ppTquVJ.push(temp_ppTquVJ); + var temp_heHZMbD = company_heHZMbD; + var company_heHZMbD = []; + company_heHZMbD.push(temp_heHZMbD); } - else if (!isSet(company_ppTquVJ)) + else if (!isSet(company_heHZMbD)) { - var company_ppTquVJ = []; + var company_heHZMbD = []; } - var company = company_ppTquVJ.some(company_ppTquVJ_SomeFunc); + var company = company_heHZMbD.some(company_heHZMbD_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_ppTquVJnwy_required) + if (jform_heHZMbDJNS_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_ppTquVJnwy_required = false; + jform_heHZMbDJNS_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_ppTquVJnwy_required) + if (!jform_heHZMbDJNS_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_ppTquVJnwy_required = true; + jform_heHZMbDJNS_required = true; } } } -// the ppTquVJ Some function -function company_ppTquVJ_SomeFunc(company_ppTquVJ) +// the heHZMbD Some function +function company_heHZMbD_SomeFunc(company_heHZMbD) { // set the function logic - if (company_ppTquVJ == 0) + if (company_heHZMbD == 0) { return true; } diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index 631ba4c2..aaeba5fb 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.js @@ -17,64 +17,64 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_YalYuNileX_required = false; +jform_KuwbJuPTpY_required = false; // Initial Script jQuery(document).ready(function() { - var company_YalYuNi = jQuery("#jform_company").val(); - YalYuNi(company_YalYuNi); + var company_KuwbJuP = jQuery("#jform_company").val(); + KuwbJuP(company_KuwbJuP); }); -// the YalYuNi function -function YalYuNi(company_YalYuNi) +// the KuwbJuP function +function KuwbJuP(company_KuwbJuP) { - if (isSet(company_YalYuNi) && company_YalYuNi.constructor !== Array) + if (isSet(company_KuwbJuP) && company_KuwbJuP.constructor !== Array) { - var temp_YalYuNi = company_YalYuNi; - var company_YalYuNi = []; - company_YalYuNi.push(temp_YalYuNi); + var temp_KuwbJuP = company_KuwbJuP; + var company_KuwbJuP = []; + company_KuwbJuP.push(temp_KuwbJuP); } - else if (!isSet(company_YalYuNi)) + else if (!isSet(company_KuwbJuP)) { - var company_YalYuNi = []; + var company_KuwbJuP = []; } - var company = company_YalYuNi.some(company_YalYuNi_SomeFunc); + var company = company_KuwbJuP.some(company_KuwbJuP_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_YalYuNileX_required) + if (jform_KuwbJuPTpY_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_YalYuNileX_required = false; + jform_KuwbJuPTpY_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_YalYuNileX_required) + if (!jform_KuwbJuPTpY_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_YalYuNileX_required = true; + jform_KuwbJuPTpY_required = true; } } } -// the YalYuNi Some function -function company_YalYuNi_SomeFunc(company_YalYuNi) +// the KuwbJuP Some function +function company_KuwbJuP_SomeFunc(company_KuwbJuP) { // set the function logic - if (company_YalYuNi == 0) + if (company_KuwbJuP == 0) { return true; } diff --git a/admin/models/forms/service_provider.js b/admin/models/forms/service_provider.js index 50d91279..37df489b 100644 --- a/admin/models/forms/service_provider.js +++ b/admin/models/forms/service_provider.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.js diff --git a/admin/models/health_data.php b/admin/models/health_data.php index 56e69443..4c104ea2 100644 --- a/admin/models/health_data.php +++ b/admin/models/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php @@ -145,6 +145,12 @@ class CostbenefitprojectionModelHealth_data extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection')) { diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index cf507f6f..8d397ae1 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 8eb4f113..6f22cb58 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php @@ -151,6 +151,12 @@ class CostbenefitprojectionModelHelp_document extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection')) { diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index b7f458a8..1a707ecd 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 526922e2..7786ea66 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/models/intervention.php b/admin/models/intervention.php index bb63e4b6..ebf90ed3 100644 --- a/admin/models/intervention.php +++ b/admin/models/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php @@ -151,6 +151,12 @@ class CostbenefitprojectionModelIntervention extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection')) { diff --git a/admin/models/interventions.php b/admin/models/interventions.php index e5f9c690..20a23dd0 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 c3a98114..4f596940 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php @@ -145,6 +145,12 @@ class CostbenefitprojectionModelScaling_factor extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection')) { diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index dae0254b..afeb15d8 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 d2f23d8b..13584397 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php @@ -95,7 +95,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.service_provider'); } } - $this->service_providerustf = $item->id; + $this->service_providerfted = $item->id; return $item; } @@ -105,7 +105,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getPbkcompanies() + public function getWqkcompanies() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $query->select($db->quoteName('i.user','service_provider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.service_provider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by service_providerustf global. - $service_providerustf = $this->service_providerustf; - if (is_numeric($service_providerustf )) + // Filter by service_providerfted global. + $service_providerfted = $this->service_providerfted; + if (is_numeric($service_providerfted )) { - $query->where('a.service_provider = ' . (int) $service_providerustf ); + $query->where('a.service_provider = ' . (int) $service_providerfted ); } - elseif (is_string($service_providerustf)) + elseif (is_string($service_providerfted)) { - $query->where('a.service_provider = ' . $db->quote($service_providerustf)); + $query->where('a.service_provider = ' . $db->quote($service_providerfted)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationPbkcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationWqkcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationPbkcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationWqkcompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - public function selectionTranslationPbkcompanies($value,$name) + public function selectionTranslationWqkcompanies($value,$name) { // Array of department language strings if ($name == 'department') @@ -304,6 +304,12 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $form->setFieldAttribute('ordering', 'filter', 'unset'); $form->setFieldAttribute('published', 'filter', 'unset'); } + // If this is a new item insure the greated by is set + if (0 == $id) + { + // Set the created_by to this user + $form->setValue('created_by', null, $user->id); + } // Modify the form based on Edit Creaded By access controls. if (!$user->authorise('core.edit.created_by', 'com_costbenefitprojection')) { diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index d057ffe2..25443910 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 d43aed6b..2b033604 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/tables/company.php b/admin/tables/company.php index caeed3f9..52ce4d52 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/tables/country.php b/admin/tables/country.php index 7aa43276..76d7e2ac 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/tables/currency.php b/admin/tables/currency.php index 15ec1da7..d6811ce9 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 830c11ac..2852e2fc 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 69ceb594..8da6fd88 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 34f18bad..2255f130 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 7963884e..eb2b3803 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 32a5763a..f3a801e6 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/vdm.php b/admin/vdm.php index a6c87c19..64a5bd90 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage vdm.php diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js index 75147885..ea3fc706 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 59ffc291..4dd30a66 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 e6ce97b9..2f957e92 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 0707f0c9..24a88210 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 b54ca99e..6429b8dc 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 3db5534b..2ac9cece 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 eb8cab1f..25c00ff9 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 cd607def..61cc384c 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 63af870c..8d4dd38f 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 af614cad..13474898 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 e8c585ab..4af2fc21 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 688faa8b..85c69c3f 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 ddbd2a36..5c6b487e 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 e17ef1a5..2b082e73 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 a0828f17..aa0752f9 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 f0916579..0e07c653 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 48965cd2..524d3876 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 43d8ae12..41a223dd 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 f342d7c4..8d88a0fb 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 c9146ade..94b7068c 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 d4ff15bf..c5009eaa 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 5a7b3ae6..7574e3d8 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 9e09f469..01331707 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 462a5975..d6f8b135 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 4557b581..2ecff83a 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 54c39e0d..aefcb417 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.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 3d643ff6..73542ac3 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 f3d32547..ace10950 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 175aac2d..7e86a863 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 9f30fccb..b6cfef4f 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 b0ee3139..21e8fae2 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 4d196b68..d826d3f7 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @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 8ecb3edf..dbf8ddd3 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.4 - @build 19th February, 2016 + @build 20th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php @@ -141,33 +141,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');