From 0b25654b417e57005ff68b3e3a28b3ddfa39be56 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 19 Feb 2016 11:23:14 +0200 Subject: [PATCH] Added the Usage Statistics tab to the dashboard. All other changes are only random variable name and date changes (due to automation) --- README.md | 6 +- admin/assets/css/admin.css | 2 +- admin/assets/css/causerisk.css | 2 +- admin/assets/css/causesrisks.css | 2 +- admin/assets/css/combinedresults.css | 2 +- admin/assets/css/companies.css | 2 +- admin/assets/css/company.css | 2 +- admin/assets/css/companyresults.css | 2 +- admin/assets/css/countries.css | 2 +- admin/assets/css/country.css | 2 +- admin/assets/css/currencies.css | 2 +- admin/assets/css/currency.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/health_data.css | 2 +- admin/assets/css/health_data_sets.css | 2 +- admin/assets/css/help_document.css | 2 +- admin/assets/css/help_documents.css | 2 +- admin/assets/css/intervention.css | 2 +- admin/assets/css/interventions.css | 2 +- admin/assets/css/scaling_factor.css | 2 +- admin/assets/css/scaling_factors.css | 2 +- admin/assets/css/service_provider.css | 2 +- admin/assets/css/service_providers.css | 2 +- admin/controller.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/causerisk.php | 2 +- admin/controllers/causesrisks.php | 2 +- admin/controllers/combinedresults.php | 2 +- admin/controllers/companies.php | 2 +- admin/controllers/company.php | 2 +- admin/controllers/companyresults.php | 2 +- admin/controllers/costbenefitprojection.php | 2 +- admin/controllers/countries.php | 2 +- admin/controllers/country.php | 2 +- admin/controllers/currencies.php | 2 +- admin/controllers/currency.php | 2 +- admin/controllers/health_data.php | 2 +- admin/controllers/health_data_sets.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/help_document.php | 2 +- admin/controllers/help_documents.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/intervention.php | 2 +- admin/controllers/interventions.php | 2 +- admin/controllers/scaling_factor.php | 2 +- admin/controllers/scaling_factors.php | 2 +- admin/controllers/service_provider.php | 2 +- admin/controllers/service_providers.php | 2 +- admin/costbenefitprojection.php | 2 +- admin/helpers/costbenefitprojection.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/sum.php | 4 +- admin/helpers/sumcombine.php | 21 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 7 + admin/layouts/batchselection.php | 2 +- admin/layouts/causerisk/details_above.php | 2 +- admin/layouts/causerisk/details_left.php | 2 +- admin/layouts/causerisk/publishing.php | 2 +- admin/layouts/causerisk/publlshing.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- admin/layouts/company/details_above.php | 2 +- admin/layouts/company/details_left.php | 2 +- admin/layouts/company/details_right.php | 2 +- admin/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 4 +- admin/layouts/company/publishing.php | 2 +- admin/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 4 +- .../country/age_groups_percentages_left.php | 2 +- .../country/age_groups_percentages_right.php | 2 +- .../country/causerisk_selection_fullwidth.php | 2 +- admin/layouts/country/companies_fullwidth.php | 4 +- admin/layouts/country/details_above.php | 2 +- admin/layouts/country/details_left.php | 2 +- admin/layouts/country/details_right.php | 2 +- .../country/health_data_totals_left.php | 2 +- .../country/health_data_totals_right.php | 2 +- .../country/interventions_fullwidth.php | 4 +- .../country/public_details_fullwidth.php | 2 +- admin/layouts/country/publishing.php | 2 +- admin/layouts/country/publlshing.php | 2 +- .../country/service_providers_fullwidth.php | 4 +- admin/layouts/currency/details_above.php | 2 +- admin/layouts/currency/details_left.php | 2 +- admin/layouts/currency/details_right.php | 2 +- admin/layouts/currency/publishing.php | 2 +- admin/layouts/currency/publlshing.php | 2 +- admin/layouts/databreakdownmalefemale.php | 6 +- admin/layouts/health_data/details_above.php | 2 +- admin/layouts/health_data/details_left.php | 2 +- admin/layouts/health_data/details_right.php | 2 +- .../layouts/health_data/details_rightside.php | 2 +- admin/layouts/health_data/publishing.php | 2 +- admin/layouts/health_data/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- admin/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- admin/layouts/intervention/details_under.php | 2 +- admin/layouts/intervention/publishing.php | 2 +- admin/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- admin/layouts/intervention/settings_left.php | 2 +- .../layouts/scaling_factor/details_above.php | 2 +- admin/layouts/scaling_factor/details_left.php | 2 +- .../layouts/scaling_factor/details_right.php | 2 +- admin/layouts/scaling_factor/publishing.php | 2 +- admin/layouts/scaling_factor/publlshing.php | 2 +- .../service_provider/companies_fullwidth.php | 4 +- .../service_provider/details_above.php | 2 +- .../service_provider/details_fullwidth.php | 2 +- admin/layouts/service_provider/publishing.php | 2 +- admin/layouts/service_provider/publlshing.php | 2 +- admin/models/ajax.php | 2 +- admin/models/causerisk.php | 2 +- admin/models/causesrisks.php | 2 +- admin/models/combinedresults.php | 2 +- admin/models/companies.php | 2 +- admin/models/company.php | 38 +-- admin/models/companyresults.php | 2 +- admin/models/costbenefitprojection.php | 279 +++++++++++++++++- admin/models/countries.php | 2 +- admin/models/country.php | 60 ++-- admin/models/currencies.php | 2 +- admin/models/currency.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/causesrisks.php | 2 +- admin/models/fields/causesriskscheck.php | 2 +- admin/models/fields/company.php | 2 +- admin/models/fields/countries.php | 2 +- admin/models/fields/countryuser.php | 2 +- admin/models/fields/currency.php | 2 +- admin/models/fields/datayear.php | 2 +- admin/models/fields/interventions.php | 2 +- admin/models/fields/memberuser.php | 2 +- admin/models/fields/serviceprovider.php | 2 +- admin/models/fields/serviceprovideruser.php | 2 +- admin/models/forms/causerisk.js | 2 +- admin/models/forms/company.js | 92 +++--- admin/models/forms/country.js | 2 +- admin/models/forms/currency.js | 2 +- admin/models/forms/health_data.js | 2 +- admin/models/forms/help_document.js | 156 +++++----- admin/models/forms/intervention.js | 70 ++--- admin/models/forms/scaling_factor.js | 40 +-- admin/models/forms/service_provider.js | 2 +- admin/models/health_data.php | 2 +- admin/models/health_data_sets.php | 2 +- admin/models/help_document.php | 2 +- admin/models/help_documents.php | 2 +- admin/models/import.php | 2 +- admin/models/intervention.php | 2 +- admin/models/interventions.php | 2 +- admin/models/scaling_factor.php | 2 +- admin/models/scaling_factors.php | 2 +- admin/models/service_provider.php | 24 +- admin/models/service_providers.php | 2 +- admin/tables/causerisk.php | 2 +- admin/tables/company.php | 2 +- admin/tables/country.php | 2 +- admin/tables/currency.php | 2 +- admin/tables/health_data.php | 2 +- admin/tables/help_document.php | 2 +- admin/tables/intervention.php | 2 +- admin/tables/scaling_factor.php | 2 +- admin/tables/service_provider.php | 2 +- admin/vdm.php | 2 +- admin/views/causerisk/submitbutton.js | 2 +- admin/views/causerisk/tmpl/edit.php | 2 +- admin/views/causerisk/view.html.php | 2 +- admin/views/causesrisks/tmpl/default.php | 2 +- .../causesrisks/tmpl/default_batch_body.php | 2 +- .../causesrisks/tmpl/default_batch_footer.php | 2 +- admin/views/causesrisks/tmpl/default_body.php | 2 +- admin/views/causesrisks/tmpl/default_foot.php | 2 +- admin/views/causesrisks/tmpl/default_head.php | 2 +- .../causesrisks/tmpl/default_toolbar.php | 2 +- admin/views/causesrisks/view.html.php | 2 +- admin/views/combinedresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- .../combinedresults/tmpl/default_main.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- admin/views/combinedresults/view.html.php | 2 +- admin/views/companies/tmpl/default.php | 2 +- .../companies/tmpl/default_batch_body.php | 2 +- .../companies/tmpl/default_batch_footer.php | 2 +- admin/views/companies/tmpl/default_body.php | 2 +- admin/views/companies/tmpl/default_foot.php | 2 +- admin/views/companies/tmpl/default_head.php | 2 +- .../views/companies/tmpl/default_toolbar.php | 2 +- admin/views/companies/view.html.php | 2 +- admin/views/company/submitbutton.js | 2 +- admin/views/company/tmpl/edit.php | 22 +- admin/views/company/view.html.php | 6 +- admin/views/companyresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- .../companyresults/tmpl/default_main.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- .../companyresults/tmpl/default_variables.php | 2 +- admin/views/companyresults/view.html.php | 2 +- .../costbenefitprojection/tmpl/default.php | 58 ++-- .../tmpl/default_main.php | 4 +- .../tmpl/default_usage_statistics_table.php | 70 +++++ .../tmpl/default_vdm.php | 2 +- .../views/costbenefitprojection/view.html.php | 5 +- admin/views/countries/tmpl/default.php | 2 +- .../countries/tmpl/default_batch_body.php | 2 +- .../countries/tmpl/default_batch_footer.php | 2 +- admin/views/countries/tmpl/default_body.php | 2 +- admin/views/countries/tmpl/default_foot.php | 2 +- admin/views/countries/tmpl/default_head.php | 2 +- .../views/countries/tmpl/default_toolbar.php | 2 +- admin/views/countries/view.html.php | 2 +- admin/views/country/submitbutton.js | 2 +- admin/views/country/tmpl/edit.php | 2 +- admin/views/country/view.html.php | 8 +- admin/views/currencies/tmpl/default.php | 2 +- .../currencies/tmpl/default_batch_body.php | 2 +- .../currencies/tmpl/default_batch_footer.php | 2 +- admin/views/currencies/tmpl/default_body.php | 2 +- admin/views/currencies/tmpl/default_foot.php | 2 +- admin/views/currencies/tmpl/default_head.php | 2 +- .../views/currencies/tmpl/default_toolbar.php | 2 +- admin/views/currencies/view.html.php | 2 +- admin/views/currency/submitbutton.js | 2 +- admin/views/currency/tmpl/edit.php | 2 +- admin/views/currency/view.html.php | 2 +- admin/views/health_data/submitbutton.js | 2 +- admin/views/health_data/tmpl/edit.php | 2 +- admin/views/health_data/view.html.php | 2 +- admin/views/health_data_sets/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../health_data_sets/tmpl/default_body.php | 2 +- .../health_data_sets/tmpl/default_foot.php | 2 +- .../health_data_sets/tmpl/default_head.php | 2 +- .../health_data_sets/tmpl/default_toolbar.php | 2 +- admin/views/health_data_sets/view.html.php | 2 +- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 62 ++-- admin/views/help_document/view.html.php | 2 +- admin/views/help_documents/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../help_documents/tmpl/default_body.php | 2 +- .../help_documents/tmpl/default_foot.php | 2 +- .../help_documents/tmpl/default_head.php | 2 +- .../help_documents/tmpl/default_toolbar.php | 2 +- admin/views/help_documents/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/intervention/submitbutton.js | 2 +- admin/views/intervention/tmpl/edit.php | 32 +- admin/views/intervention/view.html.php | 2 +- admin/views/interventions/tmpl/default.php | 2 +- .../interventions/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/interventions/tmpl/default_body.php | 2 +- .../views/interventions/tmpl/default_foot.php | 2 +- .../views/interventions/tmpl/default_head.php | 2 +- .../interventions/tmpl/default_toolbar.php | 2 +- admin/views/interventions/view.html.php | 2 +- admin/views/scaling_factor/submitbutton.js | 2 +- admin/views/scaling_factor/tmpl/edit.php | 12 +- admin/views/scaling_factor/view.html.php | 2 +- admin/views/scaling_factors/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../scaling_factors/tmpl/default_body.php | 2 +- .../scaling_factors/tmpl/default_foot.php | 2 +- .../scaling_factors/tmpl/default_head.php | 2 +- .../scaling_factors/tmpl/default_toolbar.php | 2 +- admin/views/scaling_factors/view.html.php | 2 +- admin/views/service_provider/submitbutton.js | 2 +- admin/views/service_provider/tmpl/edit.php | 2 +- admin/views/service_provider/view.html.php | 4 +- .../views/service_providers/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../service_providers/tmpl/default_body.php | 2 +- .../service_providers/tmpl/default_foot.php | 2 +- .../service_providers/tmpl/default_head.php | 2 +- .../tmpl/default_toolbar.php | 2 +- admin/views/service_providers/view.html.php | 2 +- costbenefitprojection.xml | 2 +- script.php | 2 +- site/assets/css/combinedresults.css | 2 +- site/assets/css/company.css | 2 +- site/assets/css/companyresults.css | 2 +- site/assets/css/cpanel.css | 2 +- site/assets/css/createaccount.css | 2 +- site/assets/css/intervention.css | 2 +- site/assets/css/publicresults.css | 2 +- site/assets/css/scaling_factor.css | 2 +- site/assets/css/site.css | 2 +- site/controller.php | 2 +- site/controllers/ajax.json.php | 2 +- site/controllers/company.php | 2 +- site/controllers/help.php | 2 +- site/controllers/intervention.php | 2 +- site/controllers/scaling_factor.php | 2 +- site/costbenefitprojection.php | 2 +- site/helpers/costbenefitprojection.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 7 + site/layouts/appnotice.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- site/layouts/company/details_above.php | 2 +- site/layouts/company/details_left.php | 2 +- site/layouts/company/details_right.php | 2 +- site/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 4 +- site/layouts/company/publishing.php | 2 +- site/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 4 +- site/layouts/companydetails.php | 2 +- site/layouts/databreakdownmalefemale.php | 6 +- site/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- site/layouts/intervention/details_under.php | 2 +- site/layouts/intervention/publishing.php | 2 +- site/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- site/layouts/intervention/settings_left.php | 2 +- site/layouts/scaling_factor/details_above.php | 2 +- site/layouts/scaling_factor/details_left.php | 2 +- site/layouts/scaling_factor/details_right.php | 2 +- site/layouts/scaling_factor/publishing.php | 2 +- site/layouts/scaling_factor/publlshing.php | 2 +- site/models/ajax.php | 2 +- site/models/combinedresults.php | 2 +- site/models/company.php | 38 +-- site/models/companyresults.php | 2 +- site/models/cpanel.php | 2 +- site/models/createaccount.php | 2 +- site/models/forms/company.js | 92 +++--- site/models/forms/intervention.js | 70 ++--- site/models/forms/scaling_factor.js | 40 +-- site/models/intervention.php | 2 +- site/models/publicresults.php | 2 +- site/models/scaling_factor.php | 2 +- site/router.php | 2 +- site/views/combinedresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- ...t_chart_intervention_cost_benefit_save.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- site/views/combinedresults/view.html.php | 2 +- site/views/company/submitbutton.js | 2 +- site/views/company/tmpl/edit.php | 22 +- site/views/company/view.html.php | 6 +- site/views/companyresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- ...t_chart_intervention_cost_benefit_save.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- site/views/companyresults/view.html.php | 2 +- site/views/cpanel/tmpl/default.php | 2 +- site/views/cpanel/view.html.php | 2 +- site/views/createaccount/tmpl/default.php | 2 +- .../tmpl/default_cbpmenumodule.php | 2 +- site/views/createaccount/view.html.php | 2 +- site/views/intervention/submitbutton.js | 2 +- site/views/intervention/tmpl/edit.php | 32 +- site/views/intervention/view.html.php | 2 +- site/views/publicresults/tmpl/default.php | 2 +- .../tmpl/default_cbpmenumodule.php | 2 +- .../tmpl/default_chart_cost_public.php | 2 +- ...chart_intervention_cost_benefit_public.php | 2 +- .../tmpl/default_contact_form_public.php | 2 +- site/views/publicresults/view.html.php | 2 +- site/views/scaling_factor/submitbutton.js | 2 +- site/views/scaling_factor/tmpl/edit.php | 12 +- site/views/scaling_factor/view.html.php | 2 +- 412 files changed, 1297 insertions(+), 886 deletions(-) create mode 100644 admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php diff --git a/README.md b/README.md index 65b1c16c..07e67ea3 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,12 @@ 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*: 16th February, 2016 ++ *Last Build*: 19th February, 2016 + *Version*: 3.3.2 + *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*: **82915** -+ *File count*: **547** ++ *Line count*: **83326** ++ *File count*: **548** + *Folder count*: **101** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 2e40d5ad..43326baf 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a83cb703..42a8abd2 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 09ba965d..d1065192 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 3db80eaf..e235ec7d 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9193d477..4cbddbe5 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 4a016abd..98dde2ec 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 64b2a10d..1a90f2c6 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 471581ec..2b1697eb 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 4fa8c781..76c597e7 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 f3706813..a1ffefa9 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 f1811dc1..9a7df5e6 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 d9908a4d..ab05a3bf 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 85d26add..b3c9b40d 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 5b94a8c1..cb64c6cf 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 ad1d05ad..f16e3f8a 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 1ac154d6..7dafcc65 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 690bdd0c..e737ec4d 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 4cbc1966..c578b141 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 f50b5335..0348bf32 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 f06c1de4..cb6c3403 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 cf79c485..60c78f48 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 fb80694b..e60e4479 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 47f927cf..aaf7e537 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 29b7b858..f9203edb 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 4fe5206c..277a0441 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a20ee8cb..b9ebb8ef 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 56180896..cf361fdb 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 59289323..e474fb1f 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 afc05c10..efa2c824 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 ede873b3..3385e9e4 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 0625328a..4404efa1 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 e0e26ae4..b0b53ed9 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 ba72ceff..7223d9a5 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6ded0bd0..58cfb821 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 77796da0..9316e6b7 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 d5d756c2..95ac5949 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 04e25502..4ca50229 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 81c14c2d..409b34c9 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 cd354b09..c88d4d8d 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 e660b1b3..b60adb16 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 5aba24ad..2372584c 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6162e30d..9d56b5b1 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 aeb87bc9..3fc71e54 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 35c9f069..8da2c541 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 8962b8e2..cae09aaf 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 3fa3819c..55a431b4 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 62fc9b9a..231f87e1 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 bc32957f..579f9941 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 735a2574..7f6a0df5 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 5cef09b6..c7cfb8b6 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 1d1d8f67..cf52edce 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sum.php @@ -574,7 +574,7 @@ class Sum { foreach ($this->items as $item) { - if (isset($item->subtotal_estimated_burden) && 0 != $this->items[$id]->subtotal_estimated_burden) + if (isset($item->subtotal_estimated_burden) && 0 != $item->subtotal_estimated_burden) { // adjust the subtotal to 100 % $item->subtotal_estimated_burden = ($item->subtotal_estimated_burden * 100) / $this->totals['total_estimated_burden']; diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index c4c7ef34..802281b1 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sumcombine.php @@ -52,6 +52,8 @@ class SumCombine // join interventions $this->setInterventions($item->interventions); } + // check burden levels + $this->setBurden(); // set money for totals $this->setMoney('totals'); // set the money for items @@ -186,6 +188,23 @@ class SumCombine } } + protected function setBurden() + { + if (100 < $this->totals->total_estimated_burden) + { + foreach ($this->items as $item) + { + if (isset($item->subtotal_estimated_burden) && 0 != $item->subtotal_estimated_burden) + { + // adjust the subtotal to 100 % + $item->subtotal_estimated_burden = ($item->subtotal_estimated_burden * 100) / $this->totals->total_estimated_burden; + } + } + // bring down the estimate to 100 % + $this->totals->total_estimated_burden = 100; + } + } + protected function setInterventions($interventions) { if (CostbenefitprojectionHelper::checkArray($interventions)) diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini index 2257148e..d6b88156 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -1,5 +1,6 @@ COM_COSTBENEFITPROJECTION="Cost Benefit Projection" COM_COSTBENEFITPROJECTION_ACCESS_TO_COMBINEDRESULTS_FAILED="Access to combinedresults was denied." +COM_COSTBENEFITPROJECTION_ALL_NUMBERS_IN_BRACKETS_ARE_THE_RELATED_EMPLOYEES="All numbers in brackets are the related employees." COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT="Annual Benefit" COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION="Annual Cost of Intervention" COM_COSTBENEFITPROJECTION_ANNUAL_COST_PER_EMPLOYEE="Annual Cost per Employee" @@ -1353,6 +1354,8 @@ COM_COSTBENEFITPROJECTION_SUBMENU_SCALING_FACTORS="Scaling Factors" COM_COSTBENEFITPROJECTION_SUBMENU_SERVICE_PROVIDERS="Service Providers" COM_COSTBENEFITPROJECTION_TABLES_MENU="Tables Menu" COM_COSTBENEFITPROJECTION_TABLES_QUICK_LINKS="Tables ›› Quick Links" +COM_COSTBENEFITPROJECTION_THE_STATISTICAL_DATA_COULD_NOT_BE_RETURNED_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR="The statistical data could not be returned. Please contact your system administrator." +COM_COSTBENEFITPROJECTION_TOTAL="Total" COM_COSTBENEFITPROJECTION_TOTAL_COST="Total Cost" COM_COSTBENEFITPROJECTION_TOTAL_COSTS="Total Costs" COM_COSTBENEFITPROJECTION_TOTAL_COSTS_AND_CONTRIBUTION_OF_MORBIDITY_MORTALITY_AND_RISK_FACTORS="Total Costs and Contribution of Morbidity, Mortality and Risk Factors" @@ -1360,12 +1363,16 @@ COM_COSTBENEFITPROJECTION_TOTAL_COST_PER_DISEASERISK_FACTOR="Total Cost Per Dise COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST="Total Days Lost" COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_AND_CONTRIBUTION_OF_MORBIDITY_MORTALITY_AND_RISK_FACTORS="Total Days Lost and Contribution of Morbidity, Mortality and Risk Factors" COM_COSTBENEFITPROJECTION_TOTAL_DAYS_LOST_PER_DISEASERISK_FACTOR="Total Days Lost Per Disease/Risk Factor" +COM_COSTBENEFITPROJECTION_TOTAL_EMPLOYEESBR_IN_RELATION_TO_THIS_NUMBER="total employees
in relation to this number." +COM_COSTBENEFITPROJECTION_TOTAL_EMPLOYEESBR_IN_RELATION_TO_THIS_TOTAL="total employees
in relation to this total." +COM_COSTBENEFITPROJECTION_UNAVAILABLE_AT_THIS_TIME="Unavailable at this time." COM_COSTBENEFITPROJECTION_USER_COUNTRY_GROUP="User Country Group" COM_COSTBENEFITPROJECTION_USER_MEMBER_GROUP="User Member Group" COM_COSTBENEFITPROJECTION_USER_SERVICE_PROVIDER_GROUP="User Service Provider Group" COM_COSTBENEFITPROJECTION_USE_BATCH="Use Batch" COM_COSTBENEFITPROJECTION_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method." COM_COSTBENEFITPROJECTION_VERSION="Version" +COM_COSTBENEFITPROJECTION_WARNING="Warning" COM_COSTBENEFITPROJECTION_WEBSITE="Website" COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST="Work Days Lost" COM_COSTBENEFITPROJECTION_WORK_DAYS_LOST_PERCENT="Work Days Lost Percent" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 7efc51d0..71eeb9db 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9fc5968a..72055bac 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 07807a4b..c0429a4f 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9fb584ab..6e920d39 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 cf788d00..706a0769 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.2 - @build 16th February, 2016 + @build 19th 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 afe2d8ba..a853f8da 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.2 - @build 16th February, 2016 + @build 19th 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 873fe0e6..b147eb0a 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.2 - @build 16th February, 2016 + @build 19th 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 2194a740..c0b8511b 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 ee6c8f58..1529e9c9 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a8976882..e970f9bd 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 d1e21191..13b8d5e5 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 e3abec90..6c36c871 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 bf0ad2d9..df970e21 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->eqzinterventions; +$items = $displayData->eyninterventions; $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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9fb584ab..6e920d39 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 276cc8f5..0b4027ee 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->rxtscaling_factors; +$items = $displayData->vinscaling_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 afe2d8ba..a853f8da 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.2 - @build 16th February, 2016 + @build 19th 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 873fe0e6..b147eb0a 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.2 - @build 16th February, 2016 + @build 19th 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 44727468..20f49ac3 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 f04dfc76..a311d553 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->juzcompanies; +$items = $displayData->swscompanies; $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 96c7e77e..cae1b9d4 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 5361d4ba..295e7c58 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 3a17ef73..e1271bc6 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a162bb8c..0fc4ceb4 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.2 - @build 16th February, 2016 + @build 19th 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 12232d29..f7324c66 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.2 - @build 16th February, 2016 + @build 19th 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 c32dc43e..41682a37 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->tdlinterventions; +$items = $displayData->cwlinterventions; $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 142762aa..8d8eae7e 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9fb584ab..6e920d39 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a52e83a9..53a4f5b7 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->olaservice_providers; +$items = $displayData->uxyservice_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 ec3cf0ee..97969a2d 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 66a22cf7..fd8ed7b2 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 dff3aeb5..e87a1dba 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9fb584ab..6e920d39 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 ea88e191..af32a992 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php @@ -31,6 +31,7 @@ $rounder = array( ); ?> +male) && isset($displayData->female) ): ?>
    @@ -63,3 +64,6 @@ $rounder = array(
+ + + diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index 163d7197..5d1b45fe 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 27a967c4..cc72ff5b 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 da3e8cc5..bad8531b 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 2f017601..3fc273d1 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9fb584ab..6e920d39 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 5df0b98c..eeea2034 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 478895f5..d31e1a1c 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 aa1f492f..99cc6268 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 f1303951..17e25234 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 e3abec90..6c36c871 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6a0d53f8..80838c32 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 07eefa0b..cdb5e943 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 f7e77c71..61942a4e 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 e3abec90..6c36c871 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6a0d53f8..80838c32 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 0a8e4c96..f44b9724 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 58621b5c..9375ffd9 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 c935b3ef..8c6f1cb6 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 712b5aa8..ac053c78 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 14d0ae5d..527f8b66 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6a0d53f8..80838c32 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9f680264..fec8313e 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->srvcompanies; +$items = $displayData->ofwcompanies; $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 e9c7a785..7a798b77 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6b668162..ef6f8506 100644 --- a/admin/layouts/service_provider/details_fullwidth.php +++ b/admin/layouts/service_provider/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a2b6b2e9..b4238c02 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6a0d53f8..80838c32 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 2d30fe7c..453efc64 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 85b9e171..215a8971 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 2dcc6f25..c9b30fa4 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 2a2bd963..9c04a11e 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a3baf821..7f3f7acd 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6cf4af0e..9e4b8506 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->companykjdf = $item->id; - $this->companydomr = $item->id; + $this->companybwpl = $item->id; + $this->companypcsa = $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 getRxtscaling_factors() + public function getVinscaling_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 companykjdf global. - $companykjdf = $this->companykjdf; - if (is_numeric($companykjdf )) + // Filter by companybwpl global. + $companybwpl = $this->companybwpl; + if (is_numeric($companybwpl )) { - $query->where('a.company = ' . (int) $companykjdf ); + $query->where('a.company = ' . (int) $companybwpl ); } - elseif (is_string($companykjdf)) + elseif (is_string($companybwpl)) { - $query->where('a.company = ' . $db->quote($companykjdf)); + $query->where('a.company = ' . $db->quote($companybwpl)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getEqzinterventions() + public function getEyninterventions() { // 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 companydomr global. - $companydomr = $this->companydomr; - if (is_numeric($companydomr )) + // Filter by companypcsa global. + $companypcsa = $this->companypcsa; + if (is_numeric($companypcsa )) { - $query->where('a.company = ' . (int) $companydomr ); + $query->where('a.company = ' . (int) $companypcsa ); } - elseif (is_string($companydomr)) + elseif (is_string($companypcsa)) { - $query->where('a.company = ' . $db->quote($companydomr)); + $query->where('a.company = ' . $db->quote($companypcsa)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationEqzinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationEyninterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - public function selectionTranslationEqzinterventions($value,$name) + public function selectionTranslationEyninterventions($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index 270ac0fa..34663811 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 930b1b17..0fe51ed7 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -249,5 +249,282 @@ class CostbenefitprojectionModelCostbenefitprojection extends JModelList } } return $icons; + } + + public function getUsageData() + { + // load user for access menus + $this->user = JFactory::getUser(); + // Create a new query object. + $this->db = $this->getDbo(); + // admin sees all + if ($this->user->authorise('core.options', 'com_costbenefitprojection')) + { + // set countries + $this->countries = $this->setCountries(); + // set companies + $this->companies = $this->setCompanies(); + } + else + { + // set countries + $this->countries = $this->setCountries(true); + // set companies + $this->companies = $this->setCompanies(true); + } + // now work out the satistics + if ($this->setSatistics()) + { + return $this->usageData; + } + return false; + } + + protected function setSatistics() + { + if (CostbenefitprojectionHelper::checkArray($this->companies)) + { + // Get UTC for now. + $dNow = new JDate; + // set the 2 months date + $d2month = clone $dNow; + $d2month->modify('-2 month'); + // load to string + $twoMonth = $d2month->format('Y-m-d H:i:s'); + // set the beginning of year date + $dyear = clone $dNow; + $dyear->modify('first day of January '.date('Y')); + // load to string + $year = $dyear->format('Y-m-d H:i:s'); + + // Get the advanced encription. + $advancedkey = CostbenefitprojectionHelper::getCryptKey('advanced'); + // Get the encription object. + $advanced = new FOFEncryptAes($advancedkey, 256); + + // set some default data + $this->usageData = new stdClass; + + // start looping the data + foreach ($this->companies as $company) + { + if (!empty($company->males) && $advancedkey && !is_numeric($company->males) && $company->males === base64_encode(base64_decode($company->males, true))) + { + // Decode males + $company->males = rtrim($advanced->decryptString($company->males), "\0"); + } + else + { + $company->males = 0; + } + if (!empty($company->females) && $advancedkey && !is_numeric($company->females) && $company->females === base64_encode(base64_decode($company->females, true))) + { + // Decode males + $company->females = rtrim($advanced->decryptString($company->females), "\0"); + } + else + { + $company->females = 0; + } + // number of employees + $employees = $company->males + $company->females; + // set the country total companies + $this->usageData->items[$company->country]['companies'][$company->id] = 1; + $this->usageData->total['companies'][$company->id] = 1; + $this->usageData->items[$company->country]['companies_employees'][$company->id] = $employees; + $this->usageData->total['companies_employees'][$company->id] = $employees; + // count the advanced department + if ($company->department == 2) + { + // set the country total advanced companies + $this->usageData->items[$company->country]['advanced_companies'][$company->id] = 1; + $this->usageData->total['advanced_companies'][$company->id] = 1; + $this->usageData->items[$company->country]['advanced_companies_employees'][$company->id] = $employees; + $this->usageData->total['advanced_companies_employees'][$company->id] = $employees; + } + else + { + // set the country total advanced companies + $this->usageData->items[$company->country]['advanced_companies'][$company->id] = 0; + $this->usageData->total['advanced_companies'][$company->id] = 0; + $this->usageData->items[$company->country]['advanced_companies_employees'][$company->id] = 0; + $this->usageData->total['advanced_companies_employees'][$company->id] = 0; + } + // count the basic department + if ($company->department == 1) + { + // set the country total basic companies + $this->usageData->items[$company->country]['basic_companies'][$company->id] = 1; + $this->usageData->total['basic_companies'][$company->id] = 1; + $this->usageData->items[$company->country]['basic_companies_employees'][$company->id] = $employees; + $this->usageData->total['basic_companies_employees'][$company->id] = $employees; + } + else + { + // set the country total basic companies + $this->usageData->items[$company->country]['basic_companies'][$company->id] = 0; + $this->usageData->total['basic_companies'][$company->id] = 0; + $this->usageData->items[$company->country]['basic_companies_employees'][$company->id] = 0; + $this->usageData->total['basic_companies_employees'][$company->id] = 0; + } + + // count the timed usage for last 2 months + if ($this->visitCheck($company->user,$twoMonth)) + { + // set the country total advanced companies + $this->usageData->items[$company->country]['last_two_months'][$company->id] = 1; + $this->usageData->total['last_two_months'][$company->id] = 1; + $this->usageData->items[$company->country]['last_two_months_employees'][$company->id] = $employees; + $this->usageData->total['last_two_months_employees'][$company->id] = $employees; + } + else + { + // set the country total advanced companies + $this->usageData->items[$company->country]['last_two_months'][$company->id] = 0; + $this->usageData->total['last_two_months'][$company->id] = 0; + $this->usageData->items[$company->country]['last_two_months_employees'][$company->id] = 0; + $this->usageData->total['last_two_months_employees'][$company->id] = 0; + } + // count the timed usage since begining of this year + if ($this->visitCheck($company->user,$year)) + { + // set the country total basic companies + $this->usageData->items[$company->country]['since_beginning_this_year'][$company->id] = 1; + $this->usageData->total['since_beginning_this_year'][$company->id] = 1; + $this->usageData->items[$company->country]['since_beginning_this_year_employees'][$company->id] = $employees; + $this->usageData->total['since_beginning_this_year_employees'][$company->id] = $employees; + } + else + { + // set the country total basic companies + $this->usageData->items[$company->country]['since_beginning_this_year'][$company->id] = 0; + $this->usageData->total['since_beginning_this_year'][$company->id] = 0; + $this->usageData->items[$company->country]['since_beginning_this_year_employees'][$company->id] = 0; + $this->usageData->total['since_beginning_this_year_employees'][$company->id] = 0; + } + } + + // sum the item arrays + foreach ($this->usageData->items as $country => $data) + { + // insure to set the name of the country + $this->usageData->items[$country]['name'] = $this->countries[$country]; + foreach($data as $key => $array) + { + $this->usageData->items[$country][$key] = array_sum($array); + } + } + // sum the total array + foreach ($this->usageData->total as $tkey => $tarray) + { + $this->usageData->total[$tkey] = array_sum($tarray); + } + + return true; + } + return false; + } + + protected function visitCheck($user,$time) + { + // set a token + $token = md5($time.$user); + if (!isset($this->checkedUser[$token])) + { + // Create a new query object. + $query = $this->db->getQuery(true); + // Get from #__costbenefitprojection_company as a + $query->select($this->db->quoteName(array('a.id'))); + $query->from($this->db->quoteName('#__users', 'a')); + $query->where($this->db->qn('a.lastvisitDate') . ' >= ' . $this->db->quote($time)); + // limit to only load these countries + $query->where('a.id = ' . (int) $user); + // load the query + $this->db->setQuery($query); + $this->db->execute(); + if ($this->db->getNumRows()) + { + $this->checkedUser[$token] = true; + } + else + { + $this->checkedUser[$token] = false; + } + } + return $this->checkedUser[$token]; + } + + protected function setCompanies($limited = false) + { + // check if there is any countries loaded + if (CostbenefitprojectionHelper::checkArray($this->countries)) + { + // Create a new query object. + $query = $this->db->getQuery(true); + // Get from #__costbenefitprojection_company as a + $query->select($this->db->quoteName( + array('a.id','a.user','a.name','a.country','a.department','a.males','a.females'), + array('id','user','name','country','department','males','females'))); + $query->from($this->db->quoteName('#__costbenefitprojection_company', 'a')); + if ($limited) + { + // get his companies + $ids = CostbenefitprojectionHelper::hisCompanies($this->user->id); + // limit to only load his companies + $query->where('a.id IN (' . implode(',', $ids) . ')'); + } + // get only from set countries + $countryIds = array_keys($this->countries); + // limit to only load these countries + $query->where('a.country IN (' . implode(',', $countryIds) . ')'); + $query->order('a.country ASC'); + // load the query + $this->db->setQuery($query); + $this->db->execute(); + if ($this->db->getNumRows()) + { + return $this->db->loadObjectList(); + } + } + return false; + } + + protected function setCountries($limited = false) + { + // Create a new query object. + $query = $this->db->getQuery(true); + + // Get from #__costbenefitprojection_country as a + $query->select($this->db->quoteName( + array('a.id','a.name'), + array('id','name'))); + $query->from($this->db->quoteName('#__costbenefitprojection_country', 'a')); + if ($limited) + { + // get his countries + $ids = CostbenefitprojectionHelper::hisCountries($this->user->id); + // limit to only load his countries + $query->where('a.id IN (' . implode(',', $ids) . ')'); + } + else + { + $query->where('CHAR_LENGTH(a.causesrisks) > 5'); + $query->where('CHAR_LENGTH(a.percentfemale) > 5'); + $query->where('CHAR_LENGTH(a.percentmale) > 5'); + $query->where('CHAR_LENGTH(a.datayear) > 3'); + $query->where('CHAR_LENGTH(a.productivity_losses) > 0'); + $query->where('CHAR_LENGTH(a.sick_leave) > 0'); + $query->where('CHAR_LENGTH(a.medical_turnovers) > 0'); + } + $query->where('a.published = 1'); + $query->order('a.name ASC'); + // load the query + $this->db->setQuery($query); + $this->db->execute(); + if ($this->db->getNumRows()) + { + return $this->db->loadAssocList('id', 'name'); + } + return false; } } diff --git a/admin/models/countries.php b/admin/models/countries.php index 737f773a..68a7e56b 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 1f026d39..0e05e49a 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->countryiypr = $item->id; - $this->countryfccn = $item->id; - $this->countryvjxo = $item->id; + $this->countryyijz = $item->id; + $this->countryunbg = $item->id; + $this->countryhmyp = $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 getTdlinterventions() + public function getCwlinterventions() { // 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 countryiypr global. - $countryiypr = $this->countryiypr; - if (is_numeric($countryiypr )) + // Filter by countryyijz global. + $countryyijz = $this->countryyijz; + if (is_numeric($countryyijz )) { - $query->where('a.country = ' . (int) $countryiypr ); + $query->where('a.country = ' . (int) $countryyijz ); } - elseif (is_string($countryiypr)) + elseif (is_string($countryyijz)) { - $query->where('a.country = ' . $db->quote($countryiypr)); + $query->where('a.country = ' . $db->quote($countryyijz)); } else { @@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationTdlinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationCwlinterventions($item->type, 'type'); } } @@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationTdlinterventions($value,$name) + public function selectionTranslationCwlinterventions($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 getOlaservice_providers() + public function getUxyservice_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 countryfccn global. - $countryfccn = $this->countryfccn; - if (is_numeric($countryfccn )) + // Filter by countryunbg global. + $countryunbg = $this->countryunbg; + if (is_numeric($countryunbg )) { - $query->where('a.country = ' . (int) $countryfccn ); + $query->where('a.country = ' . (int) $countryunbg ); } - elseif (is_string($countryfccn)) + elseif (is_string($countryunbg)) { - $query->where('a.country = ' . $db->quote($countryfccn)); + $query->where('a.country = ' . $db->quote($countryunbg)); } else { @@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getJuzcompanies() + public function getSwscompanies() { // Get the user object. $user = JFactory::getUser(); @@ -379,15 +379,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('i.user','serviceprovider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by countryvjxo global. - $countryvjxo = $this->countryvjxo; - if (is_numeric($countryvjxo )) + // Filter by countryhmyp global. + $countryhmyp = $this->countryhmyp; + if (is_numeric($countryhmyp )) { - $query->where('a.country = ' . (int) $countryvjxo ); + $query->where('a.country = ' . (int) $countryhmyp ); } - elseif (is_string($countryvjxo)) + elseif (is_string($countryhmyp)) { - $query->where('a.country = ' . $db->quote($countryvjxo)); + $query->where('a.country = ' . $db->quote($countryhmyp)); } else { @@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationJuzcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationSwscompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationJuzcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationSwscompanies($item->per, 'per'); } } @@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationJuzcompanies($value,$name) + public function selectionTranslationSwscompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/models/currencies.php b/admin/models/currencies.php index b372db35..f241db38 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 527d09bd..e9200297 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 3ef21a02..f5f5b90f 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 cec9bcf8..ca2603da 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 58eafe3c..b5056547 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 32a514b1..3aeff5ee 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 0c1a636b..3e4bb5cf 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 57550d8d..e5ae7568 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 3c9e6cac..7fb9efc0 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 cbbc34f8..8c5fcfa3 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 fb6794a7..25a061ca 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 7e5191e0..9c747f47 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 088c4cbd..f89c26a3 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 28e2cc57..2f036dc7 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 51f98eb6..bdddfbf7 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 1e16c839..8112533e 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_imCbNHFptl_required = false; -jform_imCbNHFifp_required = false; -jform_imCbNHFdFJ_required = false; -jform_imCbNHFtBN_required = false; -jform_imCbNHFXQG_required = false; -jform_imCbNHFZvf_required = false; -jform_imCbNHFMrX_required = false; +jform_FwCvUQLCqY_required = false; +jform_FwCvUQLLhk_required = false; +jform_FwCvUQLLQu_required = false; +jform_FwCvUQLSar_required = false; +jform_FwCvUQLxYu_required = false; +jform_FwCvUQLIjP_required = false; +jform_FwCvUQLyQM_required = false; // Initial Script jQuery(document).ready(function() { - var department_imCbNHF = jQuery("#jform_department input[type='radio']:checked").val(); - imCbNHF(department_imCbNHF); + var department_FwCvUQL = jQuery("#jform_department input[type='radio']:checked").val(); + FwCvUQL(department_FwCvUQL); - var department_HpJMxqK = jQuery("#jform_department input[type='radio']:checked").val(); - HpJMxqK(department_HpJMxqK); + var department_desBIPd = jQuery("#jform_department input[type='radio']:checked").val(); + desBIPd(department_desBIPd); }); -// the imCbNHF function -function imCbNHF(department_imCbNHF) +// the FwCvUQL function +function FwCvUQL(department_FwCvUQL) { // set the function logic - if (department_imCbNHF == 2) + if (department_FwCvUQL == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_imCbNHFptl_required) + if (jform_FwCvUQLCqY_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_imCbNHFptl_required = false; + jform_FwCvUQLCqY_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_imCbNHFifp_required) + if (jform_FwCvUQLLhk_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_imCbNHFifp_required = false; + jform_FwCvUQLLhk_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_imCbNHFdFJ_required) + if (jform_FwCvUQLLQu_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_imCbNHFdFJ_required = false; + jform_FwCvUQLLQu_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_imCbNHFtBN_required) + if (jform_FwCvUQLSar_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_imCbNHFtBN_required = false; + jform_FwCvUQLSar_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_imCbNHFXQG_required) + if (jform_FwCvUQLxYu_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_imCbNHFXQG_required = false; + jform_FwCvUQLxYu_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_imCbNHFZvf_required) + if (jform_FwCvUQLIjP_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_imCbNHFZvf_required = false; + jform_FwCvUQLIjP_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_imCbNHFMrX_required) + if (jform_FwCvUQLyQM_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_imCbNHFMrX_required = false; + jform_FwCvUQLyQM_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_imCbNHFptl_required) + if (!jform_FwCvUQLCqY_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_imCbNHFptl_required = true; + jform_FwCvUQLCqY_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_imCbNHFifp_required) + if (!jform_FwCvUQLLhk_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_imCbNHFifp_required = true; + jform_FwCvUQLLhk_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_imCbNHFdFJ_required) + if (!jform_FwCvUQLLQu_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_imCbNHFdFJ_required = true; + jform_FwCvUQLLQu_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_imCbNHFtBN_required) + if (!jform_FwCvUQLSar_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_imCbNHFtBN_required = true; + jform_FwCvUQLSar_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_imCbNHFXQG_required) + if (!jform_FwCvUQLxYu_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_imCbNHFXQG_required = true; + jform_FwCvUQLxYu_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_imCbNHFZvf_required) + if (!jform_FwCvUQLIjP_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_imCbNHFZvf_required = true; + jform_FwCvUQLIjP_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_imCbNHFMrX_required) + if (!jform_FwCvUQLyQM_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_imCbNHFMrX_required = true; + jform_FwCvUQLyQM_required = true; } } } -// the HpJMxqK function -function HpJMxqK(department_HpJMxqK) +// the desBIPd function +function desBIPd(department_desBIPd) { // set the function logic - if (department_HpJMxqK == 1) + if (department_desBIPd == 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 a3a35700..8cdfb019 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 e1130ed8..3e039cb1 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 5fa098eb..d279931d 100644 --- a/admin/models/forms/health_data.js +++ b/admin/models/forms/health_data.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 0840be72..254aecf5 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.js @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_nBdbRfDClv_required = false; -jform_typoIBttBg_required = false; -jform_escOQgLoFt_required = false; -jform_ENSCNMHstX_required = false; +jform_hVGnssptik_required = false; +jform_oCoSRkNohn_required = false; +jform_sPmjArzBrm_required = false; +jform_FynoIBCSbK_required = false; // Initial Script jQuery(document).ready(function() { - var location_HSNKYXL = jQuery("#jform_location input[type='radio']:checked").val(); - HSNKYXL(location_HSNKYXL); + var location_sZyfKYR = jQuery("#jform_location input[type='radio']:checked").val(); + sZyfKYR(location_sZyfKYR); - var location_qeWtANs = jQuery("#jform_location input[type='radio']:checked").val(); - qeWtANs(location_qeWtANs); + var location_NZsaZHc = jQuery("#jform_location input[type='radio']:checked").val(); + NZsaZHc(location_NZsaZHc); - var type_nBdbRfD = jQuery("#jform_type").val(); - nBdbRfD(type_nBdbRfD); + var type_hVGnssp = jQuery("#jform_type").val(); + hVGnssp(type_hVGnssp); - var type_typoIBt = jQuery("#jform_type").val(); - typoIBt(type_typoIBt); + var type_oCoSRkN = jQuery("#jform_type").val(); + oCoSRkN(type_oCoSRkN); - var type_escOQgL = jQuery("#jform_type").val(); - escOQgL(type_escOQgL); + var type_sPmjArz = jQuery("#jform_type").val(); + sPmjArz(type_sPmjArz); - var target_ENSCNMH = jQuery("#jform_target input[type='radio']:checked").val(); - ENSCNMH(target_ENSCNMH); + var target_FynoIBC = jQuery("#jform_target input[type='radio']:checked").val(); + FynoIBC(target_FynoIBC); }); -// the HSNKYXL function -function HSNKYXL(location_HSNKYXL) +// the sZyfKYR function +function sZyfKYR(location_sZyfKYR) { // set the function logic - if (location_HSNKYXL == 1) + if (location_sZyfKYR == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function HSNKYXL(location_HSNKYXL) } } -// the qeWtANs function -function qeWtANs(location_qeWtANs) +// the NZsaZHc function +function NZsaZHc(location_NZsaZHc) { // set the function logic - if (location_qeWtANs == 2) + if (location_NZsaZHc == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function qeWtANs(location_qeWtANs) } } -// the nBdbRfD function -function nBdbRfD(type_nBdbRfD) +// the hVGnssp function +function hVGnssp(type_hVGnssp) { - if (isSet(type_nBdbRfD) && type_nBdbRfD.constructor !== Array) + if (isSet(type_hVGnssp) && type_hVGnssp.constructor !== Array) { - var temp_nBdbRfD = type_nBdbRfD; - var type_nBdbRfD = []; - type_nBdbRfD.push(temp_nBdbRfD); + var temp_hVGnssp = type_hVGnssp; + var type_hVGnssp = []; + type_hVGnssp.push(temp_hVGnssp); } - else if (!isSet(type_nBdbRfD)) + else if (!isSet(type_hVGnssp)) { - var type_nBdbRfD = []; + var type_hVGnssp = []; } - var type = type_nBdbRfD.some(type_nBdbRfD_SomeFunc); + var type = type_hVGnssp.some(type_hVGnssp_SomeFunc); // set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_nBdbRfDClv_required) + if (jform_hVGnssptik_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_nBdbRfDClv_required = false; + jform_hVGnssptik_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_nBdbRfDClv_required) + if (!jform_hVGnssptik_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_nBdbRfDClv_required = true; + jform_hVGnssptik_required = true; } } } -// the nBdbRfD Some function -function type_nBdbRfD_SomeFunc(type_nBdbRfD) +// the hVGnssp Some function +function type_hVGnssp_SomeFunc(type_hVGnssp) { // set the function logic - if (type_nBdbRfD == 3) + if (type_hVGnssp == 3) { return true; } return false; } -// the typoIBt function -function typoIBt(type_typoIBt) +// the oCoSRkN function +function oCoSRkN(type_oCoSRkN) { - if (isSet(type_typoIBt) && type_typoIBt.constructor !== Array) + if (isSet(type_oCoSRkN) && type_oCoSRkN.constructor !== Array) { - var temp_typoIBt = type_typoIBt; - var type_typoIBt = []; - type_typoIBt.push(temp_typoIBt); + var temp_oCoSRkN = type_oCoSRkN; + var type_oCoSRkN = []; + type_oCoSRkN.push(temp_oCoSRkN); } - else if (!isSet(type_typoIBt)) + else if (!isSet(type_oCoSRkN)) { - var type_typoIBt = []; + var type_oCoSRkN = []; } - var type = type_typoIBt.some(type_typoIBt_SomeFunc); + var type = type_oCoSRkN.some(type_oCoSRkN_SomeFunc); // set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_typoIBttBg_required) + if (jform_oCoSRkNohn_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_typoIBttBg_required = false; + jform_oCoSRkNohn_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_typoIBttBg_required) + if (!jform_oCoSRkNohn_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_typoIBttBg_required = true; + jform_oCoSRkNohn_required = true; } } } -// the typoIBt Some function -function type_typoIBt_SomeFunc(type_typoIBt) +// the oCoSRkN Some function +function type_oCoSRkN_SomeFunc(type_oCoSRkN) { // set the function logic - if (type_typoIBt == 1) + if (type_oCoSRkN == 1) { return true; } return false; } -// the escOQgL function -function escOQgL(type_escOQgL) +// the sPmjArz function +function sPmjArz(type_sPmjArz) { - if (isSet(type_escOQgL) && type_escOQgL.constructor !== Array) + if (isSet(type_sPmjArz) && type_sPmjArz.constructor !== Array) { - var temp_escOQgL = type_escOQgL; - var type_escOQgL = []; - type_escOQgL.push(temp_escOQgL); + var temp_sPmjArz = type_sPmjArz; + var type_sPmjArz = []; + type_sPmjArz.push(temp_sPmjArz); } - else if (!isSet(type_escOQgL)) + else if (!isSet(type_sPmjArz)) { - var type_escOQgL = []; + var type_sPmjArz = []; } - var type = type_escOQgL.some(type_escOQgL_SomeFunc); + var type = type_sPmjArz.some(type_sPmjArz_SomeFunc); // set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_escOQgLoFt_required) + if (jform_sPmjArzBrm_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_escOQgLoFt_required = false; + jform_sPmjArzBrm_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_escOQgLoFt_required) + if (!jform_sPmjArzBrm_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_escOQgLoFt_required = true; + jform_sPmjArzBrm_required = true; } } } -// the escOQgL Some function -function type_escOQgL_SomeFunc(type_escOQgL) +// the sPmjArz Some function +function type_sPmjArz_SomeFunc(type_sPmjArz) { // set the function logic - if (type_escOQgL == 2) + if (type_sPmjArz == 2) { return true; } return false; } -// the ENSCNMH function -function ENSCNMH(target_ENSCNMH) +// the FynoIBC function +function FynoIBC(target_FynoIBC) { // set the function logic - if (target_ENSCNMH == 1) + if (target_FynoIBC == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_ENSCNMHstX_required) + if (jform_FynoIBCSbK_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_ENSCNMHstX_required = false; + jform_FynoIBCSbK_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_ENSCNMHstX_required) + if (!jform_FynoIBCSbK_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_ENSCNMHstX_required = true; + jform_FynoIBCSbK_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index 616946a0..2b947a1a 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js @@ -17,58 +17,58 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_hjWzglcxQU_required = false; -jform_QhXOtTUjpY_required = false; +jform_EzNfbypasb_required = false; +jform_bMXTubFuXT_required = false; // Initial Script jQuery(document).ready(function() { - var type_hjWzglc = jQuery("#jform_type input[type='radio']:checked").val(); - hjWzglc(type_hjWzglc); + var type_EzNfbyp = jQuery("#jform_type input[type='radio']:checked").val(); + EzNfbyp(type_EzNfbyp); - var type_KIPRxZv = jQuery("#jform_type input[type='radio']:checked").val(); - KIPRxZv(type_KIPRxZv); + var type_ikDeDTb = jQuery("#jform_type input[type='radio']:checked").val(); + ikDeDTb(type_ikDeDTb); - var company_QhXOtTU = jQuery("#jform_company").val(); - QhXOtTU(company_QhXOtTU); + var company_bMXTubF = jQuery("#jform_company").val(); + bMXTubF(company_bMXTubF); }); -// the hjWzglc function -function hjWzglc(type_hjWzglc) +// the EzNfbyp function +function EzNfbyp(type_EzNfbyp) { // set the function logic - if (type_hjWzglc == 2) + if (type_EzNfbyp == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_hjWzglcxQU_required) + if (jform_EzNfbypasb_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_hjWzglcxQU_required = false; + jform_EzNfbypasb_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_hjWzglcxQU_required) + if (!jform_EzNfbypasb_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_hjWzglcxQU_required = true; + jform_EzNfbypasb_required = true; } } } -// the KIPRxZv function -function KIPRxZv(type_KIPRxZv) +// the ikDeDTb function +function ikDeDTb(type_ikDeDTb) { // set the function logic - if (type_KIPRxZv == 1) + if (type_ikDeDTb == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } @@ -78,55 +78,55 @@ function KIPRxZv(type_KIPRxZv) } } -// the QhXOtTU function -function QhXOtTU(company_QhXOtTU) +// the bMXTubF function +function bMXTubF(company_bMXTubF) { - if (isSet(company_QhXOtTU) && company_QhXOtTU.constructor !== Array) + if (isSet(company_bMXTubF) && company_bMXTubF.constructor !== Array) { - var temp_QhXOtTU = company_QhXOtTU; - var company_QhXOtTU = []; - company_QhXOtTU.push(temp_QhXOtTU); + var temp_bMXTubF = company_bMXTubF; + var company_bMXTubF = []; + company_bMXTubF.push(temp_bMXTubF); } - else if (!isSet(company_QhXOtTU)) + else if (!isSet(company_bMXTubF)) { - var company_QhXOtTU = []; + var company_bMXTubF = []; } - var company = company_QhXOtTU.some(company_QhXOtTU_SomeFunc); + var company = company_bMXTubF.some(company_bMXTubF_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_QhXOtTUjpY_required) + if (jform_bMXTubFuXT_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_QhXOtTUjpY_required = false; + jform_bMXTubFuXT_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_QhXOtTUjpY_required) + if (!jform_bMXTubFuXT_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_QhXOtTUjpY_required = true; + jform_bMXTubFuXT_required = true; } } } -// the QhXOtTU Some function -function company_QhXOtTU_SomeFunc(company_QhXOtTU) +// the bMXTubF Some function +function company_bMXTubF_SomeFunc(company_bMXTubF) { // set the function logic - if (company_QhXOtTU == 0) + if (company_bMXTubF == 0) { return true; } diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index 6d9ee789..633349ee 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.js @@ -17,64 +17,64 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_gXgQwdAHQh_required = false; +jform_BfKaWpdbEL_required = false; // Initial Script jQuery(document).ready(function() { - var company_gXgQwdA = jQuery("#jform_company").val(); - gXgQwdA(company_gXgQwdA); + var company_BfKaWpd = jQuery("#jform_company").val(); + BfKaWpd(company_BfKaWpd); }); -// the gXgQwdA function -function gXgQwdA(company_gXgQwdA) +// the BfKaWpd function +function BfKaWpd(company_BfKaWpd) { - if (isSet(company_gXgQwdA) && company_gXgQwdA.constructor !== Array) + if (isSet(company_BfKaWpd) && company_BfKaWpd.constructor !== Array) { - var temp_gXgQwdA = company_gXgQwdA; - var company_gXgQwdA = []; - company_gXgQwdA.push(temp_gXgQwdA); + var temp_BfKaWpd = company_BfKaWpd; + var company_BfKaWpd = []; + company_BfKaWpd.push(temp_BfKaWpd); } - else if (!isSet(company_gXgQwdA)) + else if (!isSet(company_BfKaWpd)) { - var company_gXgQwdA = []; + var company_BfKaWpd = []; } - var company = company_gXgQwdA.some(company_gXgQwdA_SomeFunc); + var company = company_BfKaWpd.some(company_BfKaWpd_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_gXgQwdAHQh_required) + if (jform_BfKaWpdbEL_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_gXgQwdAHQh_required = false; + jform_BfKaWpdbEL_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_gXgQwdAHQh_required) + if (!jform_BfKaWpdbEL_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_gXgQwdAHQh_required = true; + jform_BfKaWpdbEL_required = true; } } } -// the gXgQwdA Some function -function company_gXgQwdA_SomeFunc(company_gXgQwdA) +// the BfKaWpd Some function +function company_BfKaWpd_SomeFunc(company_BfKaWpd) { // set the function logic - if (company_gXgQwdA == 0) + if (company_BfKaWpd == 0) { return true; } diff --git a/admin/models/forms/service_provider.js b/admin/models/forms/service_provider.js index 90405d22..a45267a2 100644 --- a/admin/models/forms/service_provider.js +++ b/admin/models/forms/service_provider.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9a30379f..a5c96bfb 100644 --- a/admin/models/health_data.php +++ b/admin/models/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index 5cf78f66..cdcf7cae 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a01f8d17..1c51da98 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 49aa5325..abd27df0 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 abb3deb2..0fa3542b 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 66cb0a23..621238f9 100644 --- a/admin/models/intervention.php +++ b/admin/models/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/models/interventions.php b/admin/models/interventions.php index eacbc575..091040dd 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 3a738545..671dec2f 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index d7540ba7..e5701722 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 7f54909c..d7551a85 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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->serviceprovidereiwh = $item->id; + $this->serviceproviderlhnz = $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 getSrvcompanies() + public function getOfwcompanies() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $query->select($db->quoteName('i.user','serviceprovider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by serviceprovidereiwh global. - $serviceprovidereiwh = $this->serviceprovidereiwh; - if (is_numeric($serviceprovidereiwh )) + // Filter by serviceproviderlhnz global. + $serviceproviderlhnz = $this->serviceproviderlhnz; + if (is_numeric($serviceproviderlhnz )) { - $query->where('a.serviceprovider = ' . (int) $serviceprovidereiwh ); + $query->where('a.serviceprovider = ' . (int) $serviceproviderlhnz ); } - elseif (is_string($serviceprovidereiwh)) + elseif (is_string($serviceproviderlhnz)) { - $query->where('a.serviceprovider = ' . $db->quote($serviceprovidereiwh)); + $query->where('a.serviceprovider = ' . $db->quote($serviceproviderlhnz)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationSrvcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationOfwcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationSrvcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationOfwcompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - public function selectionTranslationSrvcompanies($value,$name) + public function selectionTranslationOfwcompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index d6742fe3..68069bef 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 1f93018e..43736e0b 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6337101b..bff9d49a 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 cc46689a..401ea3e7 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 16dd5cb2..cf8fd2c3 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 89e8246d..26b0cd6d 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 4bccafd9..4340d156 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 bf820c85..f2867781 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 83aabdfa..02c549af 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 9699f29f..60462e84 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 1599e734..5e40c8b3 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 dc9e8748..b8a33531 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 5d69636a..14ee85ba 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 e1b56ee1..8ccec00b 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 d89b9b06..6aa1e373 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 422ca659..4be311d1 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.2 - @build 16th February, 2016 + @build 19th 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 218309ba..9330db1f 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.2 - @build 16th February, 2016 + @build 19th 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 8c55dcf6..60d440b2 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 73bf9366..af16828e 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a90fd326..8c860849 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 cde94b05..b16cd364 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 8d64784d..71d59e9c 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 a993ffdf..dd352d12 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 d4e44fc2..cfd17aa1 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.2 - @build 16th February, 2016 + @build 19th 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 1779e258..e724192e 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.2 - @build 16th February, 2016 + @build 19th 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 002c981f..be3911d4 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.2 - @build 16th February, 2016 + @build 19th 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 5775de43..cc469a77 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.2 - @build 16th February, 2016 + @build 19th 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 cc1603f7..ed29c184 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.2 - @build 16th February, 2016 + @build 19th 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 f81120c0..db8df19a 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 23421943..698afeab 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.2 - @build 16th February, 2016 + @build 19th 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 5ddbb8fc..0a399027 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.2 - @build 16th February, 2016 + @build 19th 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 3c5e97b4..875fbf33 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.2 - @build 16th February, 2016 + @build 19th 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 bb9d9dd2..40ee5803 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.2 - @build 16th February, 2016 + @build 19th 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 b2dd46ed..de44e6ae 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 8e903ebb..db23ff06 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 50c4dddc..ff37fccb 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.2 - @build 16th February, 2016 + @build 19th 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 247cb36a..3451e3c2 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.2 - @build 16th February, 2016 + @build 19th 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 9dd71b1c..1e0468e9 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 4fabf8ce..b24c0c66 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 d497e6bb..365a9ba1 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 37e00607..86c32c97 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 5aab7940..67f253ef 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 bedbb8cf..96bf4f31 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th 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 6ba1a99a..3183571d 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.2 - @build 16th February, 2016 + @build 19th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php @@ -141,33 +141,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');