From 13221f5f4d4d76d0bafeba44c75b771a41b8a2eb Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sun, 28 Feb 2016 23:18:59 +0200 Subject: [PATCH] We added the turnover comment box as was requested. --- README.md | 8 +- admin/access.xml | 2 +- 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 | 2 +- admin/helpers/sumcombine.php | 2 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 4 + 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 | 3 +- admin/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 2 +- admin/layouts/company/publishing.php | 2 +- admin/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- .../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 | 2 +- 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 | 2 +- .../country/public_details_fullwidth.php | 2 +- admin/layouts/country/publishing.php | 2 +- admin/layouts/country/publlshing.php | 2 +- .../country/service_providers_fullwidth.php | 2 +- 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 | 2 +- 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 | 2 +- .../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 | 50 ++-- admin/models/companies.php | 40 +-- admin/models/company.php | 118 ++++----- admin/models/companyresults.php | 50 ++-- admin/models/costbenefitprojection.php | 2 +- admin/models/countries.php | 2 +- admin/models/country.php | 2 +- 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 | 4 +- admin/models/forms/company.xml | 228 +++++++++--------- 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 | 2 +- admin/models/forms/intervention.js | 2 +- admin/models/forms/scaling_factor.js | 2 +- 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 | 2 +- admin/models/service_providers.php | 2 +- admin/sql/install.mysql.utf8.sql | 1 + admin/sql/updates/mysql/3.3.7.sql | 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 | 2 +- admin/views/company/view.html.php | 2 +- 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 | 2 +- .../tmpl/default_main.php | 2 +- .../tmpl/default_usage_statistics_table.php | 2 +- .../tmpl/default_vdm.php | 2 +- .../views/costbenefitprojection/view.html.php | 2 +- 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 | 2 +- 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 | 2 +- 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 | 2 +- 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 | 2 +- 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 | 2 +- .../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 | 4 +- script.php | 8 +- 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 | 4 + 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 | 3 +- site/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 2 +- site/layouts/company/publishing.php | 2 +- site/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- site/layouts/companydetails.php | 2 +- site/layouts/databreakdownmalefemale.php | 2 +- 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 | 50 ++-- site/models/company.php | 118 ++++----- site/models/companyresults.php | 50 ++-- site/models/cpanel.php | 50 ++-- site/models/createaccount.php | 2 +- site/models/forms/company.js | 4 +- site/models/forms/company.xml | 228 +++++++++--------- site/models/forms/intervention.js | 2 +- site/models/forms/scaling_factor.js | 2 +- 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 | 2 +- site/views/company/view.html.php | 2 +- 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 | 2 +- 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 | 2 +- site/views/scaling_factor/view.html.php | 2 +- 417 files changed, 930 insertions(+), 889 deletions(-) create mode 100644 admin/sql/updates/mysql/3.3.7.sql diff --git a/README.md b/README.md index 1341214e..1a85bec2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cost Benefit Projection (3.3.7) +# Cost Benefit Projection (3.3.8) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -23,11 +23,11 @@ max_input_vars = 5000 + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 + *Last Build*: 28th February, 2016 -+ *Version*: 3.3.7 ++ *Version*: 3.3.8 + *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*: **83614** -+ *File count*: **553** ++ *Line count*: **83672** ++ *File count*: **554** + *Folder count*: **101** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). diff --git a/admin/access.xml b/admin/access.xml index 47c03fa6..0756458a 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -173,8 +173,8 @@ - + diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index fa1a7c73..b752c2fe 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css index 08770968..67a0f1a8 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css index 706367a7..d32fc83b 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css index d02f66b0..0d010895 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css index bf0efe83..8115e8df 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css index 5efde04a..00347c5c 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css index e36e10a4..17e31c32 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 4791f53c..14b685ff 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index 6aaa688c..e5c1be5e 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index 97c9d491..bc39d2c1 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 2425415b..087aacd9 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 31e7db6c..ec916837 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css index 2b982d00..d08ae88b 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css index e084f8b5..3e12f49c 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 87aeb811..974d51e1 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index a6d8200f..7c9e5592 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css index 1f2ddb89..411978ef 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css index 03fe683c..6641474d 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css index ba6878bc..7324b6c6 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css index f91bc044..574e3923 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css index c4359344..7586cca0 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css index 7c3bc2c4..0b3666fe 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controller.php b/admin/controller.php index ba2b80c2..cdb6a71e 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index a58cfe5f..b04586f4 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index 0661ab4a..91e728c3 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index c74add6e..bb77bf5f 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index 99f48d33..16cad0c3 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index 643f57a9..93167e83 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/company.php b/admin/controllers/company.php index d4da53f0..3fb9d0e1 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index 295b1358..6c1b0137 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index e126255b..cb8a9585 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 1a6b32eb..c49ecb72 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/country.php b/admin/controllers/country.php index b740ac99..b51ba39d 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index 0cef4e47..ec649e2e 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 4736e200..0cee340b 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php index ba03c1e9..db29a612 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php index b9a1ee44..327d8712 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/help.php b/admin/controllers/help.php index b14eca51..3c917030 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index f8bc0d04..9aeb644b 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index cad41cbc..fabbe214 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 8bb30daa..18a8b815 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index aa1d2371..8f74f545 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index 5afd91c5..d56d4dea 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php index 6c6b180b..f8a282b1 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php index 9897c0c0..df631e02 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php index 46a02055..5530a137 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php index ab67bc31..deefbc75 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index a68e41f4..124e01fa 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index 0068d9e7..bbb3ffc5 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 2e17ea56..28d5b5b4 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index f21c43da..f3062b74 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index 958ee169..45bd2964 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini index bdacd721..5c988fc1 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -284,6 +284,10 @@ COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY="Total Salary" COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_DESCRIPTION="The total salary payed per/year" COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_HINT="per/year" COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_LABEL="Total Salary" +COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT="Turnover Comment" +COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_DESCRIPTION="Here you can explain how many deaths your company has had over any given period. This will help us understand how you came to the numbers used above in the male and female medical turnovers." +COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_HINT="You can make a comment here to indicate how you arrived at the given numbers above for male and female medical turnovers." +COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_LABEL="Turnover Comment" COM_COSTBENEFITPROJECTION_COMPANY_TWENTYTWENTY_FOUR="20-24" COM_COSTBENEFITPROJECTION_COMPANY_TWENTY_FIVETWENTY_NINE="25-29" COM_COSTBENEFITPROJECTION_COMPANY_USER="User" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 014e868c..d4b1d3c4 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php index 1382c3aa..6fddfedb 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index 42102add..567e929d 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index da726045..b4ebc55c 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index b180d343..b9b94ab9 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index d130af0e..63bc4692 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index b4356a73..1190d663 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index 12be3228..741a146f 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index aa98f41f..6b1a381d 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index 599b0f51..5b960c7f 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index 5643e7ad..075910dc 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -32,6 +32,7 @@ $fields = $displayData->get('fields') ?: array( 'females', 'medical_turnovers_males', 'medical_turnovers_females', + 'turnover_comment', 'sick_leave_males', 'sick_leave_females' ); diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index e43ef68d..55876ddb 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index 2106d9a8..75da9729 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index da726045..b4ebc55c 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index 3ce5c39b..669c216f 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index d130af0e..63bc4692 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index b4356a73..1190d663 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index 058adb24..732f5448 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index 331b404d..258d769f 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 624f67cb..34c834ae 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index 3083757d..8d54e213 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index 49dc2414..9a573914 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index 9182263b..dade20ee 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index 5fcafbab..34e29a1b 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index a3c92d67..d1ec43c9 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index bf1821a3..2c49a8f2 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index da726045..b4ebc55c 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index dcee89d8..5f0ec457 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 2d65615f..0e3fc6bc 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 7e9b630e..4913cfc4 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index caf25d40..9f8a12f2 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index da726045..b4ebc55c 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index 7c72dd68..a402056f 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index fdad1ba9..94b7f780 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index 5e3f43a0..f344d806 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index 13f5411d..0453efa7 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index 9aff2ded..12f933b1 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index da726045..b4ebc55c 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index c5b459a4..3f69a696 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index a2eee1ce..539dcd5d 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index a3ddac3d..d7eb51bb 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index ca613dec..ddc49ab0 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index e43ef68d..55876ddb 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index d38998cb..104fae61 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index ebb00833..6e70e03e 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index be4cc2dd..dde4d183 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index e43ef68d..55876ddb 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index d38998cb..104fae61 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index b16651a2..e65b0245 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index f6bdd032..cac7c3e8 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index 6dbf4fc2..76ea05eb 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index bfe038c5..cf24ab0c 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index be7fa788..3d4aa85b 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index d38998cb..104fae61 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index c7ee502b..13e71804 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index 7be162db..094217bb 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php index f0d0d45c..fb4f09af 100644 --- a/admin/layouts/service_provider/details_fullwidth.php +++ b/admin/layouts/service_provider/details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index 08f6bb5a..de023028 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index d38998cb..104fae61 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/ajax.php b/admin/models/ajax.php index a5764e16..c8c9ece7 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index 10b83755..b2a2dd94 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 61ecdcb0..16787f90 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index a9e99ca2..616f05da 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -162,51 +162,51 @@ class CostbenefitprojectionModelCombinedresults extends JModelList { // Always create a slug for sef URL's $item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id; - if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) { - // Decode medical_turnovers_males - $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); - } - if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) - { - // Decode sick_leave_males - $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); - } - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // Decode males - $item->males = rtrim($advanced->decryptString($item->males), "\0"); - } - if (CostbenefitprojectionHelper::checkString($item->causesrisks)) - { - // Decode causesrisks - $item->causesrisks = json_decode($item->causesrisks, true); + // Decode medical_turnovers_females + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); } if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // Decode females $item->females = rtrim($advanced->decryptString($item->females), "\0"); } - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + // Decode sick_leave_males + $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } - if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + if (CostbenefitprojectionHelper::checkString($item->causesrisks)) { - // Decode sick_leave_females - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + // Decode causesrisks + $item->causesrisks = json_decode($item->causesrisks, true); + } + if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + { + // Decode medical_turnovers_males + $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) { // Decode total_salary $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); } + if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + { + // Decode sick_leave_females + $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + } if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // Decode total_healthcare $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); } + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // Decode males + $item->males = rtrim($advanced->decryptString($item->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($item->country_causesrisks)) { // Decode country_causesrisks diff --git a/admin/models/companies.php b/admin/models/companies.php index 3e9e270e..6b94cbcd 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -382,46 +382,46 @@ class CostbenefitprojectionModelCompanies extends JModelList continue; } - if ($advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + if ($advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) { - // decrypt medical_turnovers_males - $item->medical_turnovers_males = $advanced->decryptString($item->medical_turnovers_males); - } - if ($advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) - { - // decrypt sick_leave_males - $item->sick_leave_males = $advanced->decryptString($item->sick_leave_males); - } - if ($advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // decrypt males - $item->males = $advanced->decryptString($item->males); + // decrypt medical_turnovers_females + $item->medical_turnovers_females = $advanced->decryptString($item->medical_turnovers_females); } if ($advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // decrypt females $item->females = $advanced->decryptString($item->females); } - if ($advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + if ($advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) { - // decrypt medical_turnovers_females - $item->medical_turnovers_females = $advanced->decryptString($item->medical_turnovers_females); + // decrypt sick_leave_males + $item->sick_leave_males = $advanced->decryptString($item->sick_leave_males); } - if ($advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + if ($advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) { - // decrypt sick_leave_females - $item->sick_leave_females = $advanced->decryptString($item->sick_leave_females); + // decrypt medical_turnovers_males + $item->medical_turnovers_males = $advanced->decryptString($item->medical_turnovers_males); } if ($advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) { // decrypt total_salary $item->total_salary = $advanced->decryptString($item->total_salary); } + if ($advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + { + // decrypt sick_leave_females + $item->sick_leave_females = $advanced->decryptString($item->sick_leave_females); + } if ($advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // decrypt total_healthcare $item->total_healthcare = $advanced->decryptString($item->total_healthcare); } + if ($advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // decrypt males + $item->males = $advanced->decryptString($item->males); + } // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/models/company.php b/admin/models/company.php index f116ed80..96f0928f 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -100,22 +100,10 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object. $advanced = new FOFEncryptAes($advancedkey, 256); - if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) { - // advanced decript data medical_turnovers_males. - $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); - } - - if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) - { - // advanced decript data sick_leave_males. - $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); - } - - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // advanced decript data males. - $item->males = rtrim($advanced->decryptString($item->males), "\0"); + // advanced decript data medical_turnovers_females. + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); } if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) @@ -124,16 +112,16 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->females = rtrim($advanced->decryptString($item->females), "\0"); } - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) { - // advanced decript data medical_turnovers_females. - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + // advanced decript data sick_leave_males. + $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } - if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) { - // advanced decript data sick_leave_females. - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + // advanced decript data medical_turnovers_males. + $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) @@ -142,10 +130,22 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); } + if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + { + // advanced decript data sick_leave_females. + $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + } + if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // advanced decript data total_healthcare. $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); + } + + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // advanced decript data males. + $item->males = rtrim($advanced->decryptString($item->males), "\0"); } if (!empty($item->id)) @@ -557,22 +557,6 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('per', 'required', 'false'); } } - // Modify the form based on Edit Causesrisks access controls. - if ($id != 0 && (!$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection.company.' . (int) $id)) - || ($id == 0 && !$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection'))) - { - // Disable fields for display. - $form->setFieldAttribute('causesrisks', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('causesrisks', 'readonly', 'true'); - if (!$form->getValue('causesrisks')) - { - // Disable fields while saving. - $form->setFieldAttribute('causesrisks', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('causesrisks', 'required', 'false'); - } - } // Modify the form based on Edit Percentfemale access controls. if ($id != 0 && (!$user->authorise('company.edit.percentfemale', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.percentfemale', 'com_costbenefitprojection'))) @@ -592,6 +576,22 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('percentfemale', 'required', 'false'); } } + // Modify the form based on Edit Causesrisks access controls. + if ($id != 0 && (!$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection.company.' . (int) $id)) + || ($id == 0 && !$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection'))) + { + // Disable fields for display. + $form->setFieldAttribute('causesrisks', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('causesrisks', 'readonly', 'true'); + if (!$form->getValue('causesrisks')) + { + // Disable fields while saving. + $form->setFieldAttribute('causesrisks', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('causesrisks', 'required', 'false'); + } + } // Modify the form based on Edit Datayear access controls. if ($id != 0 && (!$user->authorise('company.edit.datayear', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.datayear', 'com_costbenefitprojection'))) @@ -1334,22 +1334,10 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object $advanced = new FOFEncryptAes($advancedkey, 256); - // Encript data medical_turnovers_males. - if (isset($data['medical_turnovers_males']) && $advancedkey) + // Encript data medical_turnovers_females. + if (isset($data['medical_turnovers_females']) && $advancedkey) { - $data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']); - } - - // Encript data sick_leave_males. - if (isset($data['sick_leave_males']) && $advancedkey) - { - $data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']); - } - - // Encript data males. - if (isset($data['males']) && $advancedkey) - { - $data['males'] = $advanced->encryptString($data['males']); + $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); } // Encript data females. @@ -1358,16 +1346,16 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $data['females'] = $advanced->encryptString($data['females']); } - // Encript data medical_turnovers_females. - if (isset($data['medical_turnovers_females']) && $advancedkey) + // Encript data sick_leave_males. + if (isset($data['sick_leave_males']) && $advancedkey) { - $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); + $data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']); } - // Encript data sick_leave_females. - if (isset($data['sick_leave_females']) && $advancedkey) + // Encript data medical_turnovers_males. + if (isset($data['medical_turnovers_males']) && $advancedkey) { - $data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']); + $data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']); } // Encript data total_salary. @@ -1376,12 +1364,24 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $data['total_salary'] = $advanced->encryptString($data['total_salary']); } + // Encript data sick_leave_females. + if (isset($data['sick_leave_females']) && $advancedkey) + { + $data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']); + } + // Encript data total_healthcare. if (isset($data['total_healthcare']) && $advancedkey) { $data['total_healthcare'] = $advanced->encryptString($data['total_healthcare']); } + // Encript data males. + if (isset($data['males']) && $advancedkey) + { + $data['males'] = $advanced->encryptString($data['males']); + } + // make sure new company does not get locked $user = JFactory::getUser(); if ($data['id'] == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection')) diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index f44c8ee2..cc73c4da 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -174,51 +174,51 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection'); return false; } - if (!empty($data->medical_turnovers_males) && $advancedkey && !is_numeric($data->medical_turnovers_males) && $data->medical_turnovers_males === base64_encode(base64_decode($data->medical_turnovers_males, true))) + if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true))) { - // Decode medical_turnovers_males - $data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_males), "\0"); - } - if (!empty($data->sick_leave_males) && $advancedkey && !is_numeric($data->sick_leave_males) && $data->sick_leave_males === base64_encode(base64_decode($data->sick_leave_males, true))) - { - // Decode sick_leave_males - $data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\0"); - } - if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true))) - { - // Decode males - $data->males = rtrim($advanced->decryptString($data->males), "\0"); - } - if (CostbenefitprojectionHelper::checkString($data->causesrisks)) - { - // Decode causesrisks - $data->causesrisks = json_decode($data->causesrisks, true); + // Decode medical_turnovers_females + $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0"); } if (!empty($data->females) && $advancedkey && !is_numeric($data->females) && $data->females === base64_encode(base64_decode($data->females, true))) { // Decode females $data->females = rtrim($advanced->decryptString($data->females), "\0"); } - if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true))) + if (!empty($data->sick_leave_males) && $advancedkey && !is_numeric($data->sick_leave_males) && $data->sick_leave_males === base64_encode(base64_decode($data->sick_leave_males, true))) { - // Decode medical_turnovers_females - $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0"); + // Decode sick_leave_males + $data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\0"); } - if (!empty($data->sick_leave_females) && $advancedkey && !is_numeric($data->sick_leave_females) && $data->sick_leave_females === base64_encode(base64_decode($data->sick_leave_females, true))) + if (CostbenefitprojectionHelper::checkString($data->causesrisks)) { - // Decode sick_leave_females - $data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\0"); + // Decode causesrisks + $data->causesrisks = json_decode($data->causesrisks, true); + } + if (!empty($data->medical_turnovers_males) && $advancedkey && !is_numeric($data->medical_turnovers_males) && $data->medical_turnovers_males === base64_encode(base64_decode($data->medical_turnovers_males, true))) + { + // Decode medical_turnovers_males + $data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_males), "\0"); } if (!empty($data->total_salary) && $advancedkey && !is_numeric($data->total_salary) && $data->total_salary === base64_encode(base64_decode($data->total_salary, true))) { // Decode total_salary $data->total_salary = rtrim($advanced->decryptString($data->total_salary), "\0"); } + if (!empty($data->sick_leave_females) && $advancedkey && !is_numeric($data->sick_leave_females) && $data->sick_leave_females === base64_encode(base64_decode($data->sick_leave_females, true))) + { + // Decode sick_leave_females + $data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\0"); + } if (!empty($data->total_healthcare) && $advancedkey && !is_numeric($data->total_healthcare) && $data->total_healthcare === base64_encode(base64_decode($data->total_healthcare, true))) { // Decode total_healthcare $data->total_healthcare = rtrim($advanced->decryptString($data->total_healthcare), "\0"); } + if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true))) + { + // Decode males + $data->males = rtrim($advanced->decryptString($data->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($data->country_causesrisks)) { // Decode country_causesrisks diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index 42b44741..776c62db 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/countries.php b/admin/models/countries.php index 73abba85..fbf7c28d 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/country.php b/admin/models/country.php index d4d3c23f..a1beafe4 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 5f81ac7a..61487611 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/currency.php b/admin/models/currency.php index 4cadd197..540298f0 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index d14de2be..4ca57ada 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php index 2e086b44..1dbff759 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php index fbfa8471..551534cb 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php index 9f25c11b..2b611f71 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 13d1a0ba..cd19c47f 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php index 27c9ebdb..5092c236 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index 33b3948a..0ff18154 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php index 7494aaa3..ffd8c03f 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php index 5a17e70c..45c6d94f 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index 20526a3c..a9248e06 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php index 775bfccc..f1a381cd 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index bb59a18d..dd7a44e7 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index 638f0e64..251faad2 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js index 55c374c2..edae386d 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -113,6 +113,7 @@ function vvvvvvv(department_vvvvvvv) jform_vvvvvvvvwb_required = false; } + jQuery('#jform_turnover_comment').closest('.control-group').show(); } else { @@ -181,6 +182,7 @@ function vvvvvvv(department_vvvvvvv) jQuery('#jform_total_healthcare').removeClass('required'); jform_vvvvvvvvwb_required = true; } + jQuery('#jform_turnover_comment').closest('.control-group').hide(); } } diff --git a/admin/models/forms/company.xml b/admin/models/forms/company.xml index 4a9e7732..9f3f280a 100644 --- a/admin/models/forms/company.xml +++ b/admin/models/forms/company.xml @@ -174,64 +174,6 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - + + + + http://www.vdm.io Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 3.3.7 + 3.3.8 Cost Benefit Projection (v.3.3.7) +

Cost Benefit Projection (v.3.3.8)

[Create Epidemiological Profiles] (https://www.staffhealthcbp.com/) for diseases and risks affecting your company. Detailed information on projected work days lost and costs. Create and edit activities and wellness responses for your workplace. Access to Small Business Modelling. Results displayed by gender. Network with other companies and wellness professionals. diff --git a/script.php b/script.php index dbbc2ad1..b15a91bc 100644 --- a/script.php +++ b/script.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -904,7 +904,7 @@ class com_costbenefitprojectionInstallerScript $company->type_title = 'Costbenefitprojection Company'; $company->type_alias = 'com_costbenefitprojection.company'; $company->table = '{"special": {"dbtable": "#__costbenefitprojection_company","key": "id","type": "Company","prefix": "costbenefitprojectionTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $company->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","email":"email","user":"user","department":"department","country":"country","service_provider":"service_provider","per":"per","medical_turnovers_males":"medical_turnovers_males","sick_leave_males":"sick_leave_males","males":"males","causesrisks":"causesrisks","females":"females","datayear":"datayear","medical_turnovers_females":"medical_turnovers_females","working_days":"working_days","sick_leave_females":"sick_leave_females","total_salary":"total_salary","total_healthcare":"total_healthcare","productivity_losses":"productivity_losses","not_required":"not_required"}}'; + $company->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","email":"email","user":"user","department":"department","country":"country","service_provider":"service_provider","per":"per","medical_turnovers_females":"medical_turnovers_females","females":"females","sick_leave_males":"sick_leave_males","causesrisks":"causesrisks","datayear":"datayear","medical_turnovers_males":"medical_turnovers_males","working_days":"working_days","turnover_comment":"turnover_comment","total_salary":"total_salary","sick_leave_females":"sick_leave_females","total_healthcare":"total_healthcare","productivity_losses":"productivity_losses","males":"males","not_required":"not_required"}}'; $company->router = 'CostbenefitprojectionHelperRoute::getCompanyRoute'; $company->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/company.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","department","country","service_provider","per","working_days","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "user","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "service_provider","targetTable": "#__costbenefitprojection_service_provider","targetColumn": "id","displayColumn": "user"},{"sourceColumn": "causesrisks","targetTable": "#__costbenefitprojection_causerisk","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "datayear","targetTable": "#__costbenefitprojection_health_data","targetColumn": "year","displayColumn": "country"}]}'; @@ -1040,7 +1040,7 @@ class com_costbenefitprojectionInstallerScript $company->type_title = 'Costbenefitprojection Company'; $company->type_alias = 'com_costbenefitprojection.company'; $company->table = '{"special": {"dbtable": "#__costbenefitprojection_company","key": "id","type": "Company","prefix": "costbenefitprojectionTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $company->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","email":"email","user":"user","department":"department","country":"country","service_provider":"service_provider","per":"per","medical_turnovers_males":"medical_turnovers_males","sick_leave_males":"sick_leave_males","males":"males","causesrisks":"causesrisks","females":"females","datayear":"datayear","medical_turnovers_females":"medical_turnovers_females","working_days":"working_days","sick_leave_females":"sick_leave_females","total_salary":"total_salary","total_healthcare":"total_healthcare","productivity_losses":"productivity_losses","not_required":"not_required"}}'; + $company->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","email":"email","user":"user","department":"department","country":"country","service_provider":"service_provider","per":"per","medical_turnovers_females":"medical_turnovers_females","females":"females","sick_leave_males":"sick_leave_males","causesrisks":"causesrisks","datayear":"datayear","medical_turnovers_males":"medical_turnovers_males","working_days":"working_days","turnover_comment":"turnover_comment","total_salary":"total_salary","sick_leave_females":"sick_leave_females","total_healthcare":"total_healthcare","productivity_losses":"productivity_losses","males":"males","not_required":"not_required"}}'; $company->router = 'CostbenefitprojectionHelperRoute::getCompanyRoute'; $company->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/company.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","department","country","service_provider","per","working_days","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "user","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "service_provider","targetTable": "#__costbenefitprojection_service_provider","targetColumn": "id","displayColumn": "user"},{"sourceColumn": "causesrisks","targetTable": "#__costbenefitprojection_causerisk","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "datayear","targetTable": "#__costbenefitprojection_health_data","targetColumn": "year","displayColumn": "country"}]}'; @@ -1300,7 +1300,7 @@ class com_costbenefitprojectionInstallerScript echo ' -

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

'; +

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

'; } } } diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css index 9917a6e2..542ca6a8 100644 --- a/site/assets/css/combinedresults.css +++ b/site/assets/css/combinedresults.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/assets/css/company.css b/site/assets/css/company.css index 5efde04a..00347c5c 100644 --- a/site/assets/css/company.css +++ b/site/assets/css/company.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css index d8fdcacb..0095bc4e 100644 --- a/site/assets/css/companyresults.css +++ b/site/assets/css/companyresults.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css index 23aef468..212d3182 100644 --- a/site/assets/css/cpanel.css +++ b/site/assets/css/cpanel.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css index 49bb4bf8..9d4241a7 100644 --- a/site/assets/css/createaccount.css +++ b/site/assets/css/createaccount.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css index 1f2ddb89..411978ef 100644 --- a/site/assets/css/intervention.css +++ b/site/assets/css/intervention.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/assets/css/publicresults.css b/site/assets/css/publicresults.css index e42fe565..61a725f5 100644 --- a/site/assets/css/publicresults.css +++ b/site/assets/css/publicresults.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css index ba6878bc..7324b6c6 100644 --- a/site/assets/css/scaling_factor.css +++ b/site/assets/css/scaling_factor.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/assets/css/site.css b/site/assets/css/site.css index 06330cdc..40eba52d 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/controller.php b/site/controller.php index 99c12a4a..082f466a 100644 --- a/site/controller.php +++ b/site/controller.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index a58cfe5f..b04586f4 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/controllers/company.php b/site/controllers/company.php index bb7ebb83..93a6cd33 100644 --- a/site/controllers/company.php +++ b/site/controllers/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/controllers/help.php b/site/controllers/help.php index 184283ff..dba66437 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php index 3df9210c..fe8b521b 100644 --- a/site/controllers/intervention.php +++ b/site/controllers/intervention.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/controllers/scaling_factor.php b/site/controllers/scaling_factor.php index fe39ba35..5866ca5b 100644 --- a/site/controllers/scaling_factor.php +++ b/site/controllers/scaling_factor.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php index 5a467ca2..bb22d47a 100644 --- a/site/costbenefitprojection.php +++ b/site/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php index 9c97f643..791714ef 100644 --- a/site/helpers/costbenefitprojection.php +++ b/site/helpers/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index e169c77b..2754cdb3 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/helpers/route.php b/site/helpers/route.php index 78ac0cd9..7912d383 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/language/en-GB/en-GB.com_costbenefitprojection.ini b/site/language/en-GB/en-GB.com_costbenefitprojection.ini index 98b98903..ef1d0203 100644 --- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -302,6 +302,10 @@ COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY="Total Salary" COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_DESCRIPTION="The total salary payed per/year" COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_HINT="per/year" COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_LABEL="Total Salary" +COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT="Turnover Comment" +COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_DESCRIPTION="Here you can explain how many deaths your company has had over any given period. This will help us understand how you came to the numbers used above in the male and female medical turnovers." +COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_HINT="You can make a comment here to indicate how you arrived at the given numbers above for male and female medical turnovers." +COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_LABEL="Turnover Comment" COM_COSTBENEFITPROJECTION_COMPANY_TWENTYTWENTY_FOUR="20-24" COM_COSTBENEFITPROJECTION_COMPANY_TWENTY_FIVETWENTY_NINE="25-29" COM_COSTBENEFITPROJECTION_COMPANY_USER="User" diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php index a49f1312..9c2b21bd 100644 --- a/site/layouts/appnotice.php +++ b/site/layouts/appnotice.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php index b180d343..b9b94ab9 100644 --- a/site/layouts/company/age_groups_percentages_fullwidth.php +++ b/site/layouts/company/age_groups_percentages_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php index d130af0e..63bc4692 100644 --- a/site/layouts/company/age_groups_percentages_left.php +++ b/site/layouts/company/age_groups_percentages_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php index b4356a73..1190d663 100644 --- a/site/layouts/company/age_groups_percentages_right.php +++ b/site/layouts/company/age_groups_percentages_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php index 12be3228..741a146f 100644 --- a/site/layouts/company/causerisk_selection_fullwidth.php +++ b/site/layouts/company/causerisk_selection_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php index aa98f41f..6b1a381d 100644 --- a/site/layouts/company/details_above.php +++ b/site/layouts/company/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php index 599b0f51..5b960c7f 100644 --- a/site/layouts/company/details_left.php +++ b/site/layouts/company/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php index 5643e7ad..075910dc 100644 --- a/site/layouts/company/details_right.php +++ b/site/layouts/company/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -32,6 +32,7 @@ $fields = $displayData->get('fields') ?: array( 'females', 'medical_turnovers_males', 'medical_turnovers_females', + 'turnover_comment', 'sick_leave_males', 'sick_leave_females' ); diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php index e43ef68d..55876ddb 100644 --- a/site/layouts/company/details_under.php +++ b/site/layouts/company/details_under.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php index 2106d9a8..75da9729 100644 --- a/site/layouts/company/interventions_fullwidth.php +++ b/site/layouts/company/interventions_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php index 08f6bb5a..de023028 100644 --- a/site/layouts/company/publishing.php +++ b/site/layouts/company/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php index da726045..b4ebc55c 100644 --- a/site/layouts/company/publlshing.php +++ b/site/layouts/company/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php index 3ce5c39b..669c216f 100644 --- a/site/layouts/company/scaling_factors_fullwidth.php +++ b/site/layouts/company/scaling_factors_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/companydetails.php b/site/layouts/companydetails.php index 9ec76fea..0cc3dca1 100644 --- a/site/layouts/companydetails.php +++ b/site/layouts/companydetails.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/databreakdownmalefemale.php b/site/layouts/databreakdownmalefemale.php index 7c72dd68..a402056f 100644 --- a/site/layouts/databreakdownmalefemale.php +++ b/site/layouts/databreakdownmalefemale.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php index ebb00833..6e70e03e 100644 --- a/site/layouts/intervention/details_above.php +++ b/site/layouts/intervention/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php index be4cc2dd..dde4d183 100644 --- a/site/layouts/intervention/details_fullwidth.php +++ b/site/layouts/intervention/details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php index e43ef68d..55876ddb 100644 --- a/site/layouts/intervention/details_under.php +++ b/site/layouts/intervention/details_under.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php index 08f6bb5a..de023028 100644 --- a/site/layouts/intervention/publishing.php +++ b/site/layouts/intervention/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php index d38998cb..104fae61 100644 --- a/site/layouts/intervention/publlshing.php +++ b/site/layouts/intervention/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php index b16651a2..e65b0245 100644 --- a/site/layouts/intervention/settings_fullwidth.php +++ b/site/layouts/intervention/settings_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php index f6bdd032..cac7c3e8 100644 --- a/site/layouts/intervention/settings_left.php +++ b/site/layouts/intervention/settings_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php index 6dbf4fc2..76ea05eb 100644 --- a/site/layouts/scaling_factor/details_above.php +++ b/site/layouts/scaling_factor/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php index bfe038c5..cf24ab0c 100644 --- a/site/layouts/scaling_factor/details_left.php +++ b/site/layouts/scaling_factor/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php index be7fa788..3d4aa85b 100644 --- a/site/layouts/scaling_factor/details_right.php +++ b/site/layouts/scaling_factor/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php index 08f6bb5a..de023028 100644 --- a/site/layouts/scaling_factor/publishing.php +++ b/site/layouts/scaling_factor/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php index d38998cb..104fae61 100644 --- a/site/layouts/scaling_factor/publlshing.php +++ b/site/layouts/scaling_factor/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/models/ajax.php b/site/models/ajax.php index 8f987a3e..0ff76dce 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/models/combinedresults.php b/site/models/combinedresults.php index 1e877044..717c99fd 100644 --- a/site/models/combinedresults.php +++ b/site/models/combinedresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -162,51 +162,51 @@ class CostbenefitprojectionModelCombinedresults extends JModelList { // Always create a slug for sef URL's $item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id; - if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) { - // Decode medical_turnovers_males - $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); - } - if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) - { - // Decode sick_leave_males - $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); - } - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // Decode males - $item->males = rtrim($advanced->decryptString($item->males), "\0"); - } - if (CostbenefitprojectionHelper::checkString($item->causesrisks)) - { - // Decode causesrisks - $item->causesrisks = json_decode($item->causesrisks, true); + // Decode medical_turnovers_females + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); } if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // Decode females $item->females = rtrim($advanced->decryptString($item->females), "\0"); } - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + // Decode sick_leave_males + $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } - if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + if (CostbenefitprojectionHelper::checkString($item->causesrisks)) { - // Decode sick_leave_females - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + // Decode causesrisks + $item->causesrisks = json_decode($item->causesrisks, true); + } + if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + { + // Decode medical_turnovers_males + $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) { // Decode total_salary $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); } + if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + { + // Decode sick_leave_females + $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + } if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // Decode total_healthcare $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); } + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // Decode males + $item->males = rtrim($advanced->decryptString($item->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($item->country_causesrisks)) { // Decode country_causesrisks diff --git a/site/models/company.php b/site/models/company.php index a1edd7bd..7e23596d 100644 --- a/site/models/company.php +++ b/site/models/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -100,22 +100,10 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object. $advanced = new FOFEncryptAes($advancedkey, 256); - if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) { - // advanced decript data medical_turnovers_males. - $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); - } - - if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) - { - // advanced decript data sick_leave_males. - $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); - } - - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // advanced decript data males. - $item->males = rtrim($advanced->decryptString($item->males), "\0"); + // advanced decript data medical_turnovers_females. + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); } if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) @@ -124,16 +112,16 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->females = rtrim($advanced->decryptString($item->females), "\0"); } - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) { - // advanced decript data medical_turnovers_females. - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + // advanced decript data sick_leave_males. + $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } - if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) { - // advanced decript data sick_leave_females. - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + // advanced decript data medical_turnovers_males. + $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) @@ -142,10 +130,22 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); } + if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + { + // advanced decript data sick_leave_females. + $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + } + if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // advanced decript data total_healthcare. $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); + } + + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // advanced decript data males. + $item->males = rtrim($advanced->decryptString($item->males), "\0"); } if (!empty($item->id)) @@ -557,22 +557,6 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('per', 'required', 'false'); } } - // Modify the form based on Edit Causesrisks access controls. - if ($id != 0 && (!$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection.company.' . (int) $id)) - || ($id == 0 && !$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection'))) - { - // Disable fields for display. - $form->setFieldAttribute('causesrisks', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('causesrisks', 'readonly', 'true'); - if (!$form->getValue('causesrisks')) - { - // Disable fields while saving. - $form->setFieldAttribute('causesrisks', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('causesrisks', 'required', 'false'); - } - } // Modify the form based on Edit Percentfemale access controls. if ($id != 0 && (!$user->authorise('company.edit.percentfemale', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.percentfemale', 'com_costbenefitprojection'))) @@ -592,6 +576,22 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('percentfemale', 'required', 'false'); } } + // Modify the form based on Edit Causesrisks access controls. + if ($id != 0 && (!$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection.company.' . (int) $id)) + || ($id == 0 && !$user->authorise('company.edit.causesrisks', 'com_costbenefitprojection'))) + { + // Disable fields for display. + $form->setFieldAttribute('causesrisks', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('causesrisks', 'readonly', 'true'); + if (!$form->getValue('causesrisks')) + { + // Disable fields while saving. + $form->setFieldAttribute('causesrisks', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('causesrisks', 'required', 'false'); + } + } // Modify the form based on Edit Datayear access controls. if ($id != 0 && (!$user->authorise('company.edit.datayear', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.datayear', 'com_costbenefitprojection'))) @@ -1315,22 +1315,10 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object $advanced = new FOFEncryptAes($advancedkey, 256); - // Encript data medical_turnovers_males. - if (isset($data['medical_turnovers_males']) && $advancedkey) + // Encript data medical_turnovers_females. + if (isset($data['medical_turnovers_females']) && $advancedkey) { - $data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']); - } - - // Encript data sick_leave_males. - if (isset($data['sick_leave_males']) && $advancedkey) - { - $data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']); - } - - // Encript data males. - if (isset($data['males']) && $advancedkey) - { - $data['males'] = $advanced->encryptString($data['males']); + $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); } // Encript data females. @@ -1339,16 +1327,16 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $data['females'] = $advanced->encryptString($data['females']); } - // Encript data medical_turnovers_females. - if (isset($data['medical_turnovers_females']) && $advancedkey) + // Encript data sick_leave_males. + if (isset($data['sick_leave_males']) && $advancedkey) { - $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); + $data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']); } - // Encript data sick_leave_females. - if (isset($data['sick_leave_females']) && $advancedkey) + // Encript data medical_turnovers_males. + if (isset($data['medical_turnovers_males']) && $advancedkey) { - $data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']); + $data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']); } // Encript data total_salary. @@ -1357,12 +1345,24 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $data['total_salary'] = $advanced->encryptString($data['total_salary']); } + // Encript data sick_leave_females. + if (isset($data['sick_leave_females']) && $advancedkey) + { + $data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']); + } + // Encript data total_healthcare. if (isset($data['total_healthcare']) && $advancedkey) { $data['total_healthcare'] = $advanced->encryptString($data['total_healthcare']); } + // Encript data males. + if (isset($data['males']) && $advancedkey) + { + $data['males'] = $advanced->encryptString($data['males']); + } + // make sure new company does not get locked $user = JFactory::getUser(); if ($data['id'] == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection')) diff --git a/site/models/companyresults.php b/site/models/companyresults.php index 518d0851..3491cb8f 100644 --- a/site/models/companyresults.php +++ b/site/models/companyresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -176,51 +176,51 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel'); return false; } - if (!empty($data->medical_turnovers_males) && $advancedkey && !is_numeric($data->medical_turnovers_males) && $data->medical_turnovers_males === base64_encode(base64_decode($data->medical_turnovers_males, true))) + if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true))) { - // Decode medical_turnovers_males - $data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_males), "\0"); - } - if (!empty($data->sick_leave_males) && $advancedkey && !is_numeric($data->sick_leave_males) && $data->sick_leave_males === base64_encode(base64_decode($data->sick_leave_males, true))) - { - // Decode sick_leave_males - $data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\0"); - } - if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true))) - { - // Decode males - $data->males = rtrim($advanced->decryptString($data->males), "\0"); - } - if (CostbenefitprojectionHelper::checkString($data->causesrisks)) - { - // Decode causesrisks - $data->causesrisks = json_decode($data->causesrisks, true); + // Decode medical_turnovers_females + $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0"); } if (!empty($data->females) && $advancedkey && !is_numeric($data->females) && $data->females === base64_encode(base64_decode($data->females, true))) { // Decode females $data->females = rtrim($advanced->decryptString($data->females), "\0"); } - if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true))) + if (!empty($data->sick_leave_males) && $advancedkey && !is_numeric($data->sick_leave_males) && $data->sick_leave_males === base64_encode(base64_decode($data->sick_leave_males, true))) { - // Decode medical_turnovers_females - $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0"); + // Decode sick_leave_males + $data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\0"); } - if (!empty($data->sick_leave_females) && $advancedkey && !is_numeric($data->sick_leave_females) && $data->sick_leave_females === base64_encode(base64_decode($data->sick_leave_females, true))) + if (CostbenefitprojectionHelper::checkString($data->causesrisks)) { - // Decode sick_leave_females - $data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\0"); + // Decode causesrisks + $data->causesrisks = json_decode($data->causesrisks, true); + } + if (!empty($data->medical_turnovers_males) && $advancedkey && !is_numeric($data->medical_turnovers_males) && $data->medical_turnovers_males === base64_encode(base64_decode($data->medical_turnovers_males, true))) + { + // Decode medical_turnovers_males + $data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_males), "\0"); } if (!empty($data->total_salary) && $advancedkey && !is_numeric($data->total_salary) && $data->total_salary === base64_encode(base64_decode($data->total_salary, true))) { // Decode total_salary $data->total_salary = rtrim($advanced->decryptString($data->total_salary), "\0"); } + if (!empty($data->sick_leave_females) && $advancedkey && !is_numeric($data->sick_leave_females) && $data->sick_leave_females === base64_encode(base64_decode($data->sick_leave_females, true))) + { + // Decode sick_leave_females + $data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\0"); + } if (!empty($data->total_healthcare) && $advancedkey && !is_numeric($data->total_healthcare) && $data->total_healthcare === base64_encode(base64_decode($data->total_healthcare, true))) { // Decode total_healthcare $data->total_healthcare = rtrim($advanced->decryptString($data->total_healthcare), "\0"); } + if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true))) + { + // Decode males + $data->males = rtrim($advanced->decryptString($data->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($data->country_causesrisks)) { // Decode country_causesrisks diff --git a/site/models/cpanel.php b/site/models/cpanel.php index 02923373..167e356a 100644 --- a/site/models/cpanel.php +++ b/site/models/cpanel.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -135,51 +135,51 @@ class CostbenefitprojectionModelCpanel extends JModelList { // Always create a slug for sef URL's $item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id; - if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) { - // Decode medical_turnovers_males - $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); - } - if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) - { - // Decode sick_leave_males - $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); - } - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // Decode males - $item->males = rtrim($advanced->decryptString($item->males), "\0"); - } - if (CostbenefitprojectionHelper::checkString($item->causesrisks)) - { - // Decode causesrisks - $item->causesrisks = json_decode($item->causesrisks, true); + // Decode medical_turnovers_females + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); } if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // Decode females $item->females = rtrim($advanced->decryptString($item->females), "\0"); } - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + if (!empty($item->sick_leave_males) && $advancedkey && !is_numeric($item->sick_leave_males) && $item->sick_leave_males === base64_encode(base64_decode($item->sick_leave_males, true))) { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + // Decode sick_leave_males + $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } - if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + if (CostbenefitprojectionHelper::checkString($item->causesrisks)) { - // Decode sick_leave_females - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + // Decode causesrisks + $item->causesrisks = json_decode($item->causesrisks, true); + } + if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) + { + // Decode medical_turnovers_males + $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) { // Decode total_salary $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); } + if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) + { + // Decode sick_leave_females + $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); + } if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // Decode total_healthcare $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); } + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // Decode males + $item->males = rtrim($advanced->decryptString($item->males), "\0"); + } // Make sure the content prepare plugins fire on country_publicaddress. $item->country_publicaddress = JHtml::_('content.prepare',$item->country_publicaddress); // Checking if country_publicaddress has uikit components that must be loaded. diff --git a/site/models/createaccount.php b/site/models/createaccount.php index 4fdb252a..5cb4d296 100644 --- a/site/models/createaccount.php +++ b/site/models/createaccount.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/site/models/forms/company.js b/site/models/forms/company.js index 55c374c2..edae386d 100644 --- a/site/models/forms/company.js +++ b/site/models/forms/company.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.7 + @version 3.3.8 @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -113,6 +113,7 @@ function vvvvvvv(department_vvvvvvv) jform_vvvvvvvvwb_required = false; } + jQuery('#jform_turnover_comment').closest('.control-group').show(); } else { @@ -181,6 +182,7 @@ function vvvvvvv(department_vvvvvvv) jQuery('#jform_total_healthcare').removeClass('required'); jform_vvvvvvvvwb_required = true; } + jQuery('#jform_turnover_comment').closest('.control-group').hide(); } } diff --git a/site/models/forms/company.xml b/site/models/forms/company.xml index 4a9e7732..9f3f280a 100644 --- a/site/models/forms/company.xml +++ b/site/models/forms/company.xml @@ -174,64 +174,6 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - + + + +