From 68c2c767d0b029a30db9d72c3158bbe6e4255663 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Mon, 22 Feb 2016 14:36:00 +0200 Subject: [PATCH] Fixed issue that caused duplicate company creation, also made email field in company profile a required field. All other changes are only random variable name and date changes (due to automation) --- README.md | 8 +- admin/assets/css/admin.css | 2 +- admin/assets/css/causerisk.css | 2 +- admin/assets/css/causesrisks.css | 2 +- admin/assets/css/combinedresults.css | 2 +- admin/assets/css/companies.css | 2 +- admin/assets/css/company.css | 2 +- admin/assets/css/companyresults.css | 2 +- admin/assets/css/countries.css | 2 +- admin/assets/css/country.css | 2 +- admin/assets/css/currencies.css | 2 +- admin/assets/css/currency.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/health_data.css | 2 +- admin/assets/css/health_data_sets.css | 2 +- admin/assets/css/help_document.css | 2 +- admin/assets/css/help_documents.css | 2 +- admin/assets/css/intervention.css | 2 +- admin/assets/css/interventions.css | 2 +- admin/assets/css/scaling_factor.css | 2 +- admin/assets/css/scaling_factors.css | 2 +- admin/assets/css/service_provider.css | 2 +- admin/assets/css/service_providers.css | 2 +- admin/controller.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/causerisk.php | 2 +- admin/controllers/causesrisks.php | 2 +- admin/controllers/combinedresults.php | 2 +- admin/controllers/companies.php | 2 +- admin/controllers/company.php | 325 ++++++++++-------- admin/controllers/companyresults.php | 2 +- admin/controllers/costbenefitprojection.php | 2 +- admin/controllers/countries.php | 2 +- admin/controllers/country.php | 2 +- admin/controllers/currencies.php | 2 +- admin/controllers/currency.php | 2 +- admin/controllers/health_data.php | 2 +- admin/controllers/health_data_sets.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/help_document.php | 2 +- admin/controllers/help_documents.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/intervention.php | 2 +- admin/controllers/interventions.php | 2 +- admin/controllers/scaling_factor.php | 2 +- admin/controllers/scaling_factors.php | 2 +- admin/controllers/service_provider.php | 26 +- admin/controllers/service_providers.php | 2 +- admin/costbenefitprojection.php | 2 +- admin/helpers/costbenefitprojection.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/sum.php | 2 +- admin/helpers/sumcombine.php | 2 +- admin/layouts/batchselection.php | 2 +- admin/layouts/causerisk/details_above.php | 2 +- admin/layouts/causerisk/details_left.php | 2 +- admin/layouts/causerisk/publishing.php | 2 +- admin/layouts/causerisk/publlshing.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- admin/layouts/company/details_above.php | 2 +- admin/layouts/company/details_left.php | 2 +- admin/layouts/company/details_right.php | 2 +- admin/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 4 +- admin/layouts/company/publishing.php | 2 +- admin/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 4 +- .../country/age_groups_percentages_left.php | 2 +- .../country/age_groups_percentages_right.php | 2 +- .../country/causerisk_selection_fullwidth.php | 2 +- admin/layouts/country/companies_fullwidth.php | 4 +- admin/layouts/country/details_above.php | 2 +- admin/layouts/country/details_left.php | 2 +- admin/layouts/country/details_right.php | 2 +- .../country/health_data_totals_left.php | 2 +- .../country/health_data_totals_right.php | 2 +- .../country/interventions_fullwidth.php | 4 +- .../country/public_details_fullwidth.php | 2 +- admin/layouts/country/publishing.php | 2 +- admin/layouts/country/publlshing.php | 2 +- .../country/service_providers_fullwidth.php | 4 +- admin/layouts/currency/details_above.php | 2 +- admin/layouts/currency/details_left.php | 2 +- admin/layouts/currency/details_right.php | 2 +- admin/layouts/currency/publishing.php | 2 +- admin/layouts/currency/publlshing.php | 2 +- admin/layouts/databreakdownmalefemale.php | 2 +- admin/layouts/health_data/details_above.php | 2 +- admin/layouts/health_data/details_left.php | 2 +- admin/layouts/health_data/details_right.php | 2 +- .../layouts/health_data/details_rightside.php | 2 +- admin/layouts/health_data/publishing.php | 2 +- admin/layouts/health_data/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- admin/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- admin/layouts/intervention/details_under.php | 2 +- admin/layouts/intervention/publishing.php | 2 +- admin/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- admin/layouts/intervention/settings_left.php | 2 +- .../layouts/scaling_factor/details_above.php | 2 +- admin/layouts/scaling_factor/details_left.php | 2 +- .../layouts/scaling_factor/details_right.php | 2 +- admin/layouts/scaling_factor/publishing.php | 2 +- admin/layouts/scaling_factor/publlshing.php | 2 +- .../service_provider/companies_fullwidth.php | 4 +- .../service_provider/details_above.php | 2 +- .../service_provider/details_fullwidth.php | 2 +- admin/layouts/service_provider/publishing.php | 2 +- admin/layouts/service_provider/publlshing.php | 2 +- admin/models/ajax.php | 2 +- admin/models/causerisk.php | 2 +- admin/models/causesrisks.php | 2 +- admin/models/combinedresults.php | 2 +- admin/models/companies.php | 2 +- admin/models/company.php | 38 +- admin/models/companyresults.php | 2 +- admin/models/costbenefitprojection.php | 2 +- admin/models/countries.php | 2 +- admin/models/country.php | 60 ++-- admin/models/currencies.php | 2 +- admin/models/currency.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/causesrisks.php | 2 +- admin/models/fields/causesriskscheck.php | 2 +- admin/models/fields/company.php | 2 +- admin/models/fields/countries.php | 2 +- admin/models/fields/countryuser.php | 2 +- admin/models/fields/currency.php | 2 +- admin/models/fields/datayear.php | 2 +- admin/models/fields/interventions.php | 2 +- admin/models/fields/memberuser.php | 2 +- admin/models/fields/serviceprovider.php | 2 +- admin/models/fields/serviceprovideruser.php | 2 +- admin/models/forms/causerisk.js | 2 +- admin/models/forms/company.js | 92 ++--- admin/models/forms/country.js | 2 +- admin/models/forms/currency.js | 2 +- admin/models/forms/health_data.js | 2 +- admin/models/forms/help_document.js | 156 ++++----- admin/models/forms/intervention.js | 70 ++-- admin/models/forms/scaling_factor.js | 40 +-- admin/models/forms/service_provider.js | 2 +- admin/models/health_data.php | 2 +- admin/models/health_data_sets.php | 2 +- admin/models/help_document.php | 2 +- admin/models/help_documents.php | 2 +- admin/models/import.php | 2 +- admin/models/intervention.php | 2 +- admin/models/interventions.php | 2 +- admin/models/scaling_factor.php | 2 +- admin/models/scaling_factors.php | 2 +- admin/models/service_provider.php | 24 +- admin/models/service_providers.php | 2 +- admin/sql/updates/mysql/3.3.5.sql | 1 + admin/tables/causerisk.php | 2 +- admin/tables/company.php | 2 +- admin/tables/country.php | 2 +- admin/tables/currency.php | 2 +- admin/tables/health_data.php | 2 +- admin/tables/help_document.php | 2 +- admin/tables/intervention.php | 2 +- admin/tables/scaling_factor.php | 2 +- admin/tables/service_provider.php | 2 +- admin/vdm.php | 2 +- admin/views/causerisk/submitbutton.js | 2 +- admin/views/causerisk/tmpl/edit.php | 2 +- admin/views/causerisk/view.html.php | 2 +- admin/views/causesrisks/tmpl/default.php | 2 +- .../causesrisks/tmpl/default_batch_body.php | 2 +- .../causesrisks/tmpl/default_batch_footer.php | 2 +- admin/views/causesrisks/tmpl/default_body.php | 2 +- admin/views/causesrisks/tmpl/default_foot.php | 2 +- admin/views/causesrisks/tmpl/default_head.php | 2 +- .../causesrisks/tmpl/default_toolbar.php | 2 +- admin/views/causesrisks/view.html.php | 2 +- admin/views/combinedresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- .../combinedresults/tmpl/default_main.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- admin/views/combinedresults/view.html.php | 2 +- admin/views/companies/tmpl/default.php | 2 +- .../companies/tmpl/default_batch_body.php | 2 +- .../companies/tmpl/default_batch_footer.php | 2 +- admin/views/companies/tmpl/default_body.php | 2 +- admin/views/companies/tmpl/default_foot.php | 2 +- admin/views/companies/tmpl/default_head.php | 2 +- .../views/companies/tmpl/default_toolbar.php | 2 +- admin/views/companies/view.html.php | 2 +- admin/views/company/submitbutton.js | 2 +- admin/views/company/tmpl/edit.php | 22 +- admin/views/company/view.html.php | 6 +- admin/views/companyresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- .../companyresults/tmpl/default_main.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- .../companyresults/tmpl/default_variables.php | 2 +- admin/views/companyresults/view.html.php | 2 +- .../costbenefitprojection/tmpl/default.php | 2 +- .../tmpl/default_main.php | 2 +- .../tmpl/default_usage_statistics_table.php | 2 +- .../tmpl/default_vdm.php | 2 +- .../views/costbenefitprojection/view.html.php | 2 +- admin/views/countries/tmpl/default.php | 2 +- .../countries/tmpl/default_batch_body.php | 2 +- .../countries/tmpl/default_batch_footer.php | 2 +- admin/views/countries/tmpl/default_body.php | 2 +- admin/views/countries/tmpl/default_foot.php | 2 +- admin/views/countries/tmpl/default_head.php | 2 +- .../views/countries/tmpl/default_toolbar.php | 2 +- admin/views/countries/view.html.php | 2 +- admin/views/country/submitbutton.js | 2 +- admin/views/country/tmpl/edit.php | 2 +- admin/views/country/view.html.php | 8 +- admin/views/currencies/tmpl/default.php | 2 +- .../currencies/tmpl/default_batch_body.php | 2 +- .../currencies/tmpl/default_batch_footer.php | 2 +- admin/views/currencies/tmpl/default_body.php | 2 +- admin/views/currencies/tmpl/default_foot.php | 2 +- admin/views/currencies/tmpl/default_head.php | 2 +- .../views/currencies/tmpl/default_toolbar.php | 2 +- admin/views/currencies/view.html.php | 2 +- admin/views/currency/submitbutton.js | 2 +- admin/views/currency/tmpl/edit.php | 2 +- admin/views/currency/view.html.php | 2 +- admin/views/health_data/submitbutton.js | 2 +- admin/views/health_data/tmpl/edit.php | 2 +- admin/views/health_data/view.html.php | 2 +- admin/views/health_data_sets/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../health_data_sets/tmpl/default_body.php | 2 +- .../health_data_sets/tmpl/default_foot.php | 2 +- .../health_data_sets/tmpl/default_head.php | 2 +- .../health_data_sets/tmpl/default_toolbar.php | 2 +- admin/views/health_data_sets/view.html.php | 2 +- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 62 ++-- admin/views/help_document/view.html.php | 2 +- admin/views/help_documents/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../help_documents/tmpl/default_body.php | 2 +- .../help_documents/tmpl/default_foot.php | 2 +- .../help_documents/tmpl/default_head.php | 2 +- .../help_documents/tmpl/default_toolbar.php | 2 +- admin/views/help_documents/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/intervention/submitbutton.js | 2 +- admin/views/intervention/tmpl/edit.php | 32 +- admin/views/intervention/view.html.php | 2 +- admin/views/interventions/tmpl/default.php | 2 +- .../interventions/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/interventions/tmpl/default_body.php | 2 +- .../views/interventions/tmpl/default_foot.php | 2 +- .../views/interventions/tmpl/default_head.php | 2 +- .../interventions/tmpl/default_toolbar.php | 2 +- admin/views/interventions/view.html.php | 2 +- admin/views/scaling_factor/submitbutton.js | 2 +- admin/views/scaling_factor/tmpl/edit.php | 12 +- admin/views/scaling_factor/view.html.php | 2 +- admin/views/scaling_factors/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../scaling_factors/tmpl/default_body.php | 2 +- .../scaling_factors/tmpl/default_foot.php | 2 +- .../scaling_factors/tmpl/default_head.php | 2 +- .../scaling_factors/tmpl/default_toolbar.php | 2 +- admin/views/scaling_factors/view.html.php | 2 +- admin/views/service_provider/submitbutton.js | 2 +- admin/views/service_provider/tmpl/edit.php | 2 +- admin/views/service_provider/view.html.php | 4 +- .../views/service_providers/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../service_providers/tmpl/default_body.php | 2 +- .../service_providers/tmpl/default_foot.php | 2 +- .../service_providers/tmpl/default_head.php | 2 +- .../tmpl/default_toolbar.php | 2 +- admin/views/service_providers/view.html.php | 2 +- costbenefitprojection.xml | 4 +- script.php | 4 +- site/assets/css/combinedresults.css | 2 +- site/assets/css/company.css | 2 +- site/assets/css/companyresults.css | 2 +- site/assets/css/cpanel.css | 2 +- site/assets/css/createaccount.css | 2 +- site/assets/css/intervention.css | 2 +- site/assets/css/publicresults.css | 2 +- site/assets/css/scaling_factor.css | 2 +- site/assets/css/site.css | 2 +- site/controller.php | 2 +- site/controllers/ajax.json.php | 2 +- site/controllers/company.php | 325 ++++++++++-------- site/controllers/help.php | 2 +- site/controllers/intervention.php | 2 +- site/controllers/scaling_factor.php | 2 +- site/costbenefitprojection.php | 2 +- site/helpers/costbenefitprojection.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/layouts/appnotice.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- site/layouts/company/details_above.php | 2 +- site/layouts/company/details_left.php | 2 +- site/layouts/company/details_right.php | 2 +- site/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 4 +- site/layouts/company/publishing.php | 2 +- site/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 4 +- site/layouts/companydetails.php | 2 +- site/layouts/databreakdownmalefemale.php | 2 +- site/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- site/layouts/intervention/details_under.php | 2 +- site/layouts/intervention/publishing.php | 2 +- site/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- site/layouts/intervention/settings_left.php | 2 +- site/layouts/scaling_factor/details_above.php | 2 +- site/layouts/scaling_factor/details_left.php | 2 +- site/layouts/scaling_factor/details_right.php | 2 +- site/layouts/scaling_factor/publishing.php | 2 +- site/layouts/scaling_factor/publlshing.php | 2 +- site/models/ajax.php | 2 +- site/models/combinedresults.php | 2 +- site/models/company.php | 38 +- site/models/companyresults.php | 2 +- site/models/cpanel.php | 2 +- site/models/createaccount.php | 2 +- site/models/forms/company.js | 92 ++--- site/models/forms/intervention.js | 70 ++-- site/models/forms/scaling_factor.js | 40 +-- site/models/intervention.php | 2 +- site/models/publicresults.php | 2 +- site/models/scaling_factor.php | 2 +- site/router.php | 2 +- site/views/combinedresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- ...t_chart_intervention_cost_benefit_save.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- site/views/combinedresults/view.html.php | 2 +- site/views/company/submitbutton.js | 2 +- site/views/company/tmpl/edit.php | 22 +- site/views/company/view.html.php | 6 +- site/views/companyresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- ...t_chart_intervention_cost_benefit_save.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- site/views/companyresults/view.html.php | 2 +- site/views/cpanel/tmpl/default.php | 2 +- site/views/cpanel/view.html.php | 2 +- site/views/createaccount/tmpl/default.php | 2 +- .../tmpl/default_cbpmenumodule.php | 2 +- site/views/createaccount/view.html.php | 2 +- site/views/intervention/submitbutton.js | 2 +- site/views/intervention/tmpl/edit.php | 32 +- site/views/intervention/view.html.php | 2 +- site/views/publicresults/tmpl/default.php | 2 +- .../tmpl/default_cbpmenumodule.php | 2 +- .../tmpl/default_chart_cost_public.php | 2 +- ...chart_intervention_cost_benefit_public.php | 2 +- .../tmpl/default_contact_form_public.php | 2 +- site/views/publicresults/view.html.php | 2 +- site/views/scaling_factor/submitbutton.js | 2 +- site/views/scaling_factor/tmpl/edit.php | 12 +- site/views/scaling_factor/view.html.php | 2 +- 411 files changed, 1243 insertions(+), 1168 deletions(-) create mode 100644 admin/sql/updates/mysql/3.3.5.sql diff --git a/README.md b/README.md index d8d7c125..2c6fcdd1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cost Benefit Projection (3.3.5) +# Cost Benefit Projection (3.3.6) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -23,11 +23,11 @@ max_input_vars = 5000 + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 + *Last Build*: 22nd February, 2016 -+ *Version*: 3.3.5 ++ *Version*: 3.3.6 + *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*: **83618** -+ *File count*: **551** ++ *Line count*: **83710** ++ *File count*: **552** + *Folder count*: **101** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index c0bdd7a9..c908ce19 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css index be020544..4ad8e733 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css index 7f9633a6..fedd6e28 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css index 1ff03089..8dc6f94e 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css index 0bdae237..57a2535d 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css index 40fe9d81..c21d7894 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css index 6c1f2564..a7ab2d35 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 1546b941..a971c728 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index 03b6906f..7fcb6284 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index a92193fe..de2a5860 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index e48ef4b2..e63b7830 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index fa8974bb..d57c1771 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css index 61420d12..fa3b6ba7 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css index 6826862d..9ae05d0c 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 974d393d..b042249e 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 48417a31..7b5fffdb 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css index 5f18d25e..dd3764d6 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css index 40013db2..4129b4e3 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css index 797447c7..a2aabedf 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css index 1ac54457..7303ed32 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css index 266fc6c6..826ccdde 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css index 8f3cb471..68226f2f 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controller.php b/admin/controller.php index a83be5c6..68abe1e8 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 3d6572e1..792ac503 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index 1bdc72b3..3db52b4f 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index 908a6ddd..3a810ff2 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index 23b1060e..f329d06d 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index 445c9880..1588dac1 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/company.php b/admin/controllers/company.php index eeffca5b..a683d94e 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -332,12 +332,34 @@ class CostbenefitprojectionControllerCompany extends JControllerForm if ($validData['id'] >= 0) { // if id is 0 get id - if (0 == $validData['id']) + if (0 >= (int) $validData['id']) { - $validData['id'] = CostbenefitprojectionHelper::getVar('company', $validData['email'], 'email', 'id'); + // Get a db connection. + $db = JFactory::getDbo(); + // Create a new query object. + $query = $db->getQuery(true); + // Select id of this company + $query->select($db->quoteName(array('id'))); + $query->from($db->quoteName('#__costbenefitprojection_company')); + $query->where($db->quoteName('name') . ' = '. $db->quote($validData['name'])); + $query->where($db->quoteName('email') . ' = '. $db->quote($validData['email'])); + $query->where($db->quoteName('country') . ' = '. (int) $validData['country']); + $query->where($db->quoteName('service_provider') . ' = '. (int) $validData['service_provider']); + $query->where($db->quoteName('created_by') . ' = '. (int) $validData['created_by']); + $query->where($db->quoteName('created') . ' = '. $db->quote($validData['created'])); + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $validData['id'] = $db->loadResult(); + } + else + { + return; + } } // user setup if not set - if (0 >= (int) $validData['user']) + if (0 >= (int) $validData['user'] && (int) $validData['id'] > 0) { // get user object $user = JFactory::getUser(); @@ -367,172 +389,175 @@ class CostbenefitprojectionControllerCompany extends JControllerForm } } } - - // get params - $params = JComponentHelper::getParams('com_costbenefitprojection'); - // get all this users companies - $hisCompanies = CostbenefitprojectionHelper::hisCompanies($validData['user']); - if (CostbenefitprojectionHelper::checkArray($hisCompanies)) + // only continue if we have a company id + if ((int) $validData['id'] > 0) { - // set the user group based on the overall status of its companies - $departments = CostbenefitprojectionHelper::getVars('company', $hisCompanies, 'id', 'department'); - if (in_array(2, $departments)) + // get params + $params = JComponentHelper::getParams('com_costbenefitprojection'); + // get all this users companies + $hisCompanies = CostbenefitprojectionHelper::hisCompanies($validData['user']); + if (CostbenefitprojectionHelper::checkArray($hisCompanies)) { - $memberGroups = $params->get('advancedmembergroup'); - } - else - { - $memberGroups = $params->get('memberbasicgroup'); - } - } - else - { - // first company so act simply on this company department status - if (2 == $validData['department']) - { - $memberGroups = $params->get('advancedmembergroup'); - } - else - { - $memberGroups = $params->get('memberbasicgroup'); - } - } - // update the user groups - JUserHelper::setUserGroups((int)$validData['user'],(array)$memberGroups); - - // Get a db connection. - $db = JFactory::getDbo(); - // Create a new query object. - $query = $db->getQuery(true); - // Select all records in scaling factors the belong to this company - $query->select($db->quoteName(array('id','causerisk','published'))); - $query->from($db->quoteName('#__costbenefitprojection_scaling_factor')); - $query->where($db->quoteName('company') . ' = '. (int) $validData['id']); - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - // load the scaling factors already set - $already = $db->loadObjectList(); - $publish = array(); - $archive = array(); - $bucket = array(); - foreach ($already as $scale) - { - if (CostbenefitprojectionHelper::checkArray($validData['causesrisks'])) + // set the user group based on the overall status of its companies + $departments = CostbenefitprojectionHelper::getVars('company', $hisCompanies, 'id', 'department'); + if (in_array(2, $departments)) { - if (in_array($scale->causerisk, $validData['causesrisks']) && $scale->published != 1) + $memberGroups = $params->get('advancedmembergroup'); + } + else + { + $memberGroups = $params->get('memberbasicgroup'); + } + } + else + { + // first company so act simply on this company department status + if (2 == $validData['department']) + { + $memberGroups = $params->get('advancedmembergroup'); + } + else + { + $memberGroups = $params->get('memberbasicgroup'); + } + } + // update the user groups + JUserHelper::setUserGroups((int)$validData['user'],(array)$memberGroups); + + // Get a db connection. + $db = JFactory::getDbo(); + // Create a new query object. + $query = $db->getQuery(true); + // Select all records in scaling factors the belong to this company + $query->select($db->quoteName(array('id','causerisk','published'))); + $query->from($db->quoteName('#__costbenefitprojection_scaling_factor')); + $query->where($db->quoteName('company') . ' = '. (int) $validData['id']); + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + // load the scaling factors already set + $already = $db->loadObjectList(); + $publish = array(); + $archive = array(); + $bucket = array(); + foreach ($already as $scale) + { + if (CostbenefitprojectionHelper::checkArray($validData['causesrisks'])) { - // publish the scaling factor (update) - $publish[$scale->id] = $scale->id; + if (in_array($scale->causerisk, $validData['causesrisks']) && $scale->published != 1) + { + // publish the scaling factor (update) + $publish[$scale->id] = $scale->id; + } + elseif (!in_array($scale->causerisk, $validData['causesrisks'])) + { + // archive the scaling factor (update) + $archive[$scale->id] = $scale->id; + } + $bucket[] = $scale->causerisk; } - elseif (!in_array($scale->causerisk, $validData['causesrisks'])) + else { // archive the scaling factor (update) $archive[$scale->id] = $scale->id; } - $bucket[] = $scale->causerisk; + } + // update the needed records + $types = array('publish' => 1,'archive' => 2); + foreach ($types as $type => $int) + { + if (CostbenefitprojectionHelper::checkArray(${$type})) + { + foreach (${$type} as $id) + { + $query = $db->getQuery(true); + // Fields to update. + $fields = array( + $db->quoteName('published') . ' = ' . (int) $int + ); + // Conditions for which records should be updated. + $conditions = array( + $db->quoteName('id') . ' = ' . (int) $id + ); + + $query->update($db->quoteName('#__costbenefitprojection_scaling_factor'))->set($fields)->where($conditions); + $db->setQuery($query); + $db->execute(); + } + } + } + } + if (CostbenefitprojectionHelper::checkArray($validData['causesrisks'])) + { + // remove those already set from the saved list of causesrisks + if (CostbenefitprojectionHelper::checkArray($bucket)) + { + $insert = array(); + foreach ($validData['causesrisks'] as $causerisk) + { + if (!in_array($causerisk,$bucket)) + { + $insert[] = $causerisk; + } + } } else { - // archive the scaling factor (update) - $archive[$scale->id] = $scale->id; + $insert = $validData['causesrisks']; } } - // update the needed records - $types = array('publish' => 1,'archive' => 2); - foreach ($types as $type => $int) + // insert the new records + if (CostbenefitprojectionHelper::checkArray($insert)) { - if (CostbenefitprojectionHelper::checkArray(${$type})) + $created = $db->quote(JFactory::getDate()->toSql()); + $created_by = JFactory::getUser()->get('id'); + $company = $validData['id']; + + // Create a new query object. + $query = $db->getQuery(true); + // Insert columns. + $columns = array( + 'causerisk', 'company', 'mortality_scaling_factor_females', + 'mortality_scaling_factor_males', 'presenteeism_scaling_factor_females', + 'presenteeism_scaling_factor_males', 'yld_scaling_factor_females', + 'yld_scaling_factor_males', 'published', + 'created_by', 'created'); + // setup the values + $values = array(); + foreach ($insert as $new) { - foreach (${$type} as $id) + $array = array($new,$company,1,1,1,1,1,1,1,$created_by,$created); + $values[] = implode(',',$array); + } + // Prepare the insert query. + $query + ->insert($db->quoteName('#__costbenefitprojection_scaling_factor')) + ->columns($db->quoteName($columns)) + ->values(implode('), (', $values)); + + // Set the query using our newly populated query object and execute it. + $db->setQuery($query); + $done = $db->execute(); + if ($done) + { + // we must set the assets + foreach ($insert as $causerisk) { + // get all the ids. Create a new query object. $query = $db->getQuery(true); - // Fields to update. - $fields = array( - $db->quoteName('published') . ' = ' . (int) $int - ); - // Conditions for which records should be updated. - $conditions = array( - $db->quoteName('id') . ' = ' . (int) $id - ); - - $query->update($db->quoteName('#__costbenefitprojection_scaling_factor'))->set($fields)->where($conditions); + $query->select($db->quoteName(array('id'))); + $query->from($db->quoteName('#__costbenefitprojection_scaling_factor')); + $query->where($db->quoteName('causerisk') . ' = '. (int) $causerisk); + $query->where($db->quoteName('company') . ' = '. (int) $company); $db->setQuery($query); $db->execute(); - } - } - } - } - if (CostbenefitprojectionHelper::checkArray($validData['causesrisks'])) - { - // remove those already set from the saved list of causesrisks - if (CostbenefitprojectionHelper::checkArray($bucket)) - { - $insert = array(); - foreach ($validData['causesrisks'] as $causerisk) - { - if (!in_array($causerisk,$bucket)) - { - $insert[] = $causerisk; - } - } - } - else - { - $insert = $validData['causesrisks']; - } - } - // insert the new records - if (CostbenefitprojectionHelper::checkArray($insert)) - { - $created = $db->quote(JFactory::getDate()->toSql()); - $created_by = JFactory::getUser()->get('id'); - $company = $validData['id']; - - // Create a new query object. - $query = $db->getQuery(true); - // Insert columns. - $columns = array( - 'causerisk', 'company', 'mortality_scaling_factor_females', - 'mortality_scaling_factor_males', 'presenteeism_scaling_factor_females', - 'presenteeism_scaling_factor_males', 'yld_scaling_factor_females', - 'yld_scaling_factor_males', 'published', - 'created_by', 'created'); - // setup the values - $values = array(); - foreach ($insert as $new) - { - $array = array($new,$company,1,1,1,1,1,1,1,$created_by,$created); - $values[] = implode(',',$array); - } - // Prepare the insert query. - $query - ->insert($db->quoteName('#__costbenefitprojection_scaling_factor')) - ->columns($db->quoteName($columns)) - ->values(implode('), (', $values)); - - // Set the query using our newly populated query object and execute it. - $db->setQuery($query); - $done = $db->execute(); - if ($done) - { - // we must set the assets - foreach ($insert as $causerisk) - { - // get all the ids. Create a new query object. - $query = $db->getQuery(true); - $query->select($db->quoteName(array('id'))); - $query->from($db->quoteName('#__costbenefitprojection_scaling_factor')); - $query->where($db->quoteName('causerisk') . ' = '. (int) $causerisk); - $query->where($db->quoteName('company') . ' = '. (int) $company); - $db->setQuery($query); - $db->execute(); - if ($db->getNumRows()) - { - $aId = $db->loadResult(); - // make sure the access of asset is set - CostbenefitprojectionHelper::setAsset($aId,'scaling_factor'); + if ($db->getNumRows()) + { + $aId = $db->loadResult(); + // make sure the access of asset is set + CostbenefitprojectionHelper::setAsset($aId,'scaling_factor'); + } } } } diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index c6bab6ae..29d2033e 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index 2efa2344..733b0b03 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 0dd092c5..71f2a0da 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/country.php b/admin/controllers/country.php index 403d911f..ec56e829 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index eacf5bd9..a19ac7e5 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 474459f4..c99b9f89 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php index 879bb3c1..be6397e3 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php index b3bf8004..fb825dc6 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 69fb2300..aa9a261d 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 886c699a..9ee02f0b 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 25e6c741..cc723212 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 511b212f..862ad259 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index 7b6d2ab2..9cdbeacf 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index 141efb5f..54974af3 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php index de8c793c..37191927 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php index 4df97611..b8ae6e6c 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php index a2f2bb73..1711ff4f 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -324,6 +324,30 @@ class CostbenefitprojectionControllerService_provider extends JControllerForm { if ($validData['id'] >= 0) { + // if id is 0 get id + if (0 >= (int) $validData['id']) + { + // Get a db connection. + $db = JFactory::getDbo(); + // Create a new query object. + $query = $db->getQuery(true); + // Select id of this service_provider + $query->select($db->quoteName(array('id'))); + $query->from($db->quoteName('#__costbenefitprojection_service_provider')); + $query->where($db->quoteName('country') . ' = '. (int) $validData['country']); + $query->where($db->quoteName('created_by') . ' = '. (int) $validData['created_by']); + $query->where($db->quoteName('created') . ' = '. $db->quote($validData['created'])); + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $validData['id'] = $db->loadResult(); + } + else + { + return; + } + } // user setup if not set if (0 >= (int) $validData['user']) { diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php index c33b0d2b..6e240a5e 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index baf16885..6d299191 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index cf0b143e..bfb3b3c5 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 8cdbaee5..1efd99df 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index 18447b43..b54dcc56 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index f352d357..b35b1013 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index f3ceec03..8a162008 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php index defe8b1b..92f00023 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index f8041737..8e383736 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index a0c15717..c16026b2 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index c0981068..e9da2fc4 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index 53dd0ee4..95bc3e10 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index 6b940159..4dfcfa11 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index a94a6e7b..6b49a093 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index 0ce52f4e..d260afda 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index 9d820b57..79f309df 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index fea59968..e2ace3f8 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index 3922483b..5fe3e3e9 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index e2b2994f..661eb8e8 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->tbginterventions; +$items = $displayData->oabinterventions; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index a0c15717..c16026b2 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index 6259e16b..adfeaa36 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->eoascaling_factors; +$items = $displayData->tmyscaling_factors; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit"; diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index 53dd0ee4..95bc3e10 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index 6b940159..4dfcfa11 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index ed411d10..b0c2ef69 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index 2773e0fa..4f2869e5 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->oyfcompanies; +$items = $displayData->vmqcompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 2ef12dd3..c9258976 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index 669246fb..f8fae143 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index ea61d0b8..b8f15654 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index a6b24bbb..4d4bcfd2 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index 4b233a2c..53fb88c7 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index 6eb48d8e..a4f36d6e 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->geointerventions; +$items = $displayData->jirinterventions; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index 6da77db1..c77b161f 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index a0c15717..c16026b2 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index a0811c93..4ec171c1 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->kweservice_providers; +$items = $displayData->oehservice_providers; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit"; diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index a6e9ba98..b72372bf 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index f91de17f..a889952c 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index 17fd1d80..2792d574 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index a0c15717..c16026b2 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index 326d127c..c4467436 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index 62f06e39..aca02aae 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index 0045e58d..f67210ec 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index 6bb04601..6691f710 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index 52014048..095e7fe4 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index a0c15717..c16026b2 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 30389f1e..4e36e38a 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index 8ed18748..6460640b 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 0444bacb..0abba652 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 5d0c0318..c18dc166 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 3922483b..5fe3e3e9 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 5e120941..26ef9005 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index 52cf66bf..442a8aeb 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index 41f67764..66394799 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index 3922483b..5fe3e3e9 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index 5e120941..26ef9005 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index cb09c2ab..94db1233 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index 9beae593..07203c1b 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index 436c8759..78d48500 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index 396ac190..810987b1 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index bf9a33bd..aaed406a 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index 5e120941..26ef9005 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index b86a58c4..0956f6fd 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->siecompanies; +$items = $displayData->dpvcompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index a4f3a0d2..f03b116c 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php index 5393125b..15d200a5 100644 --- a/admin/layouts/service_provider/details_fullwidth.php +++ b/admin/layouts/service_provider/details_fullwidth.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index f0256ea3..d824bff6 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index 5e120941..26ef9005 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 886fc18c..992774c9 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index 2828c312..3a3f82e5 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 22d77f18..5c64893a 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index 19fceb4d..1a03862f 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/companies.php b/admin/models/companies.php index cf7d56d5..447b8eae 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/company.php b/admin/models/company.php index f127153d..0849531e 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.company'); } } - $this->companyuqpn = $item->id; - $this->companymzoc = $item->id; + $this->companyuvgj = $item->id; + $this->companygdxw = $item->id; return $item; } @@ -165,7 +165,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getEoascaling_factors() + public function getTmyscaling_factors() { // Get the user object. $user = JFactory::getUser(); @@ -204,15 +204,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $query->select($db->quoteName('h.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')'); - // Filter by companyuqpn global. - $companyuqpn = $this->companyuqpn; - if (is_numeric($companyuqpn )) + // Filter by companyuvgj global. + $companyuvgj = $this->companyuvgj; + if (is_numeric($companyuvgj )) { - $query->where('a.company = ' . (int) $companyuqpn ); + $query->where('a.company = ' . (int) $companyuvgj ); } - elseif (is_string($companyuqpn)) + elseif (is_string($companyuvgj)) { - $query->where('a.company = ' . $db->quote($companyuqpn)); + $query->where('a.company = ' . $db->quote($companyuvgj)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getTbginterventions() + public function getOabinterventions() { // Get the user object. $user = JFactory::getUser(); @@ -290,15 +290,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $query->select($db->quoteName('g.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by companymzoc global. - $companymzoc = $this->companymzoc; - if (is_numeric($companymzoc )) + // Filter by companygdxw global. + $companygdxw = $this->companygdxw; + if (is_numeric($companygdxw )) { - $query->where('a.company = ' . (int) $companymzoc ); + $query->where('a.company = ' . (int) $companygdxw ); } - elseif (is_string($companymzoc)) + elseif (is_string($companygdxw)) { - $query->where('a.company = ' . $db->quote($companymzoc)); + $query->where('a.company = ' . $db->quote($companygdxw)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationTbginterventions($item->type, 'type'); + $item->type = $this->selectionTranslationOabinterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - public function selectionTranslationTbginterventions($value,$name) + public function selectionTranslationOabinterventions($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index 905449cd..dbb7ebb6 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index 004dd496..e598d155 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/countries.php b/admin/models/countries.php index bc984cc6..9b842751 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/country.php b/admin/models/country.php index dcd9a932..ce0cd395 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -101,9 +101,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.country'); } } - $this->countrygfhe = $item->id; - $this->countryjrkv = $item->id; - $this->countryetft = $item->id; + $this->countrylzhm = $item->id; + $this->countrypxhh = $item->id; + $this->countrygisc = $item->id; return $item; } @@ -113,7 +113,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getGeointerventions() + public function getJirinterventions() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('g.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')'); - // Filter by countrygfhe global. - $countrygfhe = $this->countrygfhe; - if (is_numeric($countrygfhe )) + // Filter by countrylzhm global. + $countrylzhm = $this->countrylzhm; + if (is_numeric($countrylzhm )) { - $query->where('a.country = ' . (int) $countrygfhe ); + $query->where('a.country = ' . (int) $countrylzhm ); } - elseif (is_string($countrygfhe)) + elseif (is_string($countrylzhm)) { - $query->where('a.country = ' . $db->quote($countrygfhe)); + $query->where('a.country = ' . $db->quote($countrylzhm)); } else { @@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationGeointerventions($item->type, 'type'); + $item->type = $this->selectionTranslationJirinterventions($item->type, 'type'); } } @@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationGeointerventions($value,$name) + public function selectionTranslationJirinterventions($value,$name) { // Array of type language strings if ($name == 'type') @@ -246,7 +246,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getKweservice_providers() + public function getOehservice_providers() { // Get the user object. $user = JFactory::getUser(); @@ -285,15 +285,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('h.name','country_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')'); - // Filter by countryjrkv global. - $countryjrkv = $this->countryjrkv; - if (is_numeric($countryjrkv )) + // Filter by countrypxhh global. + $countrypxhh = $this->countrypxhh; + if (is_numeric($countrypxhh )) { - $query->where('a.country = ' . (int) $countryjrkv ); + $query->where('a.country = ' . (int) $countrypxhh ); } - elseif (is_string($countryjrkv)) + elseif (is_string($countrypxhh)) { - $query->where('a.country = ' . $db->quote($countryjrkv)); + $query->where('a.country = ' . $db->quote($countrypxhh)); } else { @@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getOyfcompanies() + public function getVmqcompanies() { // Get the user object. $user = JFactory::getUser(); @@ -379,15 +379,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('i.user','service_provider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.service_provider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by countryetft global. - $countryetft = $this->countryetft; - if (is_numeric($countryetft )) + // Filter by countrygisc global. + $countrygisc = $this->countrygisc; + if (is_numeric($countrygisc )) { - $query->where('a.country = ' . (int) $countryetft ); + $query->where('a.country = ' . (int) $countrygisc ); } - elseif (is_string($countryetft)) + elseif (is_string($countrygisc)) { - $query->where('a.country = ' . $db->quote($countryetft)); + $query->where('a.country = ' . $db->quote($countrygisc)); } else { @@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationOyfcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationVmqcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationOyfcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationVmqcompanies($item->per, 'per'); } } @@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationOyfcompanies($value,$name) + public function selectionTranslationVmqcompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 32941219..0c22f525 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/currency.php b/admin/models/currency.php index 18c20e3f..325a0278 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 95d2d748..60dda005 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php index 3d896e22..5d514833 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php index 85a2646f..60902dfe 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php index 8d4d9d0e..3a5c00fb 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index fdc0502f..29c2bca3 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php index dea4db98..df244b76 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index aa2c3c3d..2ed79130 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php index 1bae1215..e9b462d3 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php index f2d3760d..244db4b9 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index d330a9c4..5369bb09 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php index 351dceb5..57d1dedd 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index cc9368d8..81fc3d8b 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index 71e3c5cd..dec8d4f4 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js index 6641636f..0e1ac5fd 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_nkZhFFcqqG_required = false; -jform_nkZhFFcYzd_required = false; -jform_nkZhFFclVH_required = false; -jform_nkZhFFcJSK_required = false; -jform_nkZhFFcbCZ_required = false; -jform_nkZhFFcjBH_required = false; -jform_nkZhFFcrhM_required = false; +jform_GbcdqOGthK_required = false; +jform_GbcdqOGhqS_required = false; +jform_GbcdqOGhtp_required = false; +jform_GbcdqOGBWR_required = false; +jform_GbcdqOGLKL_required = false; +jform_GbcdqOGUuq_required = false; +jform_GbcdqOGhSY_required = false; // Initial Script jQuery(document).ready(function() { - var department_nkZhFFc = jQuery("#jform_department input[type='radio']:checked").val(); - nkZhFFc(department_nkZhFFc); + var department_GbcdqOG = jQuery("#jform_department input[type='radio']:checked").val(); + GbcdqOG(department_GbcdqOG); - var department_vVHReGY = jQuery("#jform_department input[type='radio']:checked").val(); - vVHReGY(department_vVHReGY); + var department_kIvNEDP = jQuery("#jform_department input[type='radio']:checked").val(); + kIvNEDP(department_kIvNEDP); }); -// the nkZhFFc function -function nkZhFFc(department_nkZhFFc) +// the GbcdqOG function +function GbcdqOG(department_GbcdqOG) { // set the function logic - if (department_nkZhFFc == 2) + if (department_GbcdqOG == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_nkZhFFcqqG_required) + if (jform_GbcdqOGthK_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_nkZhFFcqqG_required = false; + jform_GbcdqOGthK_required = false; } jQuery('#jform_percentfemale').closest('.control-group').show(); jQuery('#jform_percentmale').closest('.control-group').show(); jQuery('#jform_productivity_losses').closest('.control-group').show(); - if (jform_nkZhFFcYzd_required) + if (jform_GbcdqOGhqS_required) { updateFieldRequired('productivity_losses',0); jQuery('#jform_productivity_losses').prop('required','required'); jQuery('#jform_productivity_losses').attr('aria-required',true); jQuery('#jform_productivity_losses').addClass('required'); - jform_nkZhFFcYzd_required = false; + jform_GbcdqOGhqS_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_nkZhFFclVH_required) + if (jform_GbcdqOGhtp_required) { updateFieldRequired('medical_turnovers_females',0); jQuery('#jform_medical_turnovers_females').prop('required','required'); jQuery('#jform_medical_turnovers_females').attr('aria-required',true); jQuery('#jform_medical_turnovers_females').addClass('required'); - jform_nkZhFFclVH_required = false; + jform_GbcdqOGhtp_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_nkZhFFcJSK_required) + if (jform_GbcdqOGBWR_required) { updateFieldRequired('medical_turnovers_males',0); jQuery('#jform_medical_turnovers_males').prop('required','required'); jQuery('#jform_medical_turnovers_males').attr('aria-required',true); jQuery('#jform_medical_turnovers_males').addClass('required'); - jform_nkZhFFcJSK_required = false; + jform_GbcdqOGBWR_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_nkZhFFcbCZ_required) + if (jform_GbcdqOGLKL_required) { updateFieldRequired('sick_leave_females',0); jQuery('#jform_sick_leave_females').prop('required','required'); jQuery('#jform_sick_leave_females').attr('aria-required',true); jQuery('#jform_sick_leave_females').addClass('required'); - jform_nkZhFFcbCZ_required = false; + jform_GbcdqOGLKL_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_nkZhFFcjBH_required) + if (jform_GbcdqOGUuq_required) { updateFieldRequired('sick_leave_males',0); jQuery('#jform_sick_leave_males').prop('required','required'); jQuery('#jform_sick_leave_males').attr('aria-required',true); jQuery('#jform_sick_leave_males').addClass('required'); - jform_nkZhFFcjBH_required = false; + jform_GbcdqOGUuq_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_nkZhFFcrhM_required) + if (jform_GbcdqOGhSY_required) { updateFieldRequired('total_healthcare',0); jQuery('#jform_total_healthcare').prop('required','required'); jQuery('#jform_total_healthcare').attr('aria-required',true); jQuery('#jform_total_healthcare').addClass('required'); - jform_nkZhFFcrhM_required = false; + jform_GbcdqOGhSY_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_nkZhFFcqqG_required) + if (!jform_GbcdqOGthK_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_nkZhFFcqqG_required = true; + jform_GbcdqOGthK_required = true; } jQuery('#jform_percentfemale').closest('.control-group').hide(); jQuery('#jform_percentmale').closest('.control-group').hide(); jQuery('#jform_productivity_losses').closest('.control-group').hide(); - if (!jform_nkZhFFcYzd_required) + if (!jform_GbcdqOGhqS_required) { updateFieldRequired('productivity_losses',1); jQuery('#jform_productivity_losses').removeAttr('required'); jQuery('#jform_productivity_losses').removeAttr('aria-required'); jQuery('#jform_productivity_losses').removeClass('required'); - jform_nkZhFFcYzd_required = true; + jform_GbcdqOGhqS_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_nkZhFFclVH_required) + if (!jform_GbcdqOGhtp_required) { updateFieldRequired('medical_turnovers_females',1); jQuery('#jform_medical_turnovers_females').removeAttr('required'); jQuery('#jform_medical_turnovers_females').removeAttr('aria-required'); jQuery('#jform_medical_turnovers_females').removeClass('required'); - jform_nkZhFFclVH_required = true; + jform_GbcdqOGhtp_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_nkZhFFcJSK_required) + if (!jform_GbcdqOGBWR_required) { updateFieldRequired('medical_turnovers_males',1); jQuery('#jform_medical_turnovers_males').removeAttr('required'); jQuery('#jform_medical_turnovers_males').removeAttr('aria-required'); jQuery('#jform_medical_turnovers_males').removeClass('required'); - jform_nkZhFFcJSK_required = true; + jform_GbcdqOGBWR_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_nkZhFFcbCZ_required) + if (!jform_GbcdqOGLKL_required) { updateFieldRequired('sick_leave_females',1); jQuery('#jform_sick_leave_females').removeAttr('required'); jQuery('#jform_sick_leave_females').removeAttr('aria-required'); jQuery('#jform_sick_leave_females').removeClass('required'); - jform_nkZhFFcbCZ_required = true; + jform_GbcdqOGLKL_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_nkZhFFcjBH_required) + if (!jform_GbcdqOGUuq_required) { updateFieldRequired('sick_leave_males',1); jQuery('#jform_sick_leave_males').removeAttr('required'); jQuery('#jform_sick_leave_males').removeAttr('aria-required'); jQuery('#jform_sick_leave_males').removeClass('required'); - jform_nkZhFFcjBH_required = true; + jform_GbcdqOGUuq_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_nkZhFFcrhM_required) + if (!jform_GbcdqOGhSY_required) { updateFieldRequired('total_healthcare',1); jQuery('#jform_total_healthcare').removeAttr('required'); jQuery('#jform_total_healthcare').removeAttr('aria-required'); jQuery('#jform_total_healthcare').removeClass('required'); - jform_nkZhFFcrhM_required = true; + jform_GbcdqOGhSY_required = true; } } } -// the vVHReGY function -function vVHReGY(department_vVHReGY) +// the kIvNEDP function +function kIvNEDP(department_kIvNEDP) { // set the function logic - if (department_vVHReGY == 1) + if (department_kIvNEDP == 1) { jQuery('.age_groups_note').closest('.control-group').show(); jQuery('.cause_risk_selection_note').closest('.control-group').show(); diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js index 5856168d..94c4e7fb 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js index b1c73001..b2e16b1a 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/forms/health_data.js b/admin/models/forms/health_data.js index 2c3603cc..1175cbe1 100644 --- a/admin/models/forms/health_data.js +++ b/admin/models/forms/health_data.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index b32242bd..18b56e18 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_qDDgGiNYyX_required = false; -jform_wVtDCYhiQV_required = false; -jform_xYrjdyEars_required = false; -jform_FEQkJCtDBS_required = false; +jform_nwQaKJScpA_required = false; +jform_rViFrVkZqx_required = false; +jform_BUFBIxSSWh_required = false; +jform_bgwRgitajP_required = false; // Initial Script jQuery(document).ready(function() { - var location_yTJjiqR = jQuery("#jform_location input[type='radio']:checked").val(); - yTJjiqR(location_yTJjiqR); + var location_BphvImg = jQuery("#jform_location input[type='radio']:checked").val(); + BphvImg(location_BphvImg); - var location_dlBWMKL = jQuery("#jform_location input[type='radio']:checked").val(); - dlBWMKL(location_dlBWMKL); + var location_JMkoFuj = jQuery("#jform_location input[type='radio']:checked").val(); + JMkoFuj(location_JMkoFuj); - var type_qDDgGiN = jQuery("#jform_type").val(); - qDDgGiN(type_qDDgGiN); + var type_nwQaKJS = jQuery("#jform_type").val(); + nwQaKJS(type_nwQaKJS); - var type_wVtDCYh = jQuery("#jform_type").val(); - wVtDCYh(type_wVtDCYh); + var type_rViFrVk = jQuery("#jform_type").val(); + rViFrVk(type_rViFrVk); - var type_xYrjdyE = jQuery("#jform_type").val(); - xYrjdyE(type_xYrjdyE); + var type_BUFBIxS = jQuery("#jform_type").val(); + BUFBIxS(type_BUFBIxS); - var target_FEQkJCt = jQuery("#jform_target input[type='radio']:checked").val(); - FEQkJCt(target_FEQkJCt); + var target_bgwRgit = jQuery("#jform_target input[type='radio']:checked").val(); + bgwRgit(target_bgwRgit); }); -// the yTJjiqR function -function yTJjiqR(location_yTJjiqR) +// the BphvImg function +function BphvImg(location_BphvImg) { // set the function logic - if (location_yTJjiqR == 1) + if (location_BphvImg == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function yTJjiqR(location_yTJjiqR) } } -// the dlBWMKL function -function dlBWMKL(location_dlBWMKL) +// the JMkoFuj function +function JMkoFuj(location_JMkoFuj) { // set the function logic - if (location_dlBWMKL == 2) + if (location_JMkoFuj == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function dlBWMKL(location_dlBWMKL) } } -// the qDDgGiN function -function qDDgGiN(type_qDDgGiN) +// the nwQaKJS function +function nwQaKJS(type_nwQaKJS) { - if (isSet(type_qDDgGiN) && type_qDDgGiN.constructor !== Array) + if (isSet(type_nwQaKJS) && type_nwQaKJS.constructor !== Array) { - var temp_qDDgGiN = type_qDDgGiN; - var type_qDDgGiN = []; - type_qDDgGiN.push(temp_qDDgGiN); + var temp_nwQaKJS = type_nwQaKJS; + var type_nwQaKJS = []; + type_nwQaKJS.push(temp_nwQaKJS); } - else if (!isSet(type_qDDgGiN)) + else if (!isSet(type_nwQaKJS)) { - var type_qDDgGiN = []; + var type_nwQaKJS = []; } - var type = type_qDDgGiN.some(type_qDDgGiN_SomeFunc); + var type = type_nwQaKJS.some(type_nwQaKJS_SomeFunc); // set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_qDDgGiNYyX_required) + if (jform_nwQaKJScpA_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_qDDgGiNYyX_required = false; + jform_nwQaKJScpA_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_qDDgGiNYyX_required) + if (!jform_nwQaKJScpA_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_qDDgGiNYyX_required = true; + jform_nwQaKJScpA_required = true; } } } -// the qDDgGiN Some function -function type_qDDgGiN_SomeFunc(type_qDDgGiN) +// the nwQaKJS Some function +function type_nwQaKJS_SomeFunc(type_nwQaKJS) { // set the function logic - if (type_qDDgGiN == 3) + if (type_nwQaKJS == 3) { return true; } return false; } -// the wVtDCYh function -function wVtDCYh(type_wVtDCYh) +// the rViFrVk function +function rViFrVk(type_rViFrVk) { - if (isSet(type_wVtDCYh) && type_wVtDCYh.constructor !== Array) + if (isSet(type_rViFrVk) && type_rViFrVk.constructor !== Array) { - var temp_wVtDCYh = type_wVtDCYh; - var type_wVtDCYh = []; - type_wVtDCYh.push(temp_wVtDCYh); + var temp_rViFrVk = type_rViFrVk; + var type_rViFrVk = []; + type_rViFrVk.push(temp_rViFrVk); } - else if (!isSet(type_wVtDCYh)) + else if (!isSet(type_rViFrVk)) { - var type_wVtDCYh = []; + var type_rViFrVk = []; } - var type = type_wVtDCYh.some(type_wVtDCYh_SomeFunc); + var type = type_rViFrVk.some(type_rViFrVk_SomeFunc); // set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_wVtDCYhiQV_required) + if (jform_rViFrVkZqx_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_wVtDCYhiQV_required = false; + jform_rViFrVkZqx_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_wVtDCYhiQV_required) + if (!jform_rViFrVkZqx_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_wVtDCYhiQV_required = true; + jform_rViFrVkZqx_required = true; } } } -// the wVtDCYh Some function -function type_wVtDCYh_SomeFunc(type_wVtDCYh) +// the rViFrVk Some function +function type_rViFrVk_SomeFunc(type_rViFrVk) { // set the function logic - if (type_wVtDCYh == 1) + if (type_rViFrVk == 1) { return true; } return false; } -// the xYrjdyE function -function xYrjdyE(type_xYrjdyE) +// the BUFBIxS function +function BUFBIxS(type_BUFBIxS) { - if (isSet(type_xYrjdyE) && type_xYrjdyE.constructor !== Array) + if (isSet(type_BUFBIxS) && type_BUFBIxS.constructor !== Array) { - var temp_xYrjdyE = type_xYrjdyE; - var type_xYrjdyE = []; - type_xYrjdyE.push(temp_xYrjdyE); + var temp_BUFBIxS = type_BUFBIxS; + var type_BUFBIxS = []; + type_BUFBIxS.push(temp_BUFBIxS); } - else if (!isSet(type_xYrjdyE)) + else if (!isSet(type_BUFBIxS)) { - var type_xYrjdyE = []; + var type_BUFBIxS = []; } - var type = type_xYrjdyE.some(type_xYrjdyE_SomeFunc); + var type = type_BUFBIxS.some(type_BUFBIxS_SomeFunc); // set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_xYrjdyEars_required) + if (jform_BUFBIxSSWh_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_xYrjdyEars_required = false; + jform_BUFBIxSSWh_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_xYrjdyEars_required) + if (!jform_BUFBIxSSWh_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_xYrjdyEars_required = true; + jform_BUFBIxSSWh_required = true; } } } -// the xYrjdyE Some function -function type_xYrjdyE_SomeFunc(type_xYrjdyE) +// the BUFBIxS Some function +function type_BUFBIxS_SomeFunc(type_BUFBIxS) { // set the function logic - if (type_xYrjdyE == 2) + if (type_BUFBIxS == 2) { return true; } return false; } -// the FEQkJCt function -function FEQkJCt(target_FEQkJCt) +// the bgwRgit function +function bgwRgit(target_bgwRgit) { // set the function logic - if (target_FEQkJCt == 1) + if (target_bgwRgit == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_FEQkJCtDBS_required) + if (jform_bgwRgitajP_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_FEQkJCtDBS_required = false; + jform_bgwRgitajP_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_FEQkJCtDBS_required) + if (!jform_bgwRgitajP_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_FEQkJCtDBS_required = true; + jform_bgwRgitajP_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index 6e0a43e7..18105729 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -17,58 +17,58 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_mECXSCSvnM_required = false; -jform_ssnxqqjMKL_required = false; +jform_lhGgsfCReY_required = false; +jform_zNGkyNrDJy_required = false; // Initial Script jQuery(document).ready(function() { - var type_mECXSCS = jQuery("#jform_type input[type='radio']:checked").val(); - mECXSCS(type_mECXSCS); + var type_lhGgsfC = jQuery("#jform_type input[type='radio']:checked").val(); + lhGgsfC(type_lhGgsfC); - var type_KRRMiCK = jQuery("#jform_type input[type='radio']:checked").val(); - KRRMiCK(type_KRRMiCK); + var type_FaBOsPR = jQuery("#jform_type input[type='radio']:checked").val(); + FaBOsPR(type_FaBOsPR); - var company_ssnxqqj = jQuery("#jform_company").val(); - ssnxqqj(company_ssnxqqj); + var company_zNGkyNr = jQuery("#jform_company").val(); + zNGkyNr(company_zNGkyNr); }); -// the mECXSCS function -function mECXSCS(type_mECXSCS) +// the lhGgsfC function +function lhGgsfC(type_lhGgsfC) { // set the function logic - if (type_mECXSCS == 2) + if (type_lhGgsfC == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_mECXSCSvnM_required) + if (jform_lhGgsfCReY_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_mECXSCSvnM_required = false; + jform_lhGgsfCReY_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_mECXSCSvnM_required) + if (!jform_lhGgsfCReY_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_mECXSCSvnM_required = true; + jform_lhGgsfCReY_required = true; } } } -// the KRRMiCK function -function KRRMiCK(type_KRRMiCK) +// the FaBOsPR function +function FaBOsPR(type_FaBOsPR) { // set the function logic - if (type_KRRMiCK == 1) + if (type_FaBOsPR == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } @@ -78,55 +78,55 @@ function KRRMiCK(type_KRRMiCK) } } -// the ssnxqqj function -function ssnxqqj(company_ssnxqqj) +// the zNGkyNr function +function zNGkyNr(company_zNGkyNr) { - if (isSet(company_ssnxqqj) && company_ssnxqqj.constructor !== Array) + if (isSet(company_zNGkyNr) && company_zNGkyNr.constructor !== Array) { - var temp_ssnxqqj = company_ssnxqqj; - var company_ssnxqqj = []; - company_ssnxqqj.push(temp_ssnxqqj); + var temp_zNGkyNr = company_zNGkyNr; + var company_zNGkyNr = []; + company_zNGkyNr.push(temp_zNGkyNr); } - else if (!isSet(company_ssnxqqj)) + else if (!isSet(company_zNGkyNr)) { - var company_ssnxqqj = []; + var company_zNGkyNr = []; } - var company = company_ssnxqqj.some(company_ssnxqqj_SomeFunc); + var company = company_zNGkyNr.some(company_zNGkyNr_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_ssnxqqjMKL_required) + if (jform_zNGkyNrDJy_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_ssnxqqjMKL_required = false; + jform_zNGkyNrDJy_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_ssnxqqjMKL_required) + if (!jform_zNGkyNrDJy_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_ssnxqqjMKL_required = true; + jform_zNGkyNrDJy_required = true; } } } -// the ssnxqqj Some function -function company_ssnxqqj_SomeFunc(company_ssnxqqj) +// the zNGkyNr Some function +function company_zNGkyNr_SomeFunc(company_zNGkyNr) { // set the function logic - if (company_ssnxqqj == 0) + if (company_zNGkyNr == 0) { return true; } diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index 47290509..607663c1 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -17,64 +17,64 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_XhNomDSndE_required = false; +jform_RjkWaieBCR_required = false; // Initial Script jQuery(document).ready(function() { - var company_XhNomDS = jQuery("#jform_company").val(); - XhNomDS(company_XhNomDS); + var company_RjkWaie = jQuery("#jform_company").val(); + RjkWaie(company_RjkWaie); }); -// the XhNomDS function -function XhNomDS(company_XhNomDS) +// the RjkWaie function +function RjkWaie(company_RjkWaie) { - if (isSet(company_XhNomDS) && company_XhNomDS.constructor !== Array) + if (isSet(company_RjkWaie) && company_RjkWaie.constructor !== Array) { - var temp_XhNomDS = company_XhNomDS; - var company_XhNomDS = []; - company_XhNomDS.push(temp_XhNomDS); + var temp_RjkWaie = company_RjkWaie; + var company_RjkWaie = []; + company_RjkWaie.push(temp_RjkWaie); } - else if (!isSet(company_XhNomDS)) + else if (!isSet(company_RjkWaie)) { - var company_XhNomDS = []; + var company_RjkWaie = []; } - var company = company_XhNomDS.some(company_XhNomDS_SomeFunc); + var company = company_RjkWaie.some(company_RjkWaie_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_XhNomDSndE_required) + if (jform_RjkWaieBCR_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_XhNomDSndE_required = false; + jform_RjkWaieBCR_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_XhNomDSndE_required) + if (!jform_RjkWaieBCR_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_XhNomDSndE_required = true; + jform_RjkWaieBCR_required = true; } } } -// the XhNomDS Some function -function company_XhNomDS_SomeFunc(company_XhNomDS) +// the RjkWaie Some function +function company_RjkWaie_SomeFunc(company_RjkWaie) { // set the function logic - if (company_XhNomDS == 0) + if (company_RjkWaie == 0) { return true; } diff --git a/admin/models/forms/service_provider.js b/admin/models/forms/service_provider.js index 69030ef9..af238e75 100644 --- a/admin/models/forms/service_provider.js +++ b/admin/models/forms/service_provider.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/health_data.php b/admin/models/health_data.php index 5974a822..2b6b7b6a 100644 --- a/admin/models/health_data.php +++ b/admin/models/health_data.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index bfb26d5a..cfb24876 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/help_document.php b/admin/models/help_document.php index a71632dc..b58cad92 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 902568f2..3e37a760 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/import.php b/admin/models/import.php index 1c0cabdd..57f8d879 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/intervention.php b/admin/models/intervention.php index bcce7cf8..3fa0262e 100644 --- a/admin/models/intervention.php +++ b/admin/models/intervention.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/interventions.php b/admin/models/interventions.php index ff114e2f..56d345a9 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php index 9c81cd34..443386d6 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index aa87ef3a..6f49a5ac 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index c56b7e27..0b4b4f0d 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -95,7 +95,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.service_provider'); } } - $this->service_providerahqy = $item->id; + $this->service_providereone = $item->id; return $item; } @@ -105,7 +105,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getSiecompanies() + public function getDpvcompanies() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $query->select($db->quoteName('i.user','service_provider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.service_provider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by service_providerahqy global. - $service_providerahqy = $this->service_providerahqy; - if (is_numeric($service_providerahqy )) + // Filter by service_providereone global. + $service_providereone = $this->service_providereone; + if (is_numeric($service_providereone )) { - $query->where('a.service_provider = ' . (int) $service_providerahqy ); + $query->where('a.service_provider = ' . (int) $service_providereone ); } - elseif (is_string($service_providerahqy)) + elseif (is_string($service_providereone)) { - $query->where('a.service_provider = ' . $db->quote($service_providerahqy)); + $query->where('a.service_provider = ' . $db->quote($service_providereone)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationSiecompanies($item->department, 'department'); + $item->department = $this->selectionTranslationDpvcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationSiecompanies($item->per, 'per'); + $item->per = $this->selectionTranslationDpvcompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - public function selectionTranslationSiecompanies($value,$name) + public function selectionTranslationDpvcompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index 129fbdca..29f427bc 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/sql/updates/mysql/3.3.5.sql b/admin/sql/updates/mysql/3.3.5.sql new file mode 100644 index 00000000..d3f5a12f --- /dev/null +++ b/admin/sql/updates/mysql/3.3.5.sql @@ -0,0 +1 @@ + diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index 62abdb0a..fe7854d6 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/tables/company.php b/admin/tables/company.php index 065c54f1..bf1c54ed 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/tables/country.php b/admin/tables/country.php index 5a9cafd6..f9894b0f 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/tables/currency.php b/admin/tables/currency.php index 16c4ae42..aa1e4bdf 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php index f8892aee..61f1d310 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index de608729..6407a775 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php index c646624d..7dfcf5a5 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php index dd4a9ecc..cb38676d 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php index 34b00867..2bc5f50c 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/vdm.php b/admin/vdm.php index 248863c1..d67b99f3 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js index 6e556eda..a7015c4e 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php index 3bbafc9a..0fd9a9a0 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php index d780b5ab..17bf3994 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php index 7c4aac12..f93396a1 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php index e61abb00..1c0f8e1e 100644 --- a/admin/views/causesrisks/tmpl/default_batch_body.php +++ b/admin/views/causesrisks/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php index 747d4228..d9b466f0 100644 --- a/admin/views/causesrisks/tmpl/default_batch_footer.php +++ b/admin/views/causesrisks/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php index 7f2020a5..6a7ffd08 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php index 607d97eb..d45c5d50 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php index b094a0ee..d11cddd2 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php index 7303381e..3b81258e 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php index 65b41d29..d0b3075a 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php index f2da3245..15399824 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php index a23f8dea..afd4a0ed 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php index 43072bd4..6322bf71 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection 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 ad706896..cfc2c9a3 100644 --- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection 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 43cf3e9e..9b753b55 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection 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 66778543..22d72eee 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,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php index 88247fe1..b52010d2 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection 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 e01324a8..242f4536 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,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php index e0da28ff..a775e138 100644 --- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection 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 eccb49b9..aa7c5ca2 100644 --- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection 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 10a4f9cc..56c6eb8b 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,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php index af92059c..7203832b 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php index b69ef851..1cb69f32 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php index e38aa524..51b39a28 100644 --- a/admin/views/companies/tmpl/default_batch_body.php +++ b/admin/views/companies/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php index 5463c5a1..ff16a79d 100644 --- a/admin/views/companies/tmpl/default_batch_footer.php +++ b/admin/views/companies/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php index 9ce83c1e..3caf03dd 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php index 98cf08c9..46dc49a6 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php index a377c2b3..52c1ab65 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php index 2aacc014..4cee8e55 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php index e5b9cf28..9c7f6604 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js index b7b2c3b7..a9e7f8fe 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -2,7 +2,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index 45fd99e4..0f475369 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -3,7 +3,7 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.5 + @version 3.3.6 @build 22nd February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @@ -141,33 +141,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');