From 47bc2c2c4da1db749bea9acece571ceff9fe0b5a Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 22 Mar 2016 14:14:16 +0200 Subject: [PATCH] Moved the implementation of testing companies to service providers and removed the field from companies, close issue #1 --- README.md | 10 +- admin/access.xml | 2 - admin/assets/css/admin.css | 4 +- admin/assets/css/causerisk.css | 4 +- admin/assets/css/causesrisks.css | 4 +- admin/assets/css/combinedresults.css | 4 +- admin/assets/css/companies.css | 4 +- admin/assets/css/company.css | 4 +- admin/assets/css/companyresults.css | 4 +- admin/assets/css/countries.css | 4 +- admin/assets/css/country.css | 4 +- admin/assets/css/currencies.css | 4 +- admin/assets/css/currency.css | 4 +- admin/assets/css/dashboard.css | 4 +- admin/assets/css/health_data.css | 4 +- admin/assets/css/health_data_sets.css | 4 +- admin/assets/css/help_document.css | 4 +- admin/assets/css/help_documents.css | 4 +- admin/assets/css/intervention.css | 4 +- admin/assets/css/interventions.css | 4 +- admin/assets/css/scaling_factor.css | 4 +- admin/assets/css/scaling_factors.css | 4 +- admin/assets/css/service_provider.css | 4 +- admin/assets/css/service_providers.css | 4 +- admin/controller.php | 4 +- admin/controllers/ajax.json.php | 19 +- admin/controllers/causerisk.php | 4 +- admin/controllers/causesrisks.php | 4 +- admin/controllers/combinedresults.php | 4 +- admin/controllers/companies.php | 4 +- admin/controllers/company.php | 4 +- admin/controllers/companyresults.php | 4 +- admin/controllers/costbenefitprojection.php | 4 +- admin/controllers/countries.php | 4 +- admin/controllers/country.php | 4 +- admin/controllers/currencies.php | 4 +- admin/controllers/currency.php | 4 +- admin/controllers/health_data.php | 4 +- admin/controllers/health_data_sets.php | 4 +- admin/controllers/help.php | 4 +- admin/controllers/help_document.php | 4 +- admin/controllers/help_documents.php | 4 +- admin/controllers/import.php | 4 +- admin/controllers/intervention.php | 4 +- admin/controllers/interventions.php | 4 +- admin/controllers/scaling_factor.php | 4 +- admin/controllers/scaling_factors.php | 4 +- admin/controllers/service_provider.php | 4 +- admin/controllers/service_providers.php | 4 +- admin/costbenefitprojection.php | 4 +- admin/helpers/costbenefitprojection.php | 4 +- admin/helpers/html/batch_.php | 4 +- admin/helpers/sum.php | 4 +- admin/helpers/sumcombine.php | 4 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 10 +- admin/layouts/batchselection.php | 4 +- admin/layouts/causerisk/details_above.php | 4 +- admin/layouts/causerisk/details_left.php | 4 +- admin/layouts/causerisk/publishing.php | 4 +- admin/layouts/causerisk/publlshing.php | 4 +- .../age_groups_percentages_fullwidth.php | 4 +- .../company/age_groups_percentages_left.php | 4 +- .../company/age_groups_percentages_right.php | 4 +- .../company/causerisk_selection_fullwidth.php | 4 +- admin/layouts/company/details_above.php | 4 +- admin/layouts/company/details_left.php | 7 +- admin/layouts/company/details_right.php | 4 +- admin/layouts/company/details_under.php | 4 +- .../company/interventions_fullwidth.php | 6 +- admin/layouts/company/publishing.php | 4 +- admin/layouts/company/publlshing.php | 4 +- .../company/scaling_factors_fullwidth.php | 6 +- .../country/age_groups_percentages_left.php | 4 +- .../country/age_groups_percentages_right.php | 4 +- .../country/causerisk_selection_fullwidth.php | 4 +- admin/layouts/country/companies_fullwidth.php | 14 +- admin/layouts/country/details_above.php | 4 +- admin/layouts/country/details_left.php | 4 +- admin/layouts/country/details_right.php | 4 +- .../country/health_data_totals_left.php | 4 +- .../country/health_data_totals_right.php | 4 +- .../country/interventions_fullwidth.php | 6 +- .../country/public_details_fullwidth.php | 4 +- admin/layouts/country/publishing.php | 4 +- admin/layouts/country/publlshing.php | 4 +- .../country/service_providers_fullwidth.php | 6 +- admin/layouts/currency/details_above.php | 4 +- admin/layouts/currency/details_left.php | 4 +- admin/layouts/currency/details_right.php | 4 +- admin/layouts/currency/publishing.php | 4 +- admin/layouts/currency/publlshing.php | 4 +- admin/layouts/databreakdownmalefemale.php | 4 +- admin/layouts/health_data/details_above.php | 4 +- admin/layouts/health_data/details_left.php | 4 +- admin/layouts/health_data/details_right.php | 4 +- .../layouts/health_data/details_rightside.php | 4 +- admin/layouts/health_data/publishing.php | 4 +- admin/layouts/health_data/publlshing.php | 4 +- admin/layouts/help_document/details_above.php | 4 +- .../help_document/details_fullwidth.php | 4 +- admin/layouts/help_document/details_left.php | 4 +- admin/layouts/help_document/details_right.php | 4 +- admin/layouts/help_document/details_under.php | 4 +- admin/layouts/help_document/publishing.php | 4 +- admin/layouts/help_document/publlshing.php | 4 +- admin/layouts/intervention/details_above.php | 4 +- .../intervention/details_fullwidth.php | 4 +- admin/layouts/intervention/details_under.php | 4 +- admin/layouts/intervention/publishing.php | 4 +- admin/layouts/intervention/publlshing.php | 4 +- .../intervention/settings_fullwidth.php | 4 +- admin/layouts/intervention/settings_left.php | 4 +- .../layouts/scaling_factor/details_above.php | 4 +- admin/layouts/scaling_factor/details_left.php | 4 +- .../layouts/scaling_factor/details_right.php | 4 +- admin/layouts/scaling_factor/publishing.php | 4 +- admin/layouts/scaling_factor/publlshing.php | 4 +- .../service_provider/companies_fullwidth.php | 14 +- .../service_provider/details_above.php | 4 +- ...details_fullwidth.php => details_left.php} | 38 ++-- .../service_provider/details_right.php | 48 ++++ admin/layouts/service_provider/publishing.php | 4 +- admin/layouts/service_provider/publlshing.php | 4 +- admin/models/ajax.php | 4 +- admin/models/causerisk.php | 4 +- admin/models/causesrisks.php | 4 +- admin/models/combinedresults.php | 36 +-- admin/models/companies.php | 59 ++--- admin/models/company.php | 95 ++++---- admin/models/companyresults.php | 34 +-- admin/models/costbenefitprojection.php | 54 ++++- admin/models/countries.php | 4 +- admin/models/country.php | 19 +- admin/models/currencies.php | 4 +- admin/models/currency.php | 4 +- admin/models/fields/articles.php | 4 +- admin/models/fields/causesrisks.php | 4 +- admin/models/fields/causesriskscheck.php | 4 +- admin/models/fields/company.php | 4 +- admin/models/fields/companycheck.php | 87 ++++++++ admin/models/fields/countries.php | 4 +- admin/models/fields/countryuser.php | 4 +- admin/models/fields/currency.php | 4 +- admin/models/fields/datayear.php | 4 +- admin/models/fields/interventions.php | 4 +- admin/models/fields/memberuser.php | 4 +- admin/models/fields/serviceprovider.php | 4 +- admin/models/fields/serviceprovideruser.php | 4 +- admin/models/forms/causerisk.js | 4 +- admin/models/forms/company.js | 4 +- admin/models/forms/company.xml | 209 ++++++++---------- admin/models/forms/country.js | 4 +- admin/models/forms/currency.js | 4 +- admin/models/forms/health_data.js | 4 +- admin/models/forms/help_document.js | 4 +- admin/models/forms/intervention.js | 4 +- admin/models/forms/scaling_factor.js | 4 +- admin/models/forms/service_provider.js | 4 +- admin/models/forms/service_provider.xml | 9 + admin/models/health_data.php | 4 +- admin/models/health_data_sets.php | 4 +- admin/models/help_document.php | 4 +- admin/models/help_documents.php | 4 +- admin/models/import.php | 4 +- admin/models/intervention.php | 4 +- admin/models/interventions.php | 4 +- admin/models/scaling_factor.php | 4 +- admin/models/scaling_factors.php | 4 +- admin/models/service_provider.php | 33 ++- admin/models/service_providers.php | 4 +- admin/sql/install.mysql.utf8.sql | 3 +- admin/sql/updates/mysql/3.3.9.sql | 1 + admin/tables/causerisk.php | 4 +- admin/tables/company.php | 4 +- admin/tables/country.php | 4 +- admin/tables/currency.php | 4 +- admin/tables/health_data.php | 4 +- admin/tables/help_document.php | 4 +- admin/tables/intervention.php | 4 +- admin/tables/scaling_factor.php | 4 +- admin/tables/service_provider.php | 4 +- admin/vdm.php | 4 +- admin/views/causerisk/submitbutton.js | 4 +- admin/views/causerisk/tmpl/edit.php | 4 +- admin/views/causerisk/view.html.php | 4 +- admin/views/causesrisks/tmpl/default.php | 4 +- .../causesrisks/tmpl/default_batch_body.php | 4 +- .../causesrisks/tmpl/default_batch_footer.php | 4 +- admin/views/causesrisks/tmpl/default_body.php | 4 +- admin/views/causesrisks/tmpl/default_foot.php | 4 +- admin/views/causesrisks/tmpl/default_head.php | 4 +- .../causesrisks/tmpl/default_toolbar.php | 4 +- admin/views/causesrisks/view.html.php | 4 +- admin/views/combinedresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- .../combinedresults/tmpl/default_main.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- admin/views/combinedresults/view.html.php | 4 +- admin/views/companies/tmpl/default.php | 4 +- .../companies/tmpl/default_batch_body.php | 4 +- .../companies/tmpl/default_batch_footer.php | 4 +- admin/views/companies/tmpl/default_body.php | 7 +- admin/views/companies/tmpl/default_foot.php | 6 +- admin/views/companies/tmpl/default_head.php | 7 +- .../views/companies/tmpl/default_toolbar.php | 4 +- admin/views/companies/view.html.php | 63 +----- admin/views/company/submitbutton.js | 4 +- admin/views/company/tmpl/edit.php | 4 +- admin/views/company/view.html.php | 4 +- admin/views/companyresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- .../companyresults/tmpl/default_main.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- .../companyresults/tmpl/default_variables.php | 4 +- admin/views/companyresults/view.html.php | 4 +- .../costbenefitprojection/tmpl/default.php | 4 +- .../tmpl/default_main.php | 4 +- .../tmpl/default_usage_statistics_table.php | 4 +- .../tmpl/default_vdm.php | 4 +- .../views/costbenefitprojection/view.html.php | 4 +- admin/views/countries/tmpl/default.php | 4 +- .../countries/tmpl/default_batch_body.php | 4 +- .../countries/tmpl/default_batch_footer.php | 4 +- admin/views/countries/tmpl/default_body.php | 4 +- admin/views/countries/tmpl/default_foot.php | 4 +- admin/views/countries/tmpl/default_head.php | 4 +- .../views/countries/tmpl/default_toolbar.php | 4 +- admin/views/countries/view.html.php | 4 +- admin/views/country/submitbutton.js | 4 +- admin/views/country/tmpl/edit.php | 4 +- admin/views/country/view.html.php | 4 +- admin/views/currencies/tmpl/default.php | 4 +- .../currencies/tmpl/default_batch_body.php | 4 +- .../currencies/tmpl/default_batch_footer.php | 4 +- admin/views/currencies/tmpl/default_body.php | 4 +- admin/views/currencies/tmpl/default_foot.php | 4 +- admin/views/currencies/tmpl/default_head.php | 4 +- .../views/currencies/tmpl/default_toolbar.php | 4 +- admin/views/currencies/view.html.php | 4 +- admin/views/currency/submitbutton.js | 4 +- admin/views/currency/tmpl/edit.php | 4 +- admin/views/currency/view.html.php | 4 +- admin/views/health_data/submitbutton.js | 4 +- admin/views/health_data/tmpl/edit.php | 4 +- admin/views/health_data/view.html.php | 4 +- admin/views/health_data_sets/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../health_data_sets/tmpl/default_body.php | 4 +- .../health_data_sets/tmpl/default_foot.php | 4 +- .../health_data_sets/tmpl/default_head.php | 4 +- .../health_data_sets/tmpl/default_toolbar.php | 4 +- admin/views/health_data_sets/view.html.php | 4 +- admin/views/help_document/submitbutton.js | 4 +- admin/views/help_document/tmpl/edit.php | 4 +- admin/views/help_document/view.html.php | 4 +- admin/views/help_documents/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../help_documents/tmpl/default_body.php | 4 +- .../help_documents/tmpl/default_foot.php | 4 +- .../help_documents/tmpl/default_head.php | 4 +- .../help_documents/tmpl/default_toolbar.php | 4 +- admin/views/help_documents/view.html.php | 4 +- admin/views/import/tmpl/default.php | 4 +- admin/views/import/view.html.php | 4 +- admin/views/intervention/submitbutton.js | 4 +- admin/views/intervention/tmpl/edit.php | 4 +- admin/views/intervention/view.html.php | 4 +- admin/views/interventions/tmpl/default.php | 4 +- .../interventions/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/interventions/tmpl/default_body.php | 4 +- .../views/interventions/tmpl/default_foot.php | 4 +- .../views/interventions/tmpl/default_head.php | 4 +- .../interventions/tmpl/default_toolbar.php | 4 +- admin/views/interventions/view.html.php | 4 +- admin/views/scaling_factor/submitbutton.js | 4 +- admin/views/scaling_factor/tmpl/edit.php | 4 +- admin/views/scaling_factor/view.html.php | 4 +- admin/views/scaling_factors/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../scaling_factors/tmpl/default_body.php | 4 +- .../scaling_factors/tmpl/default_foot.php | 4 +- .../scaling_factors/tmpl/default_head.php | 4 +- .../scaling_factors/tmpl/default_toolbar.php | 4 +- admin/views/scaling_factors/view.html.php | 4 +- admin/views/service_provider/submitbutton.js | 4 +- admin/views/service_provider/tmpl/edit.php | 13 +- admin/views/service_provider/view.html.php | 4 +- .../views/service_providers/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../service_providers/tmpl/default_body.php | 4 +- .../service_providers/tmpl/default_foot.php | 4 +- .../service_providers/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/service_providers/view.html.php | 4 +- costbenefitprojection.xml | 6 +- media/footable/LICENSE | 4 + media/footable/js/footable.filter.js | 1 + script.php | 22 +- site/assets/css/combinedresults.css | 4 +- site/assets/css/company.css | 4 +- site/assets/css/companyresults.css | 4 +- site/assets/css/cpanel.css | 4 +- site/assets/css/createaccount.css | 4 +- site/assets/css/intervention.css | 4 +- site/assets/css/publicresults.css | 4 +- site/assets/css/scaling_factor.css | 4 +- site/assets/css/site.css | 4 +- site/controller.php | 4 +- site/controllers/ajax.json.php | 19 +- site/controllers/company.php | 4 +- site/controllers/help.php | 4 +- site/controllers/intervention.php | 4 +- site/controllers/scaling_factor.php | 4 +- site/costbenefitprojection.php | 4 +- site/helpers/costbenefitprojection.php | 4 +- site/helpers/headercheck.php | 4 +- site/helpers/route.php | 4 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 10 +- site/layouts/appnotice.php | 4 +- .../age_groups_percentages_fullwidth.php | 4 +- .../company/age_groups_percentages_left.php | 4 +- .../company/age_groups_percentages_right.php | 4 +- .../company/causerisk_selection_fullwidth.php | 4 +- site/layouts/company/details_above.php | 4 +- site/layouts/company/details_left.php | 7 +- site/layouts/company/details_right.php | 4 +- site/layouts/company/details_under.php | 4 +- .../company/interventions_fullwidth.php | 6 +- site/layouts/company/publishing.php | 4 +- site/layouts/company/publlshing.php | 4 +- .../company/scaling_factors_fullwidth.php | 6 +- site/layouts/companydetails.php | 4 +- site/layouts/databreakdownmalefemale.php | 4 +- site/layouts/intervention/details_above.php | 4 +- .../intervention/details_fullwidth.php | 4 +- site/layouts/intervention/details_under.php | 4 +- site/layouts/intervention/publishing.php | 4 +- site/layouts/intervention/publlshing.php | 4 +- .../intervention/settings_fullwidth.php | 4 +- site/layouts/intervention/settings_left.php | 4 +- site/layouts/scaling_factor/details_above.php | 4 +- site/layouts/scaling_factor/details_left.php | 4 +- site/layouts/scaling_factor/details_right.php | 4 +- site/layouts/scaling_factor/publishing.php | 4 +- site/layouts/scaling_factor/publlshing.php | 4 +- site/models/ajax.php | 4 +- site/models/combinedresults.php | 36 +-- site/models/company.php | 95 ++++---- site/models/companyresults.php | 34 +-- site/models/cpanel.php | 34 +-- site/models/createaccount.php | 4 +- site/models/forms/company.js | 4 +- site/models/forms/company.xml | 209 ++++++++---------- site/models/forms/intervention.js | 4 +- site/models/forms/scaling_factor.js | 4 +- site/models/intervention.php | 4 +- site/models/publicresults.php | 4 +- site/models/scaling_factor.php | 4 +- site/router.php | 4 +- site/views/combinedresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- ...t_chart_intervention_cost_benefit_save.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- site/views/combinedresults/view.html.php | 4 +- site/views/company/submitbutton.js | 4 +- site/views/company/tmpl/edit.php | 4 +- site/views/company/view.html.php | 4 +- site/views/companyresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- ...t_chart_intervention_cost_benefit_save.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- site/views/companyresults/view.html.php | 4 +- site/views/cpanel/tmpl/default.php | 4 +- site/views/cpanel/view.html.php | 4 +- site/views/createaccount/tmpl/default.php | 4 +- .../tmpl/default_cbpmenumodule.php | 4 +- site/views/createaccount/view.html.php | 4 +- site/views/intervention/submitbutton.js | 4 +- site/views/intervention/tmpl/edit.php | 4 +- site/views/intervention/view.html.php | 4 +- site/views/publicresults/tmpl/default.php | 4 +- .../tmpl/default_cbpmenumodule.php | 4 +- .../tmpl/default_chart_cost_public.php | 4 +- ...chart_intervention_cost_benefit_public.php | 4 +- .../tmpl/default_contact_form_public.php | 4 +- site/views/publicresults/view.html.php | 4 +- site/views/scaling_factor/submitbutton.js | 4 +- site/views/scaling_factor/tmpl/edit.php | 4 +- site/views/scaling_factor/view.html.php | 4 +- 422 files changed, 1479 insertions(+), 1443 deletions(-) rename admin/layouts/service_provider/{details_fullwidth.php => details_left.php} (70%) create mode 100644 admin/layouts/service_provider/details_right.php create mode 100644 admin/models/fields/companycheck.php create mode 100644 admin/sql/updates/mysql/3.3.9.sql create mode 100644 media/footable/LICENSE diff --git a/README.md b/README.md index 652ecdfc..e1bbde17 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cost Benefit Projection (3.3.9) +# Cost Benefit Projection (3.3.10) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -22,12 +22,12 @@ max_input_vars = 5000 + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io) + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 -+ *Last Build*: 18th March, 2016 -+ *Version*: 3.3.9 ++ *Last Build*: 22nd March, 2016 ++ *Version*: 3.3.10 + *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*: **83937** -+ *File count*: **555** ++ *Line count*: **83985** ++ *File count*: **558** + *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 4c39ad58..0756458a 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -45,7 +45,6 @@ - @@ -173,7 +172,6 @@ - diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 7f11d51b..b7994d5b 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.css diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css index ee785219..1487bb66 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.css diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css index 61fbac20..f02d7384 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.css diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css index 233f6e6c..ab0b121f 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css index 7652ab85..f0746444 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.css diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css index 7febd647..4c601af5 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css index 3438dc72..496f0798 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 093ac794..4c848c93 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.css diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index da6a93de..0c10b05d 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.css diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index 90af0a37..b692f2df 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.css diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index f003e9c5..71ffeffb 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 1b4193fb..f6881209 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage dashboard.css diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css index 4b676597..f3cc6814 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.css diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css index 98e4e6b2..0239919e 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index fec084d2..772029a3 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index dcdc91f1..5f9f07df 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.css diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css index a5e96569..e97eb1f1 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css index d00f81f5..e2944da7 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.css diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css index ce554d1c..8771c962 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css index 8f95a6d3..e049c33a 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.css diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css index fce59e4b..56f4d75f 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.css diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css index b2ec14a3..efa577d8 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/controller.php b/admin/controller.php index e5ea277e..8300d6ea 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 1ffb304e..35decf2a 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php @@ -56,6 +56,7 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy case 'calculatedResult': try { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $idValue = $jinput->get('id', NULL, 'INT'); $dataValue = $jinput->get('data', NULL, 'BASE64'); if($idValue && $dataValue && $user->id != 0) @@ -70,6 +71,10 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy { echo $_GET['callback'] . "(".json_encode($result).");"; } + elseif($returnRaw) + { + echo json_encode($result); + } else { echo "(".json_encode($result).");"; @@ -90,6 +95,7 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy case 'interventionBuildTable': try { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $idNameValue = $jinput->get('idName', NULL, 'CMD'); $ojectValue = $jinput->get('oject', NULL, 'STRING'); $clusterValue = $jinput->get('cluster', NULL, 'WORD'); @@ -105,6 +111,10 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy { echo $_GET['callback'] . "(".json_encode($result).");"; } + elseif($returnRaw) + { + echo json_encode($result); + } else { echo "(".json_encode($result).");"; @@ -125,6 +135,7 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy case 'getClusterData': try { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $idNameValue = $jinput->get('idName', NULL, 'CMD'); $clusterValue = $jinput->get('cluster', NULL, 'STRING'); if($idNameValue && $clusterValue && $user->id != 0) @@ -139,6 +150,10 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy { echo $_GET['callback'] . "(".json_encode($result).");"; } + elseif($returnRaw) + { + echo json_encode($result); + } else { echo "(".json_encode($result).");"; diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index d706f092..09703866 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index 1d67b4bd..a5dd1c56 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index 899d2ea8..1528a5f1 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index a5a845e0..5ca95a2c 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/controllers/company.php b/admin/controllers/company.php index 8a9e297b..6f552028 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index 2d1e53d6..3d831542 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index 06b5009a..26687db8 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 83028101..c0df8152 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/controllers/country.php b/admin/controllers/country.php index 054a32a2..f50e6cf8 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index 0a4356da..ab837824 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 82c2cf68..5a760172 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php index e523f826..9e74e845 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php index 64098b66..f171b0ae 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 5800fd50..3e3946fe 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index ba65dadf..5a674c13 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index c2306cba..8a509d39 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 0eaf1de7..1c79e1c1 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index 1ac02134..987afe77 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index cf96928e..e1b9c545 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php index 923323f2..7fd1f898 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php index 157e414a..3e585181 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php index 43abc788..05a0009e 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php index aff9dce2..287529d0 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index 19ff9f20..0c47ccb5 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index 7dc19a1d..f043fbc7 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index bf97c2f4..04828eb5 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batch_.php diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index 22482401..5cbcb544 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sum.php diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index b9f56bf0..81bff51b 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sumcombine.php diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini index 05d69f05..4b28a858 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -131,8 +131,6 @@ COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_DEPARTMENT_DESC="Allows the users in th COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_DESC="Allows the users in this group to edit the company" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_EMAIL="Companies Edit Email" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_EMAIL_DESC="Allows the users in this group to update the edit email of the company" -COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_MODE="Companies Edit Mode" -COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_MODE_DESC="Allows the users in this group to update the edit mode of the company" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_OWN="Companies Edit Own" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own companies created by them" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_PER="Companies Edit Per" @@ -186,7 +184,6 @@ COM_COSTBENEFITPROJECTION_COMPANY_CAUSESRISKS="Causesrisks" COM_COSTBENEFITPROJECTION_COMPANY_CAUSESRISKS_LABEL="Causes/Risks" COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_DESCRIPTION="This feature is only available to the advanced department." COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_LABEL="Cause/Risk Selection" -COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT="Company account" COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY="Country" COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_DESCRIPTION="List of available countries" COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL="Country" @@ -230,9 +227,6 @@ COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES="Medical Turnovers Mal COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_DESCRIPTION="The total number of medical turnovers for males per/year." COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_HINT="per/year" COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_LABEL="Total Number Medical Turnovers Male" -COM_COSTBENEFITPROJECTION_COMPANY_MODE="Mode" -COM_COSTBENEFITPROJECTION_COMPANY_MODE_DESCRIPTION="Please tell us if this company is a real company or only for testing purposes." -COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL="Account type" COM_COSTBENEFITPROJECTION_COMPANY_NAME="Name" COM_COSTBENEFITPROJECTION_COMPANY_NAME_DESCRIPTION="Enter Company Name Here" COM_COSTBENEFITPROJECTION_COMPANY_NAME_HINT="Company Name Here" @@ -290,7 +284,6 @@ 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_TRAINING_ACCOUNT="Training account" 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." @@ -1346,6 +1339,9 @@ COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLIC_DETAILS_NOTE_DESCRIPTION="Your COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLISHING="Publishing" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Service Provider to customise the alias." COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_STATUS="Status" +COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_TESTCOMPANIES="Testcompanies" +COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_TESTCOMPANIES_DESCRIPTION="Select companies that are not real companies or only used for testing purposes." +COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_TESTCOMPANIES_LABEL="Set Testing Companies" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER="User" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER_HINT="select a service provider" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER_LABEL="User (Service Provider)" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 9ab82cfb..d1ab1ff3 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batchselection.php diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php index 690728a8..8f8a7448 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index 5bf5885f..872c445e 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index c1fa4582..cea04218 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index 9ebe7b3d..502c73b3 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index c468b406..154fb3c6 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index c12e1192..e028ecea 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index 4b8881bb..a2ec7d2c 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index d8dd64d2..f9738199 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index ec4a7121..3c441c1a 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -28,8 +28,7 @@ $fields = $displayData->get('fields') ?: array( 'email', 'country', 'service_provider', - 'datayear', - 'mode' + 'datayear' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index c0e883f8..e1f80a39 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index d7d9676d..020e89d5 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index e42f89fe..33f8b9de 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -36,7 +36,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention');

- +
diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index c1fa4582..cea04218 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index 12e7c48e..eb472284 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php @@ -30,7 +30,7 @@ $edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=sc ?>
- +
diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index c468b406..154fb3c6 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index c12e1192..e028ecea 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index cbd9d049..f63122b8 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index 043a1f85..ba3206a4 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -36,7 +36,7 @@ $can = CostbenefitprojectionHelper::getActions('company');

- +
- @@ -153,7 +147,7 @@ $can = CostbenefitprojectionHelper::getActions('company'); - diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 5d923377..7ecfdf6c 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index 999e14f5..69655348 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index 963934f0..ff0f7338 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index 7f1cf83b..4e18bb5f 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_left.php diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index 17a86ce2..a94dc093 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_right.php diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index 1f4fd1a5..7f196ec9 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -36,7 +36,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention');

-
@@ -55,9 +55,6 @@ $can = CostbenefitprojectionHelper::getActions('company'); - - @@ -114,9 +111,6 @@ $can = CostbenefitprojectionHelper::getActions('company');
service_provider_user)->name; ?>
- 		- mode); ?> - per); ?>
+
+
diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index 19b5e731..cfcf4510 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage public_details_fullwidth.php diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index c1fa4582..cea04218 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index d72adc31..ce7d8611 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers_fullwidth.php @@ -36,7 +36,7 @@ $can = CostbenefitprojectionHelper::getActions('service_provider');

- +
diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 16f15afb..b392324b 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 65774ca1..a1efb8ab 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index acf7aca2..76439797 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index c1fa4582..cea04218 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index 6b12c4fc..0df5de94 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index c412d6ba..7ac79735 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index 6f76031e..e37aaa9c 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index 66a92aaf..8b875d98 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index 8b53162f..740b2f6f 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_rightside.php diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index c1fa4582..cea04218 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 3f1a002d..a56aef7a 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 10762b45..c08dd643 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index aa974681..014a40dd 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index b5ba4558..58dbdf75 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index d7d9676d..020e89d5 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index dba22232..43d5c367 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index 8e8bc46b..d41cb122 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index b5f37375..8b1ff395 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index d7d9676d..020e89d5 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index dba22232..43d5c367 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index 2e0e66bb..9f01385f 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index cb87771b..dcd22971 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index 1203d284..d801e1af 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index 4df20e97..61a5fb9d 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index 6a4592d0..471da7db 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index dba22232..43d5c367 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index 0174c583..090acad4 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -36,7 +36,7 @@ $can = CostbenefitprojectionHelper::getActions('company');

- +
- - @@ -153,7 +147,7 @@ $can = CostbenefitprojectionHelper::getActions('company'); - diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index 0cc43bfd..6eeddf51 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_left.php similarity index 70% rename from admin/layouts/service_provider/details_fullwidth.php rename to admin/layouts/service_provider/details_left.php index f1946073..11e83199 100644 --- a/admin/layouts/service_provider/details_fullwidth.php +++ b/admin/layouts/service_provider/details_left.php @@ -3,11 +3,11 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection - @subpackage details_fullwidth.php + @subpackage details_left.php @author Llewellyn van der Merwe @owner Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb @copyright Copyright (C) 2015. All Rights Reserved @@ -31,16 +31,22 @@ $fields = $displayData->get('fields') ?: array( 'publicaddress' ); -?> -
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- -
+$hiddenFields = $displayData->get('hidden_fields') ?: array(); + +foreach ($fields as $field) +{ + $field = is_array($field) ? $field : array($field); + foreach ($field as $f) + { + if ($form->getField($f)) + { + if (in_array($f, $hiddenFields)) + { + $form->setFieldAttribute($f, 'type', 'hidden'); + } + + echo $form->renderField($f); + break; + } + } +} diff --git a/admin/layouts/service_provider/details_right.php b/admin/layouts/service_provider/details_right.php new file mode 100644 index 00000000..8dcca5e0 --- /dev/null +++ b/admin/layouts/service_provider/details_right.php @@ -0,0 +1,48 @@ + + @owner Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/-------------------------------------------------------------------------------------------------------/ + Cost Benefit Projection Tool. +/------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'testcompanies' +); + +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + +foreach ($fields as $field) +{ + $field = is_array($field) ? $field : array($field); + foreach ($field as $f) + { + if ($form->getField($f)) + { + if (in_array($f, $hiddenFields)) + { + $form->setFieldAttribute($f, 'type', 'hidden'); + } + + echo $form->renderField($f); + break; + } + } +} diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index 640492ad..ada9146d 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index dba22232..43d5c367 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 594a5018..31079be9 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index 68a5807a..c141bd16 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 8a978a65..c850e980 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index 867b9e4a..f7839c27 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php @@ -67,7 +67,7 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Create a new query object. $query = $db->getQuery(true); - // Custom code for Filtering. + // Filtering. $ids = (array) array_map('intval',explode('_', $this->input->get('cid', null, 'CMD'))); if (!$this->user->authorise('core.options', 'com_costbenefitprojection') && CostbenefitprojectionHelper::checkArray($ids)) { @@ -162,6 +162,11 @@ 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_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, 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 @@ -172,16 +177,6 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Decode sick_leave_males $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\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))) - { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\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 @@ -192,21 +187,26 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Decode medical_turnovers_males $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_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))) - { - // Decode sick_leave_females - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\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 61d3f30d..57340020 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php @@ -43,7 +43,6 @@ class CostbenefitprojectionModelCompanies extends JModelList 'a.department','department', 'a.country','country', 'a.service_provider','service_provider', - 'a.mode','mode', 'a.per','per' ); } @@ -80,9 +79,6 @@ class CostbenefitprojectionModelCompanies extends JModelList $service_provider = $this->getUserStateFromRequest($this->context . '.filter.service_provider', 'filter_service_provider'); $this->setState('filter.service_provider', $service_provider); - $mode = $this->getUserStateFromRequest($this->context . '.filter.mode', 'filter_mode'); - $this->setState('filter.mode', $mode); - $per = $this->getUserStateFromRequest($this->context . '.filter.per', 'filter_per'); $this->setState('filter.per', $per); @@ -145,8 +141,6 @@ class CostbenefitprojectionModelCompanies extends JModelList { // convert department $item->department = $this->selectionTranslation($item->department, 'department'); - // convert mode - $item->mode = $this->selectionTranslation($item->mode, 'mode'); // convert per $item->per = $this->selectionTranslation($item->per, 'per'); } @@ -177,19 +171,6 @@ class CostbenefitprojectionModelCompanies extends JModelList return $departmentArray[$value]; } } - // Array of mode language strings - if ($name == 'mode') - { - $modeArray = array( - 1 => 'COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT', - 2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT' - ); - // Now check if value is found in this array - if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value])) - { - return $modeArray[$value]; - } - } // Array of per language strings if ($name == 'per') { @@ -309,11 +290,6 @@ class CostbenefitprojectionModelCompanies extends JModelList { $query->where('a.service_provider = ' . $db->quote($db->escape($service_provider, true))); } - // Filter by Mode. - if ($mode = $this->getState('filter.mode')) - { - $query->where('a.mode = ' . $db->quote($db->escape($mode, true))); - } // Filter by Per. if ($per = $this->getState('filter.per')) { @@ -406,6 +382,11 @@ class CostbenefitprojectionModelCompanies extends JModelList continue; } + if ($advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + { + // 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 @@ -416,36 +397,31 @@ class CostbenefitprojectionModelCompanies extends JModelList // decrypt sick_leave_males $item->sick_leave_males = $advanced->decryptString($item->sick_leave_males); } - if ($advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) - { - // decrypt medical_turnovers_females - $item->medical_turnovers_females = $advanced->decryptString($item->medical_turnovers_females); - } - if ($advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // decrypt males - $item->males = $advanced->decryptString($item->males); - } if ($advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) { // decrypt medical_turnovers_males $item->medical_turnovers_males = $advanced->decryptString($item->medical_turnovers_males); } - 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_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); @@ -511,7 +487,6 @@ class CostbenefitprojectionModelCompanies extends JModelList $id .= ':' . $this->getState('filter.department'); $id .= ':' . $this->getState('filter.country'); $id .= ':' . $this->getState('filter.service_provider'); - $id .= ':' . $this->getState('filter.mode'); $id .= ':' . $this->getState('filter.per'); return parent::getStoreId($id); diff --git a/admin/models/company.php b/admin/models/company.php index e31a21bb..0c1aa87f 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -100,6 +100,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object. $advanced = new FOFEncryptAes($advancedkey, 256); + 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_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))) { // advanced decript data females. @@ -112,40 +118,34 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\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))) - { - // advanced decript data medical_turnovers_females. - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\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->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 medical_turnovers_males. $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_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))) - { - // advanced decript data sick_leave_females. - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); - } - if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) { // advanced decript data 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))) + { + // 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)) @@ -538,25 +538,6 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('service_provider', 'required', 'false'); } } - // Modify the form based on Edit Mode access controls. - if ($id != 0 && (!$user->authorise('company.edit.mode', 'com_costbenefitprojection.company.' . (int) $id)) - || ($id == 0 && !$user->authorise('company.edit.mode', 'com_costbenefitprojection'))) - { - // Disable fields for display. - $form->setFieldAttribute('mode', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('mode', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('mode', 'class', ''); - $form->setFieldAttribute('mode', 'class', $class.' disabled no-click'); - if (!$form->getValue('mode')) - { - // Disable fields while saving. - $form->setFieldAttribute('mode', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('mode', 'required', 'false'); - } - } // Modify the form based on Edit Per access controls. if ($id != 0 && (!$user->authorise('company.edit.per', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection'))) @@ -1353,6 +1334,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object $advanced = new FOFEncryptAes($advancedkey, 256); + // Encript data medical_turnovers_females. + if (isset($data['medical_turnovers_females']) && $advancedkey) + { + $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); + } + // Encript data females. if (isset($data['females']) && $advancedkey) { @@ -1365,42 +1352,36 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']); } - // Encript data medical_turnovers_females. - if (isset($data['medical_turnovers_females']) && $advancedkey) - { - $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); - } - - // Encript data males. - if (isset($data['males']) && $advancedkey) - { - $data['males'] = $advanced->encryptString($data['males']); - } - // Encript data medical_turnovers_males. if (isset($data['medical_turnovers_males']) && $advancedkey) { $data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']); } - // 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_salary. if (isset($data['total_salary']) && $advancedkey) { $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 ffec8f84..88ffc774 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php @@ -174,6 +174,11 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection'); return false; } + 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_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 @@ -184,16 +189,6 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem // Decode sick_leave_males $data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\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))) - { - // Decode medical_turnovers_females - $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\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 @@ -204,21 +199,26 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem // Decode medical_turnovers_males $data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_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))) - { - // Decode sick_leave_females - $data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\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 21b38495..0ef589eb 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -460,6 +460,8 @@ class CostbenefitprojectionModelCostbenefitprojection extends JModelList // check if there is any countries loaded if (CostbenefitprojectionHelper::checkArray($this->countries)) { + // remove dummy companies + $remove = $this->getDummyComp(); // Create a new query object. $query = $this->db->getQuery(true); // Get from #__costbenefitprojection_company as a @@ -471,9 +473,18 @@ class CostbenefitprojectionModelCostbenefitprojection extends JModelList { // get his companies $ids = CostbenefitprojectionHelper::hisCompanies($this->user->id); + if ($remove) + { + $ids = array_diff($ids, $remove); + } // limit to only load his companies $query->where('a.id IN (' . implode(',', $ids) . ')'); } + elseif ($remove) + { + // limit to only real companies + $query->where('a.id NOT IN (' . implode(',', $remove) . ')'); + } // Check that we only use the real companies and none of the dummy companies $query->where('a.mode = 1'); // this will insure only real companies are loaded // get only from set countries @@ -492,6 +503,45 @@ class CostbenefitprojectionModelCostbenefitprojection extends JModelList return false; } + protected $dummyComp = false; + + protected function getDummyComp() + { + // insure we only get this once + if (!CostbenefitprojectionHelper::checkArray($this->dummyComp)) + { + // Create a new query object. + $query = $this->db->getQuery(true); + + // Get from #__costbenefitprojection_service_provider as a + $query->select($this->db->quoteName( + array('a.testcompanies'), + array('testcompanies'))); + $query->from($this->db->quoteName('#__costbenefitprojection_service_provider', 'a')); + // load the query + $this->db->setQuery($query); + $this->db->execute(); + if ($this->db->getNumRows()) + { + // get the test companies + $testcompanies = $this->db->loadColumn(); + // global Ids + $global = array(); + // okay now we loop the test companies to build a global id set + foreach ($testcompanies as $json) + { + if (CostbenefitprojectionHelper::checkJson($json)) + { + $global = array_merge($global, json_decode($json, true)); + } + } + // now insure the ids are unique + $this->dummyComp = array_unique($global); + } + } + return $this->dummyComp; + } + protected function setCountries($limited = false) { // Create a new query object. diff --git a/admin/models/countries.php b/admin/models/countries.php index 3943fe39..c7ad753a 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/country.php b/admin/models/country.php index 5deda3d6..fac90be6 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php @@ -443,8 +443,6 @@ class CostbenefitprojectionModelCountry extends JModelAdmin { // convert department $item->department = $this->selectionTranslationVwhcompanies($item->department, 'department'); - // convert mode - $item->mode = $this->selectionTranslationVwhcompanies($item->mode, 'mode'); // convert per $item->per = $this->selectionTranslationVwhcompanies($item->per, 'per'); } @@ -475,19 +473,6 @@ class CostbenefitprojectionModelCountry extends JModelAdmin return $departmentArray[$value]; } } - // Array of mode language strings - if ($name == 'mode') - { - $modeArray = array( - 1 => 'COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT', - 2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT' - ); - // Now check if value is found in this array - if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value])) - { - return $modeArray[$value]; - } - } // Array of per language strings if ($name == 'per') { diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 7e6a2803..d9096ac8 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/models/currency.php b/admin/models/currency.php index bb0efe94..b0381313 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 04b1ece8..0bd83653 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage articles.php diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php index 67b7ad04..6354c05d 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php index 0d2057ce..48de9074 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesriskscheck.php diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php index 5f124db1..b2bda837 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/fields/companycheck.php b/admin/models/fields/companycheck.php new file mode 100644 index 00000000..f3cab1dc --- /dev/null +++ b/admin/models/fields/companycheck.php @@ -0,0 +1,87 @@ + + @owner Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/-------------------------------------------------------------------------------------------------------/ + Cost Benefit Projection Tool. +/------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('checkboxes'); + +/** + * Companycheck Form Field class for the Costbenefitprojection component + */ +class JFormFieldCompanycheck extends JFormFieldCheckboxes +{ + /** + * The companycheck field type. + * + * @var string + */ + public $type = 'companycheck'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + public function getOptions() + { + // Get the user object. + $user = JFactory::getUser(); + // Create a new query object. + $db = JFactory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.id','a.name'),array('id','testcompanies_name'))); + $query->from($db->quoteName('#__costbenefitprojection_company', 'a')); + $query->where($db->quoteName('a.published') . ' = 1'); + if (!$user->authorise('core.options', 'com_costbenefitprojection')) + { + $companies = CostbenefitprojectionHelper::hisCompanies($user->id); + if (CostbenefitprojectionHelper::checkArray($companies)) + { + $companies = implode(',',$companies); + // only load this users companies + $query->where('a.id IN (' . $companies . ')'); + } + else + { + // dont allow user to see any companies + $query->where('a.id = -4'); + } + } + $query->order('a.name ASC'); + $db->setQuery((string)$query); + $items = $db->loadObjectList(); + $options = array(); + if ($items) + { + foreach($items as $item) + { + $tmp = array( + 'value' => $item->id, + 'text' => ' '.$item->testcompanies_name.'', + 'checked' => false + ); + $options[] = (object) $tmp; + } + } + return $options; + } +} diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index d3cbcfbb..27072270 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php index 0804a723..b210186c 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countryuser.php diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index 86df0cb4..1b95b29c 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php index 93d7b20f..09e5a984 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage datayear.php diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php index ac97dcb6..51ce137d 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index 9ec53975..08590657 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage memberuser.php diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php index 3d6b0127..42f25112 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovider.php diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index 57c0115b..861ac3e6 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovideruser.php diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index db4f88b9..bebb711e 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.js diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js index df0d29ee..84feff27 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/admin/models/forms/company.xml b/admin/models/forms/company.xml index 4e8ed8cc..9f3f280a 100644 --- a/admin/models/forms/company.xml +++ b/admin/models/forms/company.xml @@ -159,21 +159,6 @@ required="true" button="true" /> - - - - - - COM_COSTBENEFITPROJECTION_COMPANY_LOCKED - - - - - - - - - + + + + + + + + + - + - + - + - - - - + + + + + + diff --git a/admin/models/health_data.php b/admin/models/health_data.php index aefab0c9..13544806 100644 --- a/admin/models/health_data.php +++ b/admin/models/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index efb70808..5566a527 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/models/help_document.php b/admin/models/help_document.php index 7b8a6ab7..e825f9b4 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 7aea3d7c..82f04502 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 3601eecc..986a40af 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/models/intervention.php b/admin/models/intervention.php index 521e190a..3961039c 100644 --- a/admin/models/intervention.php +++ b/admin/models/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/models/interventions.php b/admin/models/interventions.php index ad7346aa..b33b8606 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php index 44012bfc..6ebe1643 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index d6508eda..e8849ff9 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index a7bd927a..770f89cc 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php @@ -87,6 +87,12 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $registry = new Registry; $registry->loadString($item->metadata); $item->metadata = $registry->toArray(); + } + + if (!empty($item->testcompanies)) + { + // JSON Decode testcompanies. + $item->testcompanies = json_decode($item->testcompanies); } if (!empty($item->id)) @@ -212,8 +218,6 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin { // convert department $item->department = $this->selectionTranslationVwecompanies($item->department, 'department'); - // convert mode - $item->mode = $this->selectionTranslationVwecompanies($item->mode, 'mode'); // convert per $item->per = $this->selectionTranslationVwecompanies($item->per, 'per'); } @@ -244,19 +248,6 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin return $departmentArray[$value]; } } - // Array of mode language strings - if ($name == 'mode') - { - $modeArray = array( - 1 => 'COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT', - 2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT' - ); - // Now check if value is found in this array - if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value])) - { - return $modeArray[$value]; - } - } // Array of per language strings if ($name == 'per') { @@ -993,7 +984,13 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $metadata = new JRegistry; $metadata->loadArray($data['metadata']); $data['metadata'] = (string) $metadata; - } + } + + // Set the testcompanies string to JSON string. + if (isset($data['testcompanies'])) + { + $data['testcompanies'] = (string) json_encode($data['testcompanies']); + } // Set the Params Items to data if (isset($data['params']) && is_array($data['params'])) diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index 27854969..68ade62f 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 3ad57e31..e789be79 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -10,7 +10,6 @@ CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_company` ( `males` VARCHAR(255) NOT NULL DEFAULT '', `medical_turnovers_females` VARCHAR(255) NOT NULL DEFAULT '', `medical_turnovers_males` VARCHAR(255) NOT NULL DEFAULT '', - `mode` TINYINT(1) NOT NULL DEFAULT '1', `name` CHAR(64) NOT NULL DEFAULT '', `not_required` INT(1) NOT NULL DEFAULT '0', `per` TINYINT(1) NOT NULL DEFAULT '0', @@ -47,7 +46,6 @@ CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_company` ( KEY `idx_user` (`user`), KEY `idx_country` (`country`), KEY `idx_service_provider` (`service_provider`), - KEY `idx_mode` (`mode`), KEY `idx_per` (`per`), KEY `idx_datayear` (`datayear`), KEY `idx_working_days` (`working_days`), @@ -62,6 +60,7 @@ CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_service_provider` ( `publicemail` VARCHAR(255) NOT NULL DEFAULT '', `publicname` VARCHAR(255) NOT NULL DEFAULT '', `publicnumber` VARCHAR(64) NOT NULL DEFAULT '', + `testcompanies` TEXT NOT NULL DEFAULT '', `user` INT(11) NOT NULL DEFAULT '0', `params` TEXT NOT NULL DEFAULT '', `published` tinyint(1) NOT NULL DEFAULT '1', diff --git a/admin/sql/updates/mysql/3.3.9.sql b/admin/sql/updates/mysql/3.3.9.sql new file mode 100644 index 00000000..83152204 --- /dev/null +++ b/admin/sql/updates/mysql/3.3.9.sql @@ -0,0 +1 @@ +ALTER TABLE `#__costbenefitprojection_service_provider` ADD `testcompanies` TEXT NOT NULL; diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index 7aac5810..4fcdb022 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/tables/company.php b/admin/tables/company.php index 9766aabe..733713ae 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/tables/country.php b/admin/tables/country.php index 154c24ba..857baa89 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/tables/currency.php b/admin/tables/currency.php index 9ec3b018..425cd401 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php index 70ce96e0..ff046c11 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 2a6163a3..d4b27077 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php index fa019020..d792d749 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php index 7784d162..58ad07c9 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php index 4bff9b1d..39288b64 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/vdm.php b/admin/vdm.php index d90d2291..1d42ce09 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage vdm.php diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js index 5c1918a4..7ef6a4a9 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php index f2e66d23..5f9f96f1 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php index 6eff37f0..bac8c1a1 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php index 588d39b4..fe7705b1 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php index 84d8f22a..f42a3cc2 100644 --- a/admin/views/causesrisks/tmpl/default_batch_body.php +++ b/admin/views/causesrisks/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php index cbbf8dc1..062fd801 100644 --- a/admin/views/causesrisks/tmpl/default_batch_footer.php +++ b/admin/views/causesrisks/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php index 642fc369..7018a389 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php index 9e5036db..f35e8d67 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php index 1ae7a2f6..d9aa91d0 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php index ebc0e4d7..a0ea48cb 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php index ec0fd587..995099dc 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php index 11512a07..0f610409 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php index c6945ff2..7ba3520c 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php index fd007355..fb01bf27 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index 37118729..a529639d 100644 --- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php index e56f99d0..13829325 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index cb032e30..4dd96c69 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php index 8d97f39b..ed7dda20 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index 50f25905..d09586f5 100644 --- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php index e259d2bc..5f779ee7 100644 --- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index bd3c2f80..e3c9eacd 100644 --- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index 133d99c4..3da5e7f6 100644 --- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php index a9287f71..bc823c04 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php index 1d077410..27e756d8 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php index ce151e78..2163e3ff 100644 --- a/admin/views/companies/tmpl/default_batch_body.php +++ b/admin/views/companies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php index 08e01e6e..9220b650 100644 --- a/admin/views/companies/tmpl/default_batch_footer.php +++ b/admin/views/companies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php index e88be46d..9e14d759 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -116,9 +116,6 @@ $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.
service_provider_user)->name; ?>
- diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php index 9dcb9e22..7c88e20c 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php @@ -22,5 +22,5 @@ defined('_JEXEC') or die('Restricted access'); ?> - + \ No newline at end of file diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php index 983e06d4..8ed38220 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php @@ -52,9 +52,6 @@ defined('_JEXEC') or die('Restricted access'); - diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php index 7320a0a1..25978b63 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php index 40dc8516..f9b35187 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -266,28 +266,6 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy } } - // Set Mode Selection - $this->modeOptions = $this->getTheModeSelections(); - if ($this->modeOptions) - { - // Mode Filter - JHtmlSidebar::addFilter( - '- Select '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL').' -', - 'filter_mode', - JHtml::_('select.options', $this->modeOptions, 'value', 'text', $this->state->get('filter.mode')) - ); - - if ($this->canBatch && $this->canCreate && $this->canEdit) - { - // Mode Batch Selection - JHtmlBatch_::addListSelection( - '- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL').' -', - 'batch[mode]', - JHtml::_('select.options', $this->modeOptions, 'value', 'text') - ); - } - } - // Set Per Selection $this->perOptions = $this->getThePerSelections(); if ($this->perOptions) @@ -356,7 +334,6 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy 'a.department' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_DEPARTMENT_LABEL'), 'h.name' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL'), 'i.user' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICE_PROVIDER_LABEL'), - 'a.mode' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL'), 'a.per' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_PER_LABEL'), 'a.id' => JText::_('JGRID_HEADING_ID') ); @@ -398,42 +375,6 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy return false; } - protected function getTheModeSelections() - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - - // Select the text. - $query->select($db->quoteName('mode')); - $query->from($db->quoteName('#__costbenefitprojection_company')); - $query->order($db->quoteName('mode') . ' ASC'); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - - $results = $db->loadColumn(); - - if ($results) - { - // get model - $model = $this->getModel(); - $results = array_unique($results); - $filter = array(); - foreach ($results as $mode) - { - // Translate the mode selection - $text = $model->selectionTranslation($mode,'mode'); - // Now add the mode and its text to the options array - $filter[] = JHtml::_('select.option', $mode, JText::_($text)); - } - return $filter; - } - return false; - } - protected function getThePerSelections() { // Get a db connection. diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js index f0b62a90..884c95b6 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index 9dee9804..07013a13 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/company/view.html.php b/admin/views/company/view.html.php index 94107842..6098f4f5 100644 --- a/admin/views/company/view.html.php +++ b/admin/views/company/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companyresults/tmpl/default.php b/admin/views/companyresults/tmpl/default.php index c9d95aa2..6ce538fd 100644 --- a/admin/views/companyresults/tmpl/default.php +++ b/admin/views/companyresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost.php b/admin/views/companyresults/tmpl/default_chart_cost.php index c6945ff2..7ba3520c 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost.php +++ b/admin/views/companyresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost_percent.php b/admin/views/companyresults/tmpl/default_chart_cost_percent.php index fd007355..fb01bf27 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index 37118729..a529639d 100644 --- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php index e56f99d0..13829325 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index cb032e30..4dd96c69 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/companyresults/tmpl/default_main.php b/admin/views/companyresults/tmpl/default_main.php index 8d97f39b..ed7dda20 100644 --- a/admin/views/companyresults/tmpl/default_main.php +++ b/admin/views/companyresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index 50f25905..d09586f5 100644 --- a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/companyresults/tmpl/default_table_cost_summary.php b/admin/views/companyresults/tmpl/default_table_cost_summary.php index e259d2bc..5f779ee7 100644 --- a/admin/views/companyresults/tmpl/default_table_cost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php index bd3c2f80..e3c9eacd 100644 --- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php index 133d99c4..3da5e7f6 100644 --- a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/companyresults/tmpl/default_variables.php b/admin/views/companyresults/tmpl/default_variables.php index 038ac2ad..4b2a49c3 100644 --- a/admin/views/companyresults/tmpl/default_variables.php +++ b/admin/views/companyresults/tmpl/default_variables.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_variables.php diff --git a/admin/views/companyresults/view.html.php b/admin/views/companyresults/view.html.php index 2a0056fb..b3d2b8e2 100644 --- a/admin/views/companyresults/view.html.php +++ b/admin/views/companyresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/costbenefitprojection/tmpl/default.php b/admin/views/costbenefitprojection/tmpl/default.php index 149879ae..d64b4be6 100644 --- a/admin/views/costbenefitprojection/tmpl/default.php +++ b/admin/views/costbenefitprojection/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/costbenefitprojection/tmpl/default_main.php b/admin/views/costbenefitprojection/tmpl/default_main.php index db2cfdcd..bab870df 100644 --- a/admin/views/costbenefitprojection/tmpl/default_main.php +++ b/admin/views/costbenefitprojection/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php index f4476a9d..72063b3a 100644 --- a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php +++ b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_usage_statistics_table.php diff --git a/admin/views/costbenefitprojection/tmpl/default_vdm.php b/admin/views/costbenefitprojection/tmpl/default_vdm.php index 22e99366..2b28e636 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vdm.php +++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_vdm.php diff --git a/admin/views/costbenefitprojection/view.html.php b/admin/views/costbenefitprojection/view.html.php index 9554c09c..c4312230 100644 --- a/admin/views/costbenefitprojection/view.html.php +++ b/admin/views/costbenefitprojection/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php index e7a7f2d5..0c6f8abe 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php index c6b61a34..0ac3a8cd 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php index 117d83cf..6f888af8 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php index 75c7ad2f..503f4848 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php index 1b1dc747..7c88e20c 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php index d1071899..0269a84e 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php index 16e09e65..feb95d84 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php index f0a05cbb..4ac9e6e6 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js index 2efe28c0..2fb90bed 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php index 07164322..2bb1b669 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php index 530042a1..bf6f8fc7 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php index eba7667b..0b92083d 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php index ea8539d3..a27a68a5 100644 --- a/admin/views/currencies/tmpl/default_batch_body.php +++ b/admin/views/currencies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php index d4227674..04541ad1 100644 --- a/admin/views/currencies/tmpl/default_batch_footer.php +++ b/admin/views/currencies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php index 8a74007b..1f35a5d1 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php index e1a1a873..ca701930 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php index 6236dd32..f0cbcc5a 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php index 6f7ab250..dd55a76d 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php index 9bc50604..2697a896 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js index 17a50257..3da7d0f0 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php index 57083a70..404b22e3 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php index c8364f06..cc814a97 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/health_data/submitbutton.js b/admin/views/health_data/submitbutton.js index 88df9fa7..d638aa0e 100644 --- a/admin/views/health_data/submitbutton.js +++ b/admin/views/health_data/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/health_data/tmpl/edit.php b/admin/views/health_data/tmpl/edit.php index 848da652..0efc150f 100644 --- a/admin/views/health_data/tmpl/edit.php +++ b/admin/views/health_data/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/health_data/view.html.php b/admin/views/health_data/view.html.php index 472203d8..d441b5d7 100644 --- a/admin/views/health_data/view.html.php +++ b/admin/views/health_data/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/health_data_sets/tmpl/default.php b/admin/views/health_data_sets/tmpl/default.php index 81ecba28..5c24f4b9 100644 --- a/admin/views/health_data_sets/tmpl/default.php +++ b/admin/views/health_data_sets/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_body.php b/admin/views/health_data_sets/tmpl/default_batch_body.php index be000cf0..2c9135fa 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_body.php +++ b/admin/views/health_data_sets/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_footer.php b/admin/views/health_data_sets/tmpl/default_batch_footer.php index 33ff8a7e..13d6432e 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_footer.php +++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/health_data_sets/tmpl/default_body.php b/admin/views/health_data_sets/tmpl/default_body.php index df68404d..f7e95997 100644 --- a/admin/views/health_data_sets/tmpl/default_body.php +++ b/admin/views/health_data_sets/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/health_data_sets/tmpl/default_foot.php b/admin/views/health_data_sets/tmpl/default_foot.php index 22da1ecb..43a23a5e 100644 --- a/admin/views/health_data_sets/tmpl/default_foot.php +++ b/admin/views/health_data_sets/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/health_data_sets/tmpl/default_head.php b/admin/views/health_data_sets/tmpl/default_head.php index fd087a1f..f4f66a86 100644 --- a/admin/views/health_data_sets/tmpl/default_head.php +++ b/admin/views/health_data_sets/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/health_data_sets/tmpl/default_toolbar.php b/admin/views/health_data_sets/tmpl/default_toolbar.php index 9cc4edc1..f128c414 100644 --- a/admin/views/health_data_sets/tmpl/default_toolbar.php +++ b/admin/views/health_data_sets/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/health_data_sets/view.html.php b/admin/views/health_data_sets/view.html.php index 79ad9b3a..b1cad41e 100644 --- a/admin/views/health_data_sets/view.html.php +++ b/admin/views/health_data_sets/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index acc6aad1..8f1b776b 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index 2c01744d..ba40c999 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 571845b9..ee08aad6 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index d47ae635..2313f22b 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index db83bb6e..2ee4ce3b 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index 6a3e9dd2..abd89f06 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 1daf0124..a905c14a 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 1b1dc747..7c88e20c 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index ff6d8e62..345af8c1 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index 643d004b..d8e877b9 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index a7adc0bc..e062c27d 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 4ad14b26..5e0702d6 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 9ae88227..467cb9e3 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js index 757ffc57..cf169a76 100644 --- a/admin/views/intervention/submitbutton.js +++ b/admin/views/intervention/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/intervention/tmpl/edit.php b/admin/views/intervention/tmpl/edit.php index 13dadaf9..5f820294 100644 --- a/admin/views/intervention/tmpl/edit.php +++ b/admin/views/intervention/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/intervention/view.html.php b/admin/views/intervention/view.html.php index 4f40e844..6e51657a 100644 --- a/admin/views/intervention/view.html.php +++ b/admin/views/intervention/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/interventions/tmpl/default.php b/admin/views/interventions/tmpl/default.php index 68068830..6599ccfd 100644 --- a/admin/views/interventions/tmpl/default.php +++ b/admin/views/interventions/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/interventions/tmpl/default_batch_body.php b/admin/views/interventions/tmpl/default_batch_body.php index a5e1b8c3..f1919884 100644 --- a/admin/views/interventions/tmpl/default_batch_body.php +++ b/admin/views/interventions/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/interventions/tmpl/default_batch_footer.php b/admin/views/interventions/tmpl/default_batch_footer.php index 2dc7e396..ec0278e7 100644 --- a/admin/views/interventions/tmpl/default_batch_footer.php +++ b/admin/views/interventions/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/interventions/tmpl/default_body.php b/admin/views/interventions/tmpl/default_body.php index 6f301fb8..5eb43405 100644 --- a/admin/views/interventions/tmpl/default_body.php +++ b/admin/views/interventions/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php index e1a1a873..ca701930 100644 --- a/admin/views/interventions/tmpl/default_foot.php +++ b/admin/views/interventions/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/interventions/tmpl/default_head.php b/admin/views/interventions/tmpl/default_head.php index 5d4e027b..e4c1b2ca 100644 --- a/admin/views/interventions/tmpl/default_head.php +++ b/admin/views/interventions/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php index e8e527fb..f1c346d5 100644 --- a/admin/views/interventions/tmpl/default_toolbar.php +++ b/admin/views/interventions/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/interventions/view.html.php b/admin/views/interventions/view.html.php index 55d9f553..623b1bfc 100644 --- a/admin/views/interventions/view.html.php +++ b/admin/views/interventions/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/scaling_factor/submitbutton.js b/admin/views/scaling_factor/submitbutton.js index 72862fd3..35f56431 100644 --- a/admin/views/scaling_factor/submitbutton.js +++ b/admin/views/scaling_factor/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/scaling_factor/tmpl/edit.php b/admin/views/scaling_factor/tmpl/edit.php index 6b6f5ed5..890ad5d6 100644 --- a/admin/views/scaling_factor/tmpl/edit.php +++ b/admin/views/scaling_factor/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/scaling_factor/view.html.php b/admin/views/scaling_factor/view.html.php index f1af9627..9baf0112 100644 --- a/admin/views/scaling_factor/view.html.php +++ b/admin/views/scaling_factor/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/scaling_factors/tmpl/default.php b/admin/views/scaling_factors/tmpl/default.php index fc5209d3..c7bf51f4 100644 --- a/admin/views/scaling_factors/tmpl/default.php +++ b/admin/views/scaling_factors/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_body.php b/admin/views/scaling_factors/tmpl/default_batch_body.php index 4620ea8f..f914a0d1 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_body.php +++ b/admin/views/scaling_factors/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_footer.php b/admin/views/scaling_factors/tmpl/default_batch_footer.php index acf8534d..a1891bab 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_footer.php +++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/scaling_factors/tmpl/default_body.php b/admin/views/scaling_factors/tmpl/default_body.php index d94977b8..351073e4 100644 --- a/admin/views/scaling_factors/tmpl/default_body.php +++ b/admin/views/scaling_factors/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/scaling_factors/tmpl/default_foot.php b/admin/views/scaling_factors/tmpl/default_foot.php index 4db79164..38333854 100644 --- a/admin/views/scaling_factors/tmpl/default_foot.php +++ b/admin/views/scaling_factors/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/scaling_factors/tmpl/default_head.php b/admin/views/scaling_factors/tmpl/default_head.php index 057841d2..be857f24 100644 --- a/admin/views/scaling_factors/tmpl/default_head.php +++ b/admin/views/scaling_factors/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/scaling_factors/tmpl/default_toolbar.php b/admin/views/scaling_factors/tmpl/default_toolbar.php index 610878b2..0a89745d 100644 --- a/admin/views/scaling_factors/tmpl/default_toolbar.php +++ b/admin/views/scaling_factors/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/scaling_factors/view.html.php b/admin/views/scaling_factors/view.html.php index 30b61878..ed098f7c 100644 --- a/admin/views/scaling_factors/view.html.php +++ b/admin/views/scaling_factors/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/service_provider/submitbutton.js b/admin/views/service_provider/submitbutton.js index 5506b132..24b5486d 100644 --- a/admin/views/service_provider/submitbutton.js +++ b/admin/views/service_provider/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/service_provider/tmpl/edit.php b/admin/views/service_provider/tmpl/edit.php index f4ced17e..6fc3ffce 100644 --- a/admin/views/service_provider/tmpl/edit.php +++ b/admin/views/service_provider/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php @@ -36,10 +36,11 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');
-
-
-
- +
+ +
+
+
diff --git a/admin/views/service_provider/view.html.php b/admin/views/service_provider/view.html.php index db3846ca..f8e2a40e 100644 --- a/admin/views/service_provider/view.html.php +++ b/admin/views/service_provider/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/service_providers/tmpl/default.php b/admin/views/service_providers/tmpl/default.php index 6ffc61a4..b555c887 100644 --- a/admin/views/service_providers/tmpl/default.php +++ b/admin/views/service_providers/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/service_providers/tmpl/default_batch_body.php b/admin/views/service_providers/tmpl/default_batch_body.php index 144f72e6..5f0a5707 100644 --- a/admin/views/service_providers/tmpl/default_batch_body.php +++ b/admin/views/service_providers/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/service_providers/tmpl/default_batch_footer.php b/admin/views/service_providers/tmpl/default_batch_footer.php index 7be3a6ef..233c9f29 100644 --- a/admin/views/service_providers/tmpl/default_batch_footer.php +++ b/admin/views/service_providers/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/service_providers/tmpl/default_body.php b/admin/views/service_providers/tmpl/default_body.php index 941910ca..0099c532 100644 --- a/admin/views/service_providers/tmpl/default_body.php +++ b/admin/views/service_providers/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/service_providers/tmpl/default_foot.php b/admin/views/service_providers/tmpl/default_foot.php index 1b1dc747..7c88e20c 100644 --- a/admin/views/service_providers/tmpl/default_foot.php +++ b/admin/views/service_providers/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/service_providers/tmpl/default_head.php b/admin/views/service_providers/tmpl/default_head.php index 50d7a1fd..70055033 100644 --- a/admin/views/service_providers/tmpl/default_head.php +++ b/admin/views/service_providers/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/service_providers/tmpl/default_toolbar.php b/admin/views/service_providers/tmpl/default_toolbar.php index 067e0a5c..be655210 100644 --- a/admin/views/service_providers/tmpl/default_toolbar.php +++ b/admin/views/service_providers/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/service_providers/view.html.php b/admin/views/service_providers/view.html.php index cdd014eb..05251e06 100644 --- a/admin/views/service_providers/view.html.php +++ b/admin/views/service_providers/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml index 97d768a7..b5a754b5 100644 --- a/costbenefitprojection.xml +++ b/costbenefitprojection.xml @@ -1,15 +1,15 @@ COM_COSTBENEFITPROJECTION - 18th March, 2016 + 22nd March, 2016 Llewellyn van der Merwe llewellyn@vdm.io 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.9 + 3.3.10 Cost Benefit Projection (v.3.3.9) +

Cost Benefit Projection (v.3.3.10)

[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/media/footable/LICENSE b/media/footable/LICENSE new file mode 100644 index 00000000..b20e393e --- /dev/null +++ b/media/footable/LICENSE @@ -0,0 +1,4 @@ +Copyright 2012 Steven Usher & Brad Vincent + +Released under the MIT license +You are free to use FooTable in commercial projects as long as this copyright header is left intact. \ No newline at end of file diff --git a/media/footable/js/footable.filter.js b/media/footable/js/footable.filter.js index 718dd7f8..62765751 100644 --- a/media/footable/js/footable.filter.js +++ b/media/footable/js/footable.filter.js @@ -130,6 +130,7 @@ p.showRow = function (row, ft) { var $row = $(row), $next = $row.next(), $table = $(ft.table); + if ($row.is(':visible')) return; //already visible - do nothing if ($table.hasClass('breakpoint') && $row.hasClass('footable-detail-show') && $next.hasClass('footable-row-detail')) { $row.add($next).show(); ft.createOrUpdateDetailRow(row); diff --git a/script.php b/script.php index 1311c4f1..06221c8b 100644 --- a/script.php +++ b/script.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage script.php @@ -904,9 +904,9 @@ 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","mode":"mode","per":"per","females":"females","sick_leave_males":"sick_leave_males","medical_turnovers_females":"medical_turnovers_females","males":"males","causesrisks":"causesrisks","medical_turnovers_males":"medical_turnovers_males","datayear":"datayear","turnover_comment":"turnover_comment","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","mode","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"}]}'; + $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"}]}'; // Set the object into the content types table. $company_Inserted = $db->insertObject('#__content_types', $company); @@ -916,9 +916,9 @@ class com_costbenefitprojectionInstallerScript $service_provider->type_title = 'Costbenefitprojection Service_provider'; $service_provider->type_alias = 'com_costbenefitprojection.service_provider'; $service_provider->table = '{"special": {"dbtable": "#__costbenefitprojection_service_provider","key": "id","type": "Service_provider","prefix": "costbenefitprojectionTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $service_provider->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "user","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "publicaddress","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","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": {"user":"user","country":"country","publicname":"publicname","publicemail":"publicemail","publicnumber":"publicnumber","publicaddress":"publicaddress"}}'; + $service_provider->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "user","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "publicaddress","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","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": {"user":"user","country":"country","publicname":"publicname","publicemail":"publicemail","publicnumber":"publicnumber","publicaddress":"publicaddress","testcompanies":"testcompanies"}}'; $service_provider->router = 'CostbenefitprojectionHelperRoute::getService_providerRoute'; - $service_provider->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/service_provider.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","country"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"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"}]}'; + $service_provider->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/service_provider.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","country"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"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": "testcompanies","targetTable": "#__costbenefitprojection_company","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $service_provider_Inserted = $db->insertObject('#__content_types', $service_provider); @@ -1040,9 +1040,9 @@ 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","mode":"mode","per":"per","females":"females","sick_leave_males":"sick_leave_males","medical_turnovers_females":"medical_turnovers_females","males":"males","causesrisks":"causesrisks","medical_turnovers_males":"medical_turnovers_males","datayear":"datayear","turnover_comment":"turnover_comment","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","mode","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"}]}'; + $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"}]}'; // Check if company type is already in content_type DB. $company_id = null; @@ -1069,9 +1069,9 @@ class com_costbenefitprojectionInstallerScript $service_provider->type_title = 'Costbenefitprojection Service_provider'; $service_provider->type_alias = 'com_costbenefitprojection.service_provider'; $service_provider->table = '{"special": {"dbtable": "#__costbenefitprojection_service_provider","key": "id","type": "Service_provider","prefix": "costbenefitprojectionTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $service_provider->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "user","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "publicaddress","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","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": {"user":"user","country":"country","publicname":"publicname","publicemail":"publicemail","publicnumber":"publicnumber","publicaddress":"publicaddress"}}'; + $service_provider->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "user","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "publicaddress","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","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": {"user":"user","country":"country","publicname":"publicname","publicemail":"publicemail","publicnumber":"publicnumber","publicaddress":"publicaddress","testcompanies":"testcompanies"}}'; $service_provider->router = 'CostbenefitprojectionHelperRoute::getService_providerRoute'; - $service_provider->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/service_provider.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","country"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"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"}]}'; + $service_provider->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/service_provider.xml","hideFields": ["asset_id","checked_out","checked_out_time","version"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","user","country"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"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": "testcompanies","targetTable": "#__costbenefitprojection_company","targetColumn": "id","displayColumn": "name"}]}'; // Check if service_provider type is already in content_type DB. $service_provider_id = null; @@ -1300,7 +1300,7 @@ class com_costbenefitprojectionInstallerScript echo ' -

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

'; +

Upgrade to Version 3.3.10 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 bb0afbd7..db5912c8 100644 --- a/site/assets/css/combinedresults.css +++ b/site/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/site/assets/css/company.css b/site/assets/css/company.css index 7febd647..4c601af5 100644 --- a/site/assets/css/company.css +++ b/site/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css index 983444c3..48fce239 100644 --- a/site/assets/css/companyresults.css +++ b/site/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css index db996be9..2be62dcb 100644 --- a/site/assets/css/cpanel.css +++ b/site/assets/css/cpanel.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.css diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css index b92b57dd..e4e5a397 100644 --- a/site/assets/css/createaccount.css +++ b/site/assets/css/createaccount.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.css diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css index a5e96569..e97eb1f1 100644 --- a/site/assets/css/intervention.css +++ b/site/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/site/assets/css/publicresults.css b/site/assets/css/publicresults.css index 8f097d0a..428cbad6 100644 --- a/site/assets/css/publicresults.css +++ b/site/assets/css/publicresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publicresults.css diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css index ce554d1c..8771c962 100644 --- a/site/assets/css/scaling_factor.css +++ b/site/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index ad502ab4..66af1e5f 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.css diff --git a/site/controller.php b/site/controller.php index 381d33b4..60ec7125 100644 --- a/site/controller.php +++ b/site/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index 1ffb304e..35decf2a 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php @@ -56,6 +56,7 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy case 'calculatedResult': try { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $idValue = $jinput->get('id', NULL, 'INT'); $dataValue = $jinput->get('data', NULL, 'BASE64'); if($idValue && $dataValue && $user->id != 0) @@ -70,6 +71,10 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy { echo $_GET['callback'] . "(".json_encode($result).");"; } + elseif($returnRaw) + { + echo json_encode($result); + } else { echo "(".json_encode($result).");"; @@ -90,6 +95,7 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy case 'interventionBuildTable': try { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $idNameValue = $jinput->get('idName', NULL, 'CMD'); $ojectValue = $jinput->get('oject', NULL, 'STRING'); $clusterValue = $jinput->get('cluster', NULL, 'WORD'); @@ -105,6 +111,10 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy { echo $_GET['callback'] . "(".json_encode($result).");"; } + elseif($returnRaw) + { + echo json_encode($result); + } else { echo "(".json_encode($result).");"; @@ -125,6 +135,7 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy case 'getClusterData': try { + $returnRaw = $jinput->get('raw', false, 'BOOLEAN'); $idNameValue = $jinput->get('idName', NULL, 'CMD'); $clusterValue = $jinput->get('cluster', NULL, 'STRING'); if($idNameValue && $clusterValue && $user->id != 0) @@ -139,6 +150,10 @@ class CostbenefitprojectionControllerAjax extends JControllerLegacy { echo $_GET['callback'] . "(".json_encode($result).");"; } + elseif($returnRaw) + { + echo json_encode($result); + } else { echo "(".json_encode($result).");"; diff --git a/site/controllers/company.php b/site/controllers/company.php index c356e793..31705a6e 100644 --- a/site/controllers/company.php +++ b/site/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/site/controllers/help.php b/site/controllers/help.php index f7f872c6..4f439033 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php index f1fd3c44..fa242c73 100644 --- a/site/controllers/intervention.php +++ b/site/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/site/controllers/scaling_factor.php b/site/controllers/scaling_factor.php index 0598b46a..42041a2b 100644 --- a/site/controllers/scaling_factor.php +++ b/site/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php index 2a18fced..8a0ee10d 100644 --- a/site/costbenefitprojection.php +++ b/site/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php index ea88b1e2..9b0502d9 100644 --- a/site/helpers/costbenefitprojection.php +++ b/site/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 41d2957b..d521f016 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index e1b241ff..4d1af82f 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage route.php diff --git a/site/language/en-GB/en-GB.com_costbenefitprojection.ini b/site/language/en-GB/en-GB.com_costbenefitprojection.ini index 8ab09fef..602be585 100644 --- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -149,8 +149,6 @@ COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_DEPARTMENT_DESC="Allows the users in th COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_DESC="Allows the users in this group to edit the company" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_EMAIL="Companies Edit Email" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_EMAIL_DESC="Allows the users in this group to update the edit email of the company" -COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_MODE="Companies Edit Mode" -COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_MODE_DESC="Allows the users in this group to update the edit mode of the company" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_OWN="Companies Edit Own" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own companies created by them" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_PER="Companies Edit Per" @@ -204,7 +202,6 @@ COM_COSTBENEFITPROJECTION_COMPANY_CAUSESRISKS="Causesrisks" COM_COSTBENEFITPROJECTION_COMPANY_CAUSESRISKS_LABEL="Causes/Risks" COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_DESCRIPTION="This feature is only available to the advanced department." COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_LABEL="Cause/Risk Selection" -COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT="Company account" COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY="Country" COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_DESCRIPTION="List of available countries" COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL="Country" @@ -248,9 +245,6 @@ COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES="Medical Turnovers Mal COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_DESCRIPTION="The total number of medical turnovers for males per/year." COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_HINT="per/year" COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_LABEL="Total Number Medical Turnovers Male" -COM_COSTBENEFITPROJECTION_COMPANY_MODE="Mode" -COM_COSTBENEFITPROJECTION_COMPANY_MODE_DESCRIPTION="Please tell us if this company is a real company or only for testing purposes." -COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL="Account type" COM_COSTBENEFITPROJECTION_COMPANY_NAME="Name" COM_COSTBENEFITPROJECTION_COMPANY_NAME_DESCRIPTION="Enter Company Name Here" COM_COSTBENEFITPROJECTION_COMPANY_NAME_HINT="Company Name Here" @@ -308,7 +302,6 @@ 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_TRAINING_ACCOUNT="Training account" 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." @@ -1425,6 +1418,9 @@ COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLIC_DETAILS_NOTE_DESCRIPTION="Your COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_PUBLISHING="Publishing" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Service Provider to customise the alias." COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_STATUS="Status" +COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_TESTCOMPANIES="Testcompanies" +COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_TESTCOMPANIES_DESCRIPTION="Select companies that are not real companies or only used for testing purposes." +COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_TESTCOMPANIES_LABEL="Set Testing Companies" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER="User" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER_HINT="select a service provider" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER_LABEL="User (Service Provider)" diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php index fdd7f423..2782ede8 100644 --- a/site/layouts/appnotice.php +++ b/site/layouts/appnotice.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage appnotice.php diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php index 9ebe7b3d..502c73b3 100644 --- a/site/layouts/company/age_groups_percentages_fullwidth.php +++ b/site/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php index c468b406..154fb3c6 100644 --- a/site/layouts/company/age_groups_percentages_left.php +++ b/site/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php index c12e1192..e028ecea 100644 --- a/site/layouts/company/age_groups_percentages_right.php +++ b/site/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php index 4b8881bb..a2ec7d2c 100644 --- a/site/layouts/company/causerisk_selection_fullwidth.php +++ b/site/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php index d8dd64d2..f9738199 100644 --- a/site/layouts/company/details_above.php +++ b/site/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php index ec4a7121..3c441c1a 100644 --- a/site/layouts/company/details_left.php +++ b/site/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -28,8 +28,7 @@ $fields = $displayData->get('fields') ?: array( 'email', 'country', 'service_provider', - 'datayear', - 'mode' + 'datayear' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php index c0e883f8..e1f80a39 100644 --- a/site/layouts/company/details_right.php +++ b/site/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php index d7d9676d..020e89d5 100644 --- a/site/layouts/company/details_under.php +++ b/site/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php index e42f89fe..33f8b9de 100644 --- a/site/layouts/company/interventions_fullwidth.php +++ b/site/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -36,7 +36,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention');

-
@@ -55,9 +55,6 @@ $can = CostbenefitprojectionHelper::getActions('company'); - - @@ -114,9 +111,6 @@ $can = CostbenefitprojectionHelper::getActions('company'); service_provider_user)->name; ?> - mode); ?> - per); ?>
+
- mode); ?> - per); ?>
pagination->getListFooter(); ?>pagination->getListFooter(); ?>
listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?>
+
diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php index 640492ad..ada9146d 100644 --- a/site/layouts/company/publishing.php +++ b/site/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php index c1fa4582..cea04218 100644 --- a/site/layouts/company/publlshing.php +++ b/site/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php index 12e7c48e..eb472284 100644 --- a/site/layouts/company/scaling_factors_fullwidth.php +++ b/site/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php @@ -30,7 +30,7 @@ $edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=sc ?>
- +
diff --git a/site/layouts/companydetails.php b/site/layouts/companydetails.php index e01e018a..cde05500 100644 --- a/site/layouts/companydetails.php +++ b/site/layouts/companydetails.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companydetails.php diff --git a/site/layouts/databreakdownmalefemale.php b/site/layouts/databreakdownmalefemale.php index 6b12c4fc..0df5de94 100644 --- a/site/layouts/databreakdownmalefemale.php +++ b/site/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php index 8e8bc46b..d41cb122 100644 --- a/site/layouts/intervention/details_above.php +++ b/site/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php index b5f37375..8b1ff395 100644 --- a/site/layouts/intervention/details_fullwidth.php +++ b/site/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php index d7d9676d..020e89d5 100644 --- a/site/layouts/intervention/details_under.php +++ b/site/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php index 640492ad..ada9146d 100644 --- a/site/layouts/intervention/publishing.php +++ b/site/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php index dba22232..43d5c367 100644 --- a/site/layouts/intervention/publlshing.php +++ b/site/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php index 2e0e66bb..9f01385f 100644 --- a/site/layouts/intervention/settings_fullwidth.php +++ b/site/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php index cb87771b..dcd22971 100644 --- a/site/layouts/intervention/settings_left.php +++ b/site/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php index 1203d284..d801e1af 100644 --- a/site/layouts/scaling_factor/details_above.php +++ b/site/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php index 4df20e97..61a5fb9d 100644 --- a/site/layouts/scaling_factor/details_left.php +++ b/site/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php index 6a4592d0..471da7db 100644 --- a/site/layouts/scaling_factor/details_right.php +++ b/site/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php index 640492ad..ada9146d 100644 --- a/site/layouts/scaling_factor/publishing.php +++ b/site/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php index dba22232..43d5c367 100644 --- a/site/layouts/scaling_factor/publlshing.php +++ b/site/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/models/ajax.php b/site/models/ajax.php index b149a0ed..b5344cd8 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/site/models/combinedresults.php b/site/models/combinedresults.php index 6e369b20..da848ce5 100644 --- a/site/models/combinedresults.php +++ b/site/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php @@ -67,7 +67,7 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Create a new query object. $query = $db->getQuery(true); - // Custom code for Filtering. + // Filtering. $ids = (array) array_map('intval',explode('_', $this->input->get('cid', null, 'CMD'))); if (!$this->user->authorise('core.options', 'com_costbenefitprojection') && CostbenefitprojectionHelper::checkArray($ids)) { @@ -162,6 +162,11 @@ 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_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, 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 @@ -172,16 +177,6 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Decode sick_leave_males $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\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))) - { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\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 @@ -192,21 +187,26 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Decode medical_turnovers_males $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_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))) - { - // Decode sick_leave_females - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\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 6e86bb96..d6b8baf8 100644 --- a/site/models/company.php +++ b/site/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -100,6 +100,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object. $advanced = new FOFEncryptAes($advancedkey, 256); + 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_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))) { // advanced decript data females. @@ -112,40 +118,34 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\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))) - { - // advanced decript data medical_turnovers_females. - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\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->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 medical_turnovers_males. $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_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))) - { - // advanced decript data sick_leave_females. - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); - } - if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) { // advanced decript data 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))) + { + // 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)) @@ -538,25 +538,6 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('service_provider', 'required', 'false'); } } - // Modify the form based on Edit Mode access controls. - if ($id != 0 && (!$user->authorise('company.edit.mode', 'com_costbenefitprojection.company.' . (int) $id)) - || ($id == 0 && !$user->authorise('company.edit.mode', 'com_costbenefitprojection'))) - { - // Disable fields for display. - $form->setFieldAttribute('mode', 'disabled', 'true'); - // Disable fields for display. - $form->setFieldAttribute('mode', 'readonly', 'true'); - // Disable radio button for display. - $class = $form->getFieldAttribute('mode', 'class', ''); - $form->setFieldAttribute('mode', 'class', $class.' disabled no-click'); - if (!$form->getValue('mode')) - { - // Disable fields while saving. - $form->setFieldAttribute('mode', 'filter', 'unset'); - // Disable fields while saving. - $form->setFieldAttribute('mode', 'required', 'false'); - } - } // Modify the form based on Edit Per access controls. if ($id != 0 && (!$user->authorise('company.edit.per', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection'))) @@ -1334,6 +1315,12 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object $advanced = new FOFEncryptAes($advancedkey, 256); + // Encript data medical_turnovers_females. + if (isset($data['medical_turnovers_females']) && $advancedkey) + { + $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); + } + // Encript data females. if (isset($data['females']) && $advancedkey) { @@ -1346,42 +1333,36 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']); } - // Encript data medical_turnovers_females. - if (isset($data['medical_turnovers_females']) && $advancedkey) - { - $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); - } - - // Encript data males. - if (isset($data['males']) && $advancedkey) - { - $data['males'] = $advanced->encryptString($data['males']); - } - // Encript data medical_turnovers_males. if (isset($data['medical_turnovers_males']) && $advancedkey) { $data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']); } - // 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_salary. if (isset($data['total_salary']) && $advancedkey) { $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 100009c7..785ac7d6 100644 --- a/site/models/companyresults.php +++ b/site/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php @@ -176,6 +176,11 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel'); return false; } + 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_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 @@ -186,16 +191,6 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem // Decode sick_leave_males $data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\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))) - { - // Decode medical_turnovers_females - $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\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 @@ -206,21 +201,26 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem // Decode medical_turnovers_males $data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_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))) - { - // Decode sick_leave_females - $data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\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 2d80a99d..af56030e 100644 --- a/site/models/cpanel.php +++ b/site/models/cpanel.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.php @@ -135,6 +135,11 @@ 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_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, 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 @@ -145,16 +150,6 @@ class CostbenefitprojectionModelCpanel extends JModelList // Decode sick_leave_males $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\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))) - { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\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 @@ -165,21 +160,26 @@ class CostbenefitprojectionModelCpanel extends JModelList // Decode medical_turnovers_males $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_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))) - { - // Decode sick_leave_females - $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\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 e691772d..196ddba7 100644 --- a/site/models/createaccount.php +++ b/site/models/createaccount.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.php diff --git a/site/models/forms/company.js b/site/models/forms/company.js index df0d29ee..84feff27 100644 --- a/site/models/forms/company.js +++ b/site/models/forms/company.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.9 - @build 18th March, 2016 + @version 3.3.10 + @build 22nd March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/site/models/forms/company.xml b/site/models/forms/company.xml index 4e8ed8cc..9f3f280a 100644 --- a/site/models/forms/company.xml +++ b/site/models/forms/company.xml @@ -159,21 +159,6 @@ required="true" button="true" /> - - - - - - COM_COSTBENEFITPROJECTION_COMPANY_LOCKED - - - - - - - - - + + + + + + + + + - + - + - + - - - - + + + +