From e10b35feed6409399fdbc293b84afd3ea02cf77b Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 11 Mar 2016 15:57:01 +0200 Subject: [PATCH] Added the company mode switch to set if a company is real or only for testing purposes. --- README.md | 10 +- admin/access.xml | 2 + admin/assets/css/admin.css | 4 +- admin/assets/css/causerisk.css | 4 +- admin/assets/css/causesrisks.css | 4 +- admin/assets/css/combinedresults.css | 4 +- admin/assets/css/companies.css | 4 +- admin/assets/css/company.css | 4 +- admin/assets/css/companyresults.css | 4 +- admin/assets/css/countries.css | 4 +- admin/assets/css/country.css | 4 +- admin/assets/css/currencies.css | 4 +- admin/assets/css/currency.css | 4 +- admin/assets/css/dashboard.css | 4 +- admin/assets/css/health_data.css | 4 +- admin/assets/css/health_data_sets.css | 4 +- admin/assets/css/help_document.css | 4 +- admin/assets/css/help_documents.css | 4 +- admin/assets/css/intervention.css | 4 +- admin/assets/css/interventions.css | 4 +- admin/assets/css/scaling_factor.css | 4 +- admin/assets/css/scaling_factors.css | 4 +- admin/assets/css/service_provider.css | 4 +- admin/assets/css/service_providers.css | 4 +- admin/controller.php | 4 +- admin/controllers/ajax.json.php | 4 +- admin/controllers/causerisk.php | 4 +- admin/controllers/causesrisks.php | 4 +- admin/controllers/combinedresults.php | 4 +- admin/controllers/companies.php | 4 +- admin/controllers/company.php | 4 +- admin/controllers/companyresults.php | 4 +- admin/controllers/costbenefitprojection.php | 4 +- admin/controllers/countries.php | 4 +- admin/controllers/country.php | 4 +- admin/controllers/currencies.php | 4 +- admin/controllers/currency.php | 4 +- admin/controllers/health_data.php | 4 +- admin/controllers/health_data_sets.php | 4 +- admin/controllers/help.php | 4 +- admin/controllers/help_document.php | 4 +- admin/controllers/help_documents.php | 4 +- admin/controllers/import.php | 4 +- admin/controllers/intervention.php | 4 +- admin/controllers/interventions.php | 4 +- admin/controllers/scaling_factor.php | 4 +- admin/controllers/scaling_factors.php | 4 +- admin/controllers/service_provider.php | 4 +- admin/controllers/service_providers.php | 4 +- admin/costbenefitprojection.php | 4 +- admin/helpers/costbenefitprojection.php | 4 +- admin/helpers/html/batch_.php | 4 +- admin/helpers/sum.php | 4 +- admin/helpers/sumcombine.php | 4 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 7 + admin/layouts/batchselection.php | 4 +- admin/layouts/causerisk/details_above.php | 4 +- admin/layouts/causerisk/details_left.php | 4 +- admin/layouts/causerisk/publishing.php | 4 +- admin/layouts/causerisk/publlshing.php | 4 +- .../age_groups_percentages_fullwidth.php | 4 +- .../company/age_groups_percentages_left.php | 4 +- .../company/age_groups_percentages_right.php | 4 +- .../company/causerisk_selection_fullwidth.php | 4 +- admin/layouts/company/details_above.php | 4 +- admin/layouts/company/details_left.php | 7 +- admin/layouts/company/details_right.php | 4 +- admin/layouts/company/details_under.php | 4 +- .../company/interventions_fullwidth.php | 4 +- admin/layouts/company/publishing.php | 4 +- admin/layouts/company/publlshing.php | 4 +- .../company/scaling_factors_fullwidth.php | 4 +- .../country/age_groups_percentages_left.php | 4 +- .../country/age_groups_percentages_right.php | 4 +- .../country/causerisk_selection_fullwidth.php | 4 +- admin/layouts/country/companies_fullwidth.php | 12 +- admin/layouts/country/details_above.php | 4 +- admin/layouts/country/details_left.php | 4 +- admin/layouts/country/details_right.php | 4 +- .../country/health_data_totals_left.php | 4 +- .../country/health_data_totals_right.php | 4 +- .../country/interventions_fullwidth.php | 4 +- .../country/public_details_fullwidth.php | 4 +- admin/layouts/country/publishing.php | 4 +- admin/layouts/country/publlshing.php | 4 +- .../country/service_providers_fullwidth.php | 4 +- admin/layouts/currency/details_above.php | 4 +- admin/layouts/currency/details_left.php | 4 +- admin/layouts/currency/details_right.php | 4 +- admin/layouts/currency/publishing.php | 4 +- admin/layouts/currency/publlshing.php | 4 +- admin/layouts/databreakdownmalefemale.php | 4 +- admin/layouts/health_data/details_above.php | 4 +- admin/layouts/health_data/details_left.php | 4 +- admin/layouts/health_data/details_right.php | 4 +- .../layouts/health_data/details_rightside.php | 4 +- admin/layouts/health_data/publishing.php | 4 +- admin/layouts/health_data/publlshing.php | 4 +- admin/layouts/help_document/details_above.php | 4 +- .../help_document/details_fullwidth.php | 4 +- admin/layouts/help_document/details_left.php | 4 +- admin/layouts/help_document/details_right.php | 4 +- admin/layouts/help_document/details_under.php | 4 +- admin/layouts/help_document/publishing.php | 4 +- admin/layouts/help_document/publlshing.php | 4 +- admin/layouts/intervention/details_above.php | 4 +- .../intervention/details_fullwidth.php | 4 +- admin/layouts/intervention/details_under.php | 4 +- admin/layouts/intervention/publishing.php | 4 +- admin/layouts/intervention/publlshing.php | 4 +- .../intervention/settings_fullwidth.php | 4 +- admin/layouts/intervention/settings_left.php | 4 +- .../layouts/scaling_factor/details_above.php | 4 +- admin/layouts/scaling_factor/details_left.php | 4 +- .../layouts/scaling_factor/details_right.php | 4 +- admin/layouts/scaling_factor/publishing.php | 4 +- admin/layouts/scaling_factor/publlshing.php | 4 +- .../service_provider/companies_fullwidth.php | 12 +- .../service_provider/details_above.php | 4 +- .../service_provider/details_fullwidth.php | 4 +- admin/layouts/service_provider/publishing.php | 4 +- admin/layouts/service_provider/publlshing.php | 4 +- admin/models/ajax.php | 4 +- admin/models/causerisk.php | 4 +- admin/models/causesrisks.php | 4 +- admin/models/combinedresults.php | 34 +-- admin/models/companies.php | 59 +++-- admin/models/company.php | 95 ++++---- admin/models/companyresults.php | 34 +-- admin/models/costbenefitprojection.php | 7 +- admin/models/countries.php | 4 +- admin/models/country.php | 19 +- admin/models/currencies.php | 4 +- admin/models/currency.php | 4 +- admin/models/fields/articles.php | 4 +- admin/models/fields/causesrisks.php | 4 +- admin/models/fields/causesriskscheck.php | 4 +- admin/models/fields/company.php | 4 +- admin/models/fields/countries.php | 4 +- admin/models/fields/countryuser.php | 4 +- admin/models/fields/currency.php | 4 +- admin/models/fields/datayear.php | 4 +- admin/models/fields/interventions.php | 4 +- admin/models/fields/memberuser.php | 4 +- admin/models/fields/serviceprovider.php | 4 +- admin/models/fields/serviceprovideruser.php | 4 +- admin/models/forms/causerisk.js | 4 +- admin/models/forms/company.js | 4 +- admin/models/forms/company.xml | 209 ++++++++++-------- admin/models/forms/country.js | 4 +- admin/models/forms/currency.js | 4 +- admin/models/forms/health_data.js | 4 +- admin/models/forms/help_document.js | 4 +- admin/models/forms/intervention.js | 4 +- admin/models/forms/scaling_factor.js | 4 +- admin/models/forms/service_provider.js | 4 +- admin/models/health_data.php | 4 +- admin/models/health_data_sets.php | 4 +- admin/models/help_document.php | 4 +- admin/models/help_documents.php | 4 +- admin/models/import.php | 4 +- admin/models/intervention.php | 4 +- admin/models/interventions.php | 4 +- admin/models/scaling_factor.php | 4 +- admin/models/scaling_factors.php | 4 +- admin/models/service_provider.php | 19 +- admin/models/service_providers.php | 4 +- admin/sql/install.mysql.utf8.sql | 2 + admin/sql/updates/mysql/3.3.8.sql | 2 + admin/tables/causerisk.php | 4 +- admin/tables/company.php | 4 +- admin/tables/country.php | 4 +- admin/tables/currency.php | 4 +- admin/tables/health_data.php | 4 +- admin/tables/help_document.php | 4 +- admin/tables/intervention.php | 4 +- admin/tables/scaling_factor.php | 4 +- admin/tables/service_provider.php | 4 +- admin/vdm.php | 4 +- admin/views/causerisk/submitbutton.js | 4 +- admin/views/causerisk/tmpl/edit.php | 4 +- admin/views/causerisk/view.html.php | 4 +- admin/views/causesrisks/tmpl/default.php | 4 +- .../causesrisks/tmpl/default_batch_body.php | 4 +- .../causesrisks/tmpl/default_batch_footer.php | 4 +- admin/views/causesrisks/tmpl/default_body.php | 4 +- admin/views/causesrisks/tmpl/default_foot.php | 4 +- admin/views/causesrisks/tmpl/default_head.php | 4 +- .../causesrisks/tmpl/default_toolbar.php | 4 +- admin/views/causesrisks/view.html.php | 4 +- admin/views/combinedresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- .../combinedresults/tmpl/default_main.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- admin/views/combinedresults/view.html.php | 4 +- admin/views/companies/tmpl/default.php | 4 +- .../companies/tmpl/default_batch_body.php | 4 +- .../companies/tmpl/default_batch_footer.php | 4 +- admin/views/companies/tmpl/default_body.php | 7 +- admin/views/companies/tmpl/default_foot.php | 6 +- admin/views/companies/tmpl/default_head.php | 7 +- .../views/companies/tmpl/default_toolbar.php | 4 +- admin/views/companies/view.html.php | 63 +++++- admin/views/company/submitbutton.js | 4 +- admin/views/company/tmpl/edit.php | 4 +- admin/views/company/view.html.php | 4 +- admin/views/companyresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- .../companyresults/tmpl/default_main.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- .../companyresults/tmpl/default_variables.php | 4 +- admin/views/companyresults/view.html.php | 4 +- .../costbenefitprojection/tmpl/default.php | 4 +- .../tmpl/default_main.php | 4 +- .../tmpl/default_usage_statistics_table.php | 4 +- .../tmpl/default_vdm.php | 4 +- .../views/costbenefitprojection/view.html.php | 4 +- admin/views/countries/tmpl/default.php | 4 +- .../countries/tmpl/default_batch_body.php | 4 +- .../countries/tmpl/default_batch_footer.php | 4 +- admin/views/countries/tmpl/default_body.php | 4 +- admin/views/countries/tmpl/default_foot.php | 4 +- admin/views/countries/tmpl/default_head.php | 4 +- .../views/countries/tmpl/default_toolbar.php | 4 +- admin/views/countries/view.html.php | 4 +- admin/views/country/submitbutton.js | 4 +- admin/views/country/tmpl/edit.php | 4 +- admin/views/country/view.html.php | 4 +- admin/views/currencies/tmpl/default.php | 4 +- .../currencies/tmpl/default_batch_body.php | 4 +- .../currencies/tmpl/default_batch_footer.php | 4 +- admin/views/currencies/tmpl/default_body.php | 4 +- admin/views/currencies/tmpl/default_foot.php | 4 +- admin/views/currencies/tmpl/default_head.php | 4 +- .../views/currencies/tmpl/default_toolbar.php | 4 +- admin/views/currencies/view.html.php | 4 +- admin/views/currency/submitbutton.js | 4 +- admin/views/currency/tmpl/edit.php | 4 +- admin/views/currency/view.html.php | 4 +- admin/views/health_data/submitbutton.js | 4 +- admin/views/health_data/tmpl/edit.php | 4 +- admin/views/health_data/view.html.php | 4 +- admin/views/health_data_sets/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../health_data_sets/tmpl/default_body.php | 4 +- .../health_data_sets/tmpl/default_foot.php | 4 +- .../health_data_sets/tmpl/default_head.php | 4 +- .../health_data_sets/tmpl/default_toolbar.php | 4 +- admin/views/health_data_sets/view.html.php | 4 +- admin/views/help_document/submitbutton.js | 4 +- admin/views/help_document/tmpl/edit.php | 4 +- admin/views/help_document/view.html.php | 4 +- admin/views/help_documents/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../help_documents/tmpl/default_body.php | 4 +- .../help_documents/tmpl/default_foot.php | 4 +- .../help_documents/tmpl/default_head.php | 4 +- .../help_documents/tmpl/default_toolbar.php | 4 +- admin/views/help_documents/view.html.php | 4 +- admin/views/import/tmpl/default.php | 4 +- admin/views/import/view.html.php | 4 +- admin/views/intervention/submitbutton.js | 4 +- admin/views/intervention/tmpl/edit.php | 4 +- admin/views/intervention/view.html.php | 4 +- admin/views/interventions/tmpl/default.php | 4 +- .../interventions/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/interventions/tmpl/default_body.php | 4 +- .../views/interventions/tmpl/default_foot.php | 4 +- .../views/interventions/tmpl/default_head.php | 4 +- .../interventions/tmpl/default_toolbar.php | 4 +- admin/views/interventions/view.html.php | 4 +- admin/views/scaling_factor/submitbutton.js | 4 +- admin/views/scaling_factor/tmpl/edit.php | 4 +- admin/views/scaling_factor/view.html.php | 4 +- admin/views/scaling_factors/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../scaling_factors/tmpl/default_body.php | 4 +- .../scaling_factors/tmpl/default_foot.php | 4 +- .../scaling_factors/tmpl/default_head.php | 4 +- .../scaling_factors/tmpl/default_toolbar.php | 4 +- admin/views/scaling_factors/view.html.php | 4 +- admin/views/service_provider/submitbutton.js | 4 +- admin/views/service_provider/tmpl/edit.php | 4 +- admin/views/service_provider/view.html.php | 4 +- .../views/service_providers/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../service_providers/tmpl/default_body.php | 4 +- .../service_providers/tmpl/default_foot.php | 4 +- .../service_providers/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/service_providers/view.html.php | 4 +- costbenefitprojection.xml | 6 +- script.php | 14 +- site/assets/css/combinedresults.css | 4 +- site/assets/css/company.css | 4 +- site/assets/css/companyresults.css | 4 +- site/assets/css/cpanel.css | 4 +- site/assets/css/createaccount.css | 4 +- site/assets/css/intervention.css | 4 +- site/assets/css/publicresults.css | 4 +- site/assets/css/scaling_factor.css | 4 +- site/assets/css/site.css | 4 +- site/controller.php | 4 +- site/controllers/ajax.json.php | 4 +- site/controllers/company.php | 4 +- site/controllers/help.php | 4 +- site/controllers/intervention.php | 4 +- site/controllers/scaling_factor.php | 4 +- site/costbenefitprojection.php | 4 +- site/helpers/costbenefitprojection.php | 4 +- site/helpers/headercheck.php | 4 +- site/helpers/route.php | 4 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 7 + site/layouts/appnotice.php | 4 +- .../age_groups_percentages_fullwidth.php | 4 +- .../company/age_groups_percentages_left.php | 4 +- .../company/age_groups_percentages_right.php | 4 +- .../company/causerisk_selection_fullwidth.php | 4 +- site/layouts/company/details_above.php | 4 +- site/layouts/company/details_left.php | 7 +- site/layouts/company/details_right.php | 4 +- site/layouts/company/details_under.php | 4 +- .../company/interventions_fullwidth.php | 4 +- site/layouts/company/publishing.php | 4 +- site/layouts/company/publlshing.php | 4 +- .../company/scaling_factors_fullwidth.php | 4 +- site/layouts/companydetails.php | 4 +- site/layouts/databreakdownmalefemale.php | 4 +- site/layouts/intervention/details_above.php | 4 +- .../intervention/details_fullwidth.php | 4 +- site/layouts/intervention/details_under.php | 4 +- site/layouts/intervention/publishing.php | 4 +- site/layouts/intervention/publlshing.php | 4 +- .../intervention/settings_fullwidth.php | 4 +- site/layouts/intervention/settings_left.php | 4 +- site/layouts/scaling_factor/details_above.php | 4 +- site/layouts/scaling_factor/details_left.php | 4 +- site/layouts/scaling_factor/details_right.php | 4 +- site/layouts/scaling_factor/publishing.php | 4 +- site/layouts/scaling_factor/publlshing.php | 4 +- site/models/ajax.php | 4 +- site/models/combinedresults.php | 34 +-- site/models/company.php | 95 ++++---- site/models/companyresults.php | 34 +-- site/models/cpanel.php | 34 +-- site/models/createaccount.php | 4 +- site/models/forms/company.js | 4 +- site/models/forms/company.xml | 209 ++++++++++-------- site/models/forms/intervention.js | 4 +- site/models/forms/scaling_factor.js | 4 +- site/models/intervention.php | 4 +- site/models/publicresults.php | 4 +- site/models/scaling_factor.php | 4 +- site/router.php | 4 +- site/views/combinedresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- ...t_chart_intervention_cost_benefit_save.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- site/views/combinedresults/view.html.php | 4 +- site/views/company/submitbutton.js | 4 +- site/views/company/tmpl/edit.php | 4 +- site/views/company/view.html.php | 4 +- site/views/companyresults/tmpl/default.php | 4 +- .../tmpl/default_chart_cost.php | 4 +- .../tmpl/default_chart_cost_percent.php | 4 +- ...efault_chart_intervention_cost_benefit.php | 4 +- ...t_chart_intervention_cost_benefit_save.php | 4 +- .../tmpl/default_chart_work_days_lost.php | 4 +- .../default_chart_work_days_lost_percent.php | 4 +- ...efault_table_calculated_cost_in_detail.php | 4 +- .../tmpl/default_table_cost_summary.php | 4 +- ...default_table_intervention_net_benefit.php | 4 +- .../default_table_work_days_lost_summary.php | 4 +- site/views/companyresults/view.html.php | 4 +- site/views/cpanel/tmpl/default.php | 4 +- site/views/cpanel/view.html.php | 4 +- site/views/createaccount/tmpl/default.php | 4 +- .../tmpl/default_cbpmenumodule.php | 4 +- site/views/createaccount/view.html.php | 4 +- site/views/intervention/submitbutton.js | 4 +- site/views/intervention/tmpl/edit.php | 4 +- site/views/intervention/view.html.php | 4 +- site/views/publicresults/tmpl/default.php | 4 +- .../tmpl/default_cbpmenumodule.php | 4 +- .../tmpl/default_chart_cost_public.php | 4 +- ...chart_intervention_cost_benefit_public.php | 4 +- .../tmpl/default_contact_form_public.php | 4 +- site/views/publicresults/view.html.php | 4 +- site/views/scaling_factor/submitbutton.js | 4 +- site/views/scaling_factor/tmpl/edit.php | 4 +- site/views/scaling_factor/view.html.php | 4 +- 417 files changed, 1415 insertions(+), 1190 deletions(-) create mode 100644 admin/sql/updates/mysql/3.3.8.sql diff --git a/README.md b/README.md index 512509e7..d1c325e4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cost Benefit Projection (3.3.8) +# Cost Benefit Projection (3.3.9) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -22,12 +22,12 @@ max_input_vars = 5000 + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io) + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 -+ *Last Build*: 10th March, 2016 -+ *Version*: 3.3.8 ++ *Last Build*: 11th March, 2016 ++ *Version*: 3.3.9 + *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*: **83686** -+ *File count*: **554** ++ *Line count*: **83928** ++ *File count*: **555** + *Folder count*: **101** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). diff --git a/admin/access.xml b/admin/access.xml index 0756458a..4c39ad58 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -45,6 +45,7 @@ + @@ -172,6 +173,7 @@ + diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 714fd98f..c7956073 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.css diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css index 24193890..6ef09653 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.css diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css index 1161d068..363ecd50 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.css diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css index 1b12bfa9..ba9c37c7 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css index 64b2fb21..b0f91db0 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.css diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css index 66eef523..ef276221 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css index 2b199b12..d82a4bfe 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index d58abd21..3a4d98d1 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.css diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index 44f84ab4..56d8319c 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.css diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index fe1d74ca..e2bfaf59 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.css diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 6d766091..00d10ac5 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 43735930..9fe796a6 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage dashboard.css diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css index b628a6fd..83c0bb4c 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.css diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css index 86d7d8df..6dea9c18 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 62998c3c..4c09bc41 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 17ceee25..30d2a45f 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.css diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css index 87ee4016..55e5ff73 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css index ba111c4f..b7cd8595 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.css diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css index 8b18e57a..aaea500f 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css index 98d2260f..5e0aee12 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.css diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css index bb4481bd..a18bb82b 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.css diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css index 62e8adc3..c0f6007e 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/controller.php b/admin/controller.php index 6ea6d2b5..f2b13d7e 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index cbfd378f..06ddc517 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index 39f00cfe..6d25d3af 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index dfab046a..721dd6e2 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index 4755fbb1..da30f466 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index 267054e6..335999d3 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/controllers/company.php b/admin/controllers/company.php index 2e6c30de..8b4d2a97 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index 9c38c2d5..3697a1b1 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index d15ac6dc..1b0c995f 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index d932d83d..306e671d 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/controllers/country.php b/admin/controllers/country.php index b07899cb..14c8a1da 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index 8c50c1f6..aa7fbe7d 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 10f51dc8..45dedec2 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php index e7ff5c07..ae00d719 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php index 76bad833..5feb9f28 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 781831a4..e74da25a 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 3e4aff59..aaa89e03 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 9ea7745a..020da753 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index b59e17a8..70be5bfc 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index 6ac62c3a..bbd08dda 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index d28f50ad..89a472f6 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php index 633d101c..8c6893ce 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php index beb972d4..35dd68d9 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php index c6f833cc..dc704180 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php index 8093ad00..2a214e7e 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index 3ba2fbe9..590a73b0 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index 081700bf..744b3530 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index b4012900..2f15cb0f 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batch_.php diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index 5d8f67ef..0375e1cb 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sum.php diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index f0b7af86..0e1a9e94 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sumcombine.php diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini index 5c988fc1..fb004d97 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -131,6 +131,8 @@ COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_DEPARTMENT_DESC="Allows the users in th COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_DESC="Allows the users in this group to edit the company" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_EMAIL="Companies Edit Email" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_EMAIL_DESC="Allows the users in this group to update the edit email of the company" +COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_MODE="Companies Edit Mode" +COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_MODE_DESC="Allows the users in this group to update the edit mode of the company" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_OWN="Companies Edit Own" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own companies created by them" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_PER="Companies Edit Per" @@ -227,6 +229,9 @@ COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES="Medical Turnovers Mal COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_DESCRIPTION="The total number of medical turnovers for males per/year." COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_HINT="per/year" COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_LABEL="Total Number Medical Turnovers Male" +COM_COSTBENEFITPROJECTION_COMPANY_MODE="Mode" +COM_COSTBENEFITPROJECTION_COMPANY_MODE_DESCRIPTION="Please tell us if this company is a real company or only for testing purposes." +COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL="Mode" COM_COSTBENEFITPROJECTION_COMPANY_NAME="Name" COM_COSTBENEFITPROJECTION_COMPANY_NAME_DESCRIPTION="Enter Company Name Here" COM_COSTBENEFITPROJECTION_COMPANY_NAME_HINT="Company Name Here" @@ -252,6 +257,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_DESCRIPTION="The interim n COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_HINT="Between 0 and 1" COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_LABEL="Medical Turnover Cost Factor" COM_COSTBENEFITPROJECTION_COMPANY_PUBLISHING="Publishing" +COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY="Real company" COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS="Company Results Access" COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_DESC=" Allows the users in this group to access company results." COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE="Company results (Site) Access" @@ -274,6 +280,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_HINT="per/year" COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_LABEL="Total Number Sick Leave Days Males" COM_COSTBENEFITPROJECTION_COMPANY_SIXTYSIXTY_FOUR="60-64" COM_COSTBENEFITPROJECTION_COMPANY_STATUS="Status" +COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY="Testing company" COM_COSTBENEFITPROJECTION_COMPANY_THIRTYTHIRTY_FOUR="30-34" COM_COSTBENEFITPROJECTION_COMPANY_THIRTY_FIVETHIRTY_NINE="35-39" COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_HEALTHCARE="Total Healthcare" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index ba363f67..ddade215 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batchselection.php diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php index b1e50792..22190b4e 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index 43323f44..f305ff77 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index b88f1570..76e05f97 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index 6cc1994f..78098778 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index 39e9ec1a..37857f8a 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index 865e70fc..833c067c 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index 62e767d0..ebfccdb0 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index d54d5aba..31be6e8d 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index 109ccf1c..7ec439d4 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -28,7 +28,8 @@ $fields = $displayData->get('fields') ?: array( 'email', 'country', 'service_provider', - 'datayear' + 'datayear', + 'mode' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index b57a476c..ae6ebeda 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index aeffffcb..b4bd60d9 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index fe722340..ab48ced5 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index b88f1570..76e05f97 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index d8a4573e..84d204a9 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index 39e9ec1a..37857f8a 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index 865e70fc..833c067c 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index 4b602c08..2b7ccca2 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index d85eeaef..81194f69 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -55,6 +55,9 @@ $can = CostbenefitprojectionHelper::getActions('company'); + + + @@ -111,6 +114,9 @@ $can = CostbenefitprojectionHelper::getActions('company');
service_provider_user)->name; ?>
+ + mode); ?> + per); ?> @@ -147,7 +153,7 @@ $can = CostbenefitprojectionHelper::getActions('company'); - + diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 4adfed70..65b72d15 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index 8917115e..64c2b797 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index 34bed224..d5cc4704 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index bdb9a47c..eb2e5a25 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_left.php diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index a36cd430..cefcda49 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_right.php diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index 32c2e1f0..5764966a 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index 7474b589..26e23d6d 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage public_details_fullwidth.php diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index b88f1570..76e05f97 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index d8197625..49297f0f 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers_fullwidth.php diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 0dcf9d03..2d79c9d5 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 1244cdfa..0ff80515 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index 31c15370..5a7aaed9 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index b88f1570..76e05f97 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index c4057dd3..654cead2 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index 6d7a2622..fe804e63 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index 1db7d64a..c3799195 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index eab1b6cd..3f8c5e77 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index 4623bcb2..9cebfca9 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_rightside.php diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index b88f1570..76e05f97 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index d79a4286..61014da4 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index d68e3436..1169f222 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index f36bfa56..04646e6c 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 0bff2d6a..857efafc 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index aeffffcb..b4bd60d9 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 63a3c25f..0751ab56 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index ed102cb1..f78b9f99 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index 74f1e688..3782fd84 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index aeffffcb..b4bd60d9 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index 63a3c25f..0751ab56 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index 4cf93226..a5a0c7c4 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index 562607ee..60669fcd 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index 539c760f..80fc9595 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index a4f0539a..6d6b3bcb 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index 91c8c970..7f1e39c7 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index 63a3c25f..0751ab56 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index 90596c50..f30a52dd 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php @@ -55,6 +55,9 @@ $can = CostbenefitprojectionHelper::getActions('company'); + + + @@ -111,6 +114,9 @@ $can = CostbenefitprojectionHelper::getActions('company'); service_provider_user)->name; ?> + + mode); ?> + per); ?> @@ -147,7 +153,7 @@ $can = CostbenefitprojectionHelper::getActions('company'); - + diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index 8f396f40..8fad1748 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php index aa364006..78649212 100644 --- a/admin/layouts/service_provider/details_fullwidth.php +++ b/admin/layouts/service_provider/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index f19ccb95..adc6f1ef 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index 63a3c25f..0751ab56 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b65d3633..1d2ed12f 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index b8470d81..236728ee 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index 03756e8f..4a662963 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index 120eefcf..7f494846 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php @@ -162,11 +162,6 @@ class CostbenefitprojectionModelCombinedresults extends JModelList { // Always create a slug for sef URL's $item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id; - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) - { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); - } if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // Decode females @@ -177,6 +172,16 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Decode sick_leave_males $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + { + // Decode medical_turnovers_females + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + } + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // Decode males + $item->males = rtrim($advanced->decryptString($item->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($item->causesrisks)) { // Decode causesrisks @@ -187,26 +192,21 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Decode medical_turnovers_males $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } - if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) - { - // Decode total_salary - $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); - } if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) { // Decode sick_leave_females $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); } + if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) + { + // Decode total_salary + $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); + } if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // Decode total_healthcare $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); } - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // Decode males - $item->males = rtrim($advanced->decryptString($item->males), "\0"); - } if (CostbenefitprojectionHelper::checkString($item->country_causesrisks)) { // Decode country_causesrisks diff --git a/admin/models/companies.php b/admin/models/companies.php index 338b1b08..880ea566 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php @@ -43,6 +43,7 @@ class CostbenefitprojectionModelCompanies extends JModelList 'a.department','department', 'a.country','country', 'a.service_provider','service_provider', + 'a.mode','mode', 'a.per','per' ); } @@ -79,6 +80,9 @@ class CostbenefitprojectionModelCompanies extends JModelList $service_provider = $this->getUserStateFromRequest($this->context . '.filter.service_provider', 'filter_service_provider'); $this->setState('filter.service_provider', $service_provider); + $mode = $this->getUserStateFromRequest($this->context . '.filter.mode', 'filter_mode'); + $this->setState('filter.mode', $mode); + $per = $this->getUserStateFromRequest($this->context . '.filter.per', 'filter_per'); $this->setState('filter.per', $per); @@ -141,6 +145,8 @@ class CostbenefitprojectionModelCompanies extends JModelList { // convert department $item->department = $this->selectionTranslation($item->department, 'department'); + // convert mode + $item->mode = $this->selectionTranslation($item->mode, 'mode'); // convert per $item->per = $this->selectionTranslation($item->per, 'per'); } @@ -171,6 +177,19 @@ class CostbenefitprojectionModelCompanies extends JModelList return $departmentArray[$value]; } } + // Array of mode language strings + if ($name == 'mode') + { + $modeArray = array( + 1 => 'COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY', + 2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY' + ); + // Now check if value is found in this array + if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value])) + { + return $modeArray[$value]; + } + } // Array of per language strings if ($name == 'per') { @@ -290,6 +309,11 @@ class CostbenefitprojectionModelCompanies extends JModelList { $query->where('a.service_provider = ' . $db->quote($db->escape($service_provider, true))); } + // Filter by Mode. + if ($mode = $this->getState('filter.mode')) + { + $query->where('a.mode = ' . $db->quote($db->escape($mode, true))); + } // Filter by Per. if ($per = $this->getState('filter.per')) { @@ -382,11 +406,6 @@ class CostbenefitprojectionModelCompanies extends JModelList continue; } - if ($advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) - { - // decrypt medical_turnovers_females - $item->medical_turnovers_females = $advanced->decryptString($item->medical_turnovers_females); - } if ($advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // decrypt females @@ -397,31 +416,36 @@ class CostbenefitprojectionModelCompanies extends JModelList // decrypt sick_leave_males $item->sick_leave_males = $advanced->decryptString($item->sick_leave_males); } + if ($advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + { + // decrypt medical_turnovers_females + $item->medical_turnovers_females = $advanced->decryptString($item->medical_turnovers_females); + } + if ($advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // decrypt males + $item->males = $advanced->decryptString($item->males); + } if ($advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) { // decrypt medical_turnovers_males $item->medical_turnovers_males = $advanced->decryptString($item->medical_turnovers_males); } - if ($advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) - { - // decrypt total_salary - $item->total_salary = $advanced->decryptString($item->total_salary); - } if ($advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) { // decrypt sick_leave_females $item->sick_leave_females = $advanced->decryptString($item->sick_leave_females); } + if ($advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) + { + // decrypt total_salary + $item->total_salary = $advanced->decryptString($item->total_salary); + } if ($advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // decrypt total_healthcare $item->total_healthcare = $advanced->decryptString($item->total_healthcare); } - if ($advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // decrypt males - $item->males = $advanced->decryptString($item->males); - } // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); @@ -487,6 +511,7 @@ class CostbenefitprojectionModelCompanies extends JModelList $id .= ':' . $this->getState('filter.department'); $id .= ':' . $this->getState('filter.country'); $id .= ':' . $this->getState('filter.service_provider'); + $id .= ':' . $this->getState('filter.mode'); $id .= ':' . $this->getState('filter.per'); return parent::getStoreId($id); diff --git a/admin/models/company.php b/admin/models/company.php index b00f9191..eed05eba 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -100,12 +100,6 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object. $advanced = new FOFEncryptAes($advancedkey, 256); - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) - { - // advanced decript data medical_turnovers_females. - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); - } - if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // advanced decript data females. @@ -118,34 +112,40 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + { + // advanced decript data medical_turnovers_females. + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + } + + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // advanced decript data males. + $item->males = rtrim($advanced->decryptString($item->males), "\0"); + } + if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) { // advanced decript data medical_turnovers_males. $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } - if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) - { - // advanced decript data total_salary. - $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); - } - if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) { // advanced decript data sick_leave_females. $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); } + if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) + { + // advanced decript data total_salary. + $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); + } + if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // advanced decript data total_healthcare. $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); - } - - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // advanced decript data males. - $item->males = rtrim($advanced->decryptString($item->males), "\0"); } if (!empty($item->id)) @@ -538,6 +538,25 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('service_provider', 'required', 'false'); } } + // Modify the form based on Edit Mode access controls. + if ($id != 0 && (!$user->authorise('company.edit.mode', 'com_costbenefitprojection.company.' . (int) $id)) + || ($id == 0 && !$user->authorise('company.edit.mode', 'com_costbenefitprojection'))) + { + // Disable fields for display. + $form->setFieldAttribute('mode', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('mode', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('mode', 'class', ''); + $form->setFieldAttribute('mode', 'class', $class.' disabled no-click'); + if (!$form->getValue('mode')) + { + // Disable fields while saving. + $form->setFieldAttribute('mode', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('mode', 'required', 'false'); + } + } // Modify the form based on Edit Per access controls. if ($id != 0 && (!$user->authorise('company.edit.per', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection'))) @@ -1334,12 +1353,6 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object $advanced = new FOFEncryptAes($advancedkey, 256); - // Encript data medical_turnovers_females. - if (isset($data['medical_turnovers_females']) && $advancedkey) - { - $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); - } - // Encript data females. if (isset($data['females']) && $advancedkey) { @@ -1352,36 +1365,42 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']); } + // Encript data medical_turnovers_females. + if (isset($data['medical_turnovers_females']) && $advancedkey) + { + $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); + } + + // Encript data males. + if (isset($data['males']) && $advancedkey) + { + $data['males'] = $advanced->encryptString($data['males']); + } + // Encript data medical_turnovers_males. if (isset($data['medical_turnovers_males']) && $advancedkey) { $data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']); } - // Encript data total_salary. - if (isset($data['total_salary']) && $advancedkey) - { - $data['total_salary'] = $advanced->encryptString($data['total_salary']); - } - // Encript data sick_leave_females. if (isset($data['sick_leave_females']) && $advancedkey) { $data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']); } + // Encript data total_salary. + if (isset($data['total_salary']) && $advancedkey) + { + $data['total_salary'] = $advanced->encryptString($data['total_salary']); + } + // Encript data total_healthcare. if (isset($data['total_healthcare']) && $advancedkey) { $data['total_healthcare'] = $advanced->encryptString($data['total_healthcare']); } - // Encript data males. - if (isset($data['males']) && $advancedkey) - { - $data['males'] = $advanced->encryptString($data['males']); - } - // make sure new company does not get locked $user = JFactory::getUser(); if ($data['id'] == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection')) diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index 69278612..f117f2ee 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php @@ -174,11 +174,6 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection'); return false; } - if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true))) - { - // Decode medical_turnovers_females - $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0"); - } if (!empty($data->females) && $advancedkey && !is_numeric($data->females) && $data->females === base64_encode(base64_decode($data->females, true))) { // Decode females @@ -189,6 +184,16 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem // Decode sick_leave_males $data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\0"); } + if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true))) + { + // Decode medical_turnovers_females + $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0"); + } + if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true))) + { + // Decode males + $data->males = rtrim($advanced->decryptString($data->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($data->causesrisks)) { // Decode causesrisks @@ -199,26 +204,21 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem // Decode medical_turnovers_males $data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_males), "\0"); } - if (!empty($data->total_salary) && $advancedkey && !is_numeric($data->total_salary) && $data->total_salary === base64_encode(base64_decode($data->total_salary, true))) - { - // Decode total_salary - $data->total_salary = rtrim($advanced->decryptString($data->total_salary), "\0"); - } if (!empty($data->sick_leave_females) && $advancedkey && !is_numeric($data->sick_leave_females) && $data->sick_leave_females === base64_encode(base64_decode($data->sick_leave_females, true))) { // Decode sick_leave_females $data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\0"); } + if (!empty($data->total_salary) && $advancedkey && !is_numeric($data->total_salary) && $data->total_salary === base64_encode(base64_decode($data->total_salary, true))) + { + // Decode total_salary + $data->total_salary = rtrim($advanced->decryptString($data->total_salary), "\0"); + } if (!empty($data->total_healthcare) && $advancedkey && !is_numeric($data->total_healthcare) && $data->total_healthcare === base64_encode(base64_decode($data->total_healthcare, true))) { // Decode total_healthcare $data->total_healthcare = rtrim($advanced->decryptString($data->total_healthcare), "\0"); } - if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true))) - { - // Decode males - $data->males = rtrim($advanced->decryptString($data->males), "\0"); - } if (CostbenefitprojectionHelper::checkString($data->country_causesrisks)) { // Decode country_causesrisks diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index 7c2749a2..f64d3262 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -308,6 +308,7 @@ class CostbenefitprojectionModelCostbenefitprojection extends JModelList // start looping the data foreach ($this->companies as $company) { + // now decrypt the company staff count if (!empty($company->males) && $advancedkey && !is_numeric($company->males) && $company->males === base64_encode(base64_decode($company->males, true))) { // Decode males @@ -473,6 +474,8 @@ class CostbenefitprojectionModelCostbenefitprojection extends JModelList // limit to only load his companies $query->where('a.id IN (' . implode(',', $ids) . ')'); } + // Check that we only use the real companies and none of the dummy companies + $query->where('a.mode = 1'); // this will insure only real companies are loaded // get only from set countries $countryIds = array_keys($this->countries); // limit to only load these countries diff --git a/admin/models/countries.php b/admin/models/countries.php index 7fff3cab..4b7fb216 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/country.php b/admin/models/country.php index daa61475..2291343d 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php @@ -443,6 +443,8 @@ class CostbenefitprojectionModelCountry extends JModelAdmin { // convert department $item->department = $this->selectionTranslationVwhcompanies($item->department, 'department'); + // convert mode + $item->mode = $this->selectionTranslationVwhcompanies($item->mode, 'mode'); // convert per $item->per = $this->selectionTranslationVwhcompanies($item->per, 'per'); } @@ -473,6 +475,19 @@ class CostbenefitprojectionModelCountry extends JModelAdmin return $departmentArray[$value]; } } + // Array of mode language strings + if ($name == 'mode') + { + $modeArray = array( + 1 => 'COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY', + 2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY' + ); + // Now check if value is found in this array + if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value])) + { + return $modeArray[$value]; + } + } // Array of per language strings if ($name == 'per') { diff --git a/admin/models/currencies.php b/admin/models/currencies.php index cff9e3ee..5beb66da 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/models/currency.php b/admin/models/currency.php index 09291729..2145bcfb 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 85d134af..3032fe92 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage articles.php diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php index daaede8d..69e72dd4 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php index cfe537b5..1cf9ccba 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesriskscheck.php diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php index 5210d2ac..40788f9d 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 1641730c..a56969ce 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php index d29b58d2..fd5db182 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countryuser.php diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index e5ee4f89..8c75e733 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php index c821c803..f411c289 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage datayear.php diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php index bbc85baf..8c556ea8 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index da3d5c70..244951ce 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage memberuser.php diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php index cddb410e..bf4a6f05 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovider.php diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index e07c2c18..e921af6f 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovideruser.php diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index e6459c1e..be8b1f05 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.js diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js index a5d5336e..5b12cdb6 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/admin/models/forms/company.xml b/admin/models/forms/company.xml index 9f3f280a..2c0e43b9 100644 --- a/admin/models/forms/company.xml +++ b/admin/models/forms/company.xml @@ -159,6 +159,21 @@ required="true" button="true" /> + + + + + + COM_COSTBENEFITPROJECTION_COMPANY_LOCKED + + + + + + + + - + - - - - - - - - - + - + - + + + + + - - - - department = $this->selectionTranslationVwecompanies($item->department, 'department'); + // convert mode + $item->mode = $this->selectionTranslationVwecompanies($item->mode, 'mode'); // convert per $item->per = $this->selectionTranslationVwecompanies($item->per, 'per'); } @@ -242,6 +244,19 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin return $departmentArray[$value]; } } + // Array of mode language strings + if ($name == 'mode') + { + $modeArray = array( + 1 => 'COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY', + 2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY' + ); + // Now check if value is found in this array + if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value])) + { + return $modeArray[$value]; + } + } // Array of per language strings if ($name == 'per') { diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index fe511c35..0f39ac1a 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 7cdd2111..3ad57e31 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -10,6 +10,7 @@ CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_company` ( `males` VARCHAR(255) NOT NULL DEFAULT '', `medical_turnovers_females` VARCHAR(255) NOT NULL DEFAULT '', `medical_turnovers_males` VARCHAR(255) NOT NULL DEFAULT '', + `mode` TINYINT(1) NOT NULL DEFAULT '1', `name` CHAR(64) NOT NULL DEFAULT '', `not_required` INT(1) NOT NULL DEFAULT '0', `per` TINYINT(1) NOT NULL DEFAULT '0', @@ -46,6 +47,7 @@ CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_company` ( KEY `idx_user` (`user`), KEY `idx_country` (`country`), KEY `idx_service_provider` (`service_provider`), + KEY `idx_mode` (`mode`), KEY `idx_per` (`per`), KEY `idx_datayear` (`datayear`), KEY `idx_working_days` (`working_days`), diff --git a/admin/sql/updates/mysql/3.3.8.sql b/admin/sql/updates/mysql/3.3.8.sql new file mode 100644 index 00000000..f47e04bf --- /dev/null +++ b/admin/sql/updates/mysql/3.3.8.sql @@ -0,0 +1,2 @@ +ALTER TABLE `#__costbenefitprojection_company` +ADD `mode` TINYINT(1) NOT NULL DEFAULT '1'; diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index 557c49b3..69c51983 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/tables/company.php b/admin/tables/company.php index ed3962da..cdce3852 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/tables/country.php b/admin/tables/country.php index c9b6c898..6a4e50ef 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/tables/currency.php b/admin/tables/currency.php index 146f8ada..7f099878 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php index 77be7459..dbc82ed7 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 33cacb98..3625f026 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php index 5834d3b3..b7b848c4 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php index c4cab353..d9bab2d3 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php index b1408deb..95d92944 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/vdm.php b/admin/vdm.php index 08005404..fe1346be 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage vdm.php diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js index fd05d814..dcf6a8d2 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php index 4d3dca4c..f2c7a841 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php index 6f8fa464..21ad2026 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php index d275cf7e..78916f6b 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php index e511f0c7..3199cdbb 100644 --- a/admin/views/causesrisks/tmpl/default_batch_body.php +++ b/admin/views/causesrisks/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php index 7f5eee2e..92cad407 100644 --- a/admin/views/causesrisks/tmpl/default_batch_footer.php +++ b/admin/views/causesrisks/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php index 7f4b6ba7..dcd10c76 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php index 5fac4a1a..2f9f5797 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php index 014cf8d0..0b6de2fa 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php index 2d61954b..2e789484 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php index 40bd9e9a..02b544f4 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php index 3a49b5c5..0f3587ef 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php index 44adf7f6..3ec00553 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php index edd52f07..5e4c165a 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index ea214016..5e4ceb2c 100644 --- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php index 21747035..2ed03347 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index 96f68321..6da2655c 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php index 84fa990e..ed1126fa 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index 9b1657e4..6d0eb87b 100644 --- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php index 00f9e39a..cff7d342 100644 --- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index bb045690..f3ac006d 100644 --- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index f3c9740b..7d3e19a1 100644 --- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php index 539f6501..a7b80915 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php index 714b7f73..a288b0ef 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php index 3cde4c15..3fc33806 100644 --- a/admin/views/companies/tmpl/default_batch_body.php +++ b/admin/views/companies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php index 865aff95..88153004 100644 --- a/admin/views/companies/tmpl/default_batch_footer.php +++ b/admin/views/companies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php index 185b5549..eb8e4111 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -116,6 +116,9 @@ $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.
service_provider_user)->name; ?>
+ + mode); ?> + per); ?> diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php index d2829516..5ae5d787 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php @@ -22,5 +22,5 @@ defined('_JEXEC') or die('Restricted access'); ?> - pagination->getListFooter(); ?> + pagination->getListFooter(); ?> \ No newline at end of file diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php index bacba5a3..5c956872 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php @@ -52,6 +52,9 @@ defined('_JEXEC') or die('Restricted access'); listDirn, $this->listOrder); ?> + + listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php index f51f72e4..8a473f7a 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php index 780f38a2..094b99df 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -266,6 +266,28 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy } } + // Set Mode Selection + $this->modeOptions = $this->getTheModeSelections(); + if ($this->modeOptions) + { + // Mode Filter + JHtmlSidebar::addFilter( + '- Select '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL').' -', + 'filter_mode', + JHtml::_('select.options', $this->modeOptions, 'value', 'text', $this->state->get('filter.mode')) + ); + + if ($this->canBatch && $this->canCreate && $this->canEdit) + { + // Mode Batch Selection + JHtmlBatch_::addListSelection( + '- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL').' -', + 'batch[mode]', + JHtml::_('select.options', $this->modeOptions, 'value', 'text') + ); + } + } + // Set Per Selection $this->perOptions = $this->getThePerSelections(); if ($this->perOptions) @@ -334,6 +356,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy 'a.department' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_DEPARTMENT_LABEL'), 'h.name' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL'), 'i.user' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_SERVICE_PROVIDER_LABEL'), + 'a.mode' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL'), 'a.per' => JText::_('COM_COSTBENEFITPROJECTION_COMPANY_PER_LABEL'), 'a.id' => JText::_('JGRID_HEADING_ID') ); @@ -375,6 +398,42 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy return false; } + protected function getTheModeSelections() + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + + // Select the text. + $query->select($db->quoteName('mode')); + $query->from($db->quoteName('#__costbenefitprojection_company')); + $query->order($db->quoteName('mode') . ' ASC'); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + + $results = $db->loadColumn(); + + if ($results) + { + // get model + $model = $this->getModel(); + $results = array_unique($results); + $filter = array(); + foreach ($results as $mode) + { + // Translate the mode selection + $text = $model->selectionTranslation($mode,'mode'); + // Now add the mode and its text to the options array + $filter[] = JHtml::_('select.option', $mode, JText::_($text)); + } + return $filter; + } + return false; + } + protected function getThePerSelections() { // Get a db connection. diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js index 5c076334..4fb4ff62 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index b011042e..57d7821e 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/company/view.html.php b/admin/views/company/view.html.php index a34079c1..8d2e3a10 100644 --- a/admin/views/company/view.html.php +++ b/admin/views/company/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companyresults/tmpl/default.php b/admin/views/companyresults/tmpl/default.php index e6d75e87..50534dd2 100644 --- a/admin/views/companyresults/tmpl/default.php +++ b/admin/views/companyresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost.php b/admin/views/companyresults/tmpl/default_chart_cost.php index 44adf7f6..3ec00553 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost.php +++ b/admin/views/companyresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost_percent.php b/admin/views/companyresults/tmpl/default_chart_cost_percent.php index edd52f07..5e4c165a 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index ea214016..5e4ceb2c 100644 --- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php index 21747035..2ed03347 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index 96f68321..6da2655c 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/companyresults/tmpl/default_main.php b/admin/views/companyresults/tmpl/default_main.php index 84fa990e..ed1126fa 100644 --- a/admin/views/companyresults/tmpl/default_main.php +++ b/admin/views/companyresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index 9b1657e4..6d0eb87b 100644 --- a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/companyresults/tmpl/default_table_cost_summary.php b/admin/views/companyresults/tmpl/default_table_cost_summary.php index 00f9e39a..cff7d342 100644 --- a/admin/views/companyresults/tmpl/default_table_cost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php index bb045690..f3ac006d 100644 --- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php index f3c9740b..7d3e19a1 100644 --- a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/companyresults/tmpl/default_variables.php b/admin/views/companyresults/tmpl/default_variables.php index 68f1375e..219abd18 100644 --- a/admin/views/companyresults/tmpl/default_variables.php +++ b/admin/views/companyresults/tmpl/default_variables.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_variables.php diff --git a/admin/views/companyresults/view.html.php b/admin/views/companyresults/view.html.php index 48788051..46518c74 100644 --- a/admin/views/companyresults/view.html.php +++ b/admin/views/companyresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/costbenefitprojection/tmpl/default.php b/admin/views/costbenefitprojection/tmpl/default.php index 82a097b5..9185c32c 100644 --- a/admin/views/costbenefitprojection/tmpl/default.php +++ b/admin/views/costbenefitprojection/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/costbenefitprojection/tmpl/default_main.php b/admin/views/costbenefitprojection/tmpl/default_main.php index d5cd07ec..23fecc57 100644 --- a/admin/views/costbenefitprojection/tmpl/default_main.php +++ b/admin/views/costbenefitprojection/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php index b54212bd..8aae0d56 100644 --- a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php +++ b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_usage_statistics_table.php diff --git a/admin/views/costbenefitprojection/tmpl/default_vdm.php b/admin/views/costbenefitprojection/tmpl/default_vdm.php index a64d3f54..02909511 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vdm.php +++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_vdm.php diff --git a/admin/views/costbenefitprojection/view.html.php b/admin/views/costbenefitprojection/view.html.php index 60333ae8..bab43c27 100644 --- a/admin/views/costbenefitprojection/view.html.php +++ b/admin/views/costbenefitprojection/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php index d02db148..f5adc9c1 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php index 744f0ef3..d78bd38c 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php index 5c465efb..d4e237e8 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php index bba08047..2d1be2c3 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php index d2829516..867cfdb1 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php index 68f315fb..775abfac 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php index 0a806ecb..73564dd9 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php index 71444d31..9158359e 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js index b05bb490..efcd34f9 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php index fa8185ce..8128c37f 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php index 6e8d77ea..266984fe 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php index e05a7d0f..f9e598b7 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php index 58034d49..28d3467e 100644 --- a/admin/views/currencies/tmpl/default_batch_body.php +++ b/admin/views/currencies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php index d0f29132..cb7fcc83 100644 --- a/admin/views/currencies/tmpl/default_batch_footer.php +++ b/admin/views/currencies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php index 4af026ca..0301f737 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php index 8edf624b..177f0354 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php index f0bb9548..987f52d4 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php index ec8d3de0..8d414216 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php index fd24d716..4e8ad940 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js index 38f6305e..4357c689 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php index e7defc22..dcca0063 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php index 8d100cf1..abfa2c4a 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/health_data/submitbutton.js b/admin/views/health_data/submitbutton.js index 539f2a78..cd0e665c 100644 --- a/admin/views/health_data/submitbutton.js +++ b/admin/views/health_data/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/health_data/tmpl/edit.php b/admin/views/health_data/tmpl/edit.php index 9993a71c..9a5ea5c6 100644 --- a/admin/views/health_data/tmpl/edit.php +++ b/admin/views/health_data/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/health_data/view.html.php b/admin/views/health_data/view.html.php index 8bc34705..1396aeb6 100644 --- a/admin/views/health_data/view.html.php +++ b/admin/views/health_data/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/health_data_sets/tmpl/default.php b/admin/views/health_data_sets/tmpl/default.php index 9741157a..32090f38 100644 --- a/admin/views/health_data_sets/tmpl/default.php +++ b/admin/views/health_data_sets/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_body.php b/admin/views/health_data_sets/tmpl/default_batch_body.php index 724c9ef9..66419692 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_body.php +++ b/admin/views/health_data_sets/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_footer.php b/admin/views/health_data_sets/tmpl/default_batch_footer.php index d77e840a..b86e5d23 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_footer.php +++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/health_data_sets/tmpl/default_body.php b/admin/views/health_data_sets/tmpl/default_body.php index 20d98cbe..79ea6222 100644 --- a/admin/views/health_data_sets/tmpl/default_body.php +++ b/admin/views/health_data_sets/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/health_data_sets/tmpl/default_foot.php b/admin/views/health_data_sets/tmpl/default_foot.php index 2175f537..91b092f5 100644 --- a/admin/views/health_data_sets/tmpl/default_foot.php +++ b/admin/views/health_data_sets/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/health_data_sets/tmpl/default_head.php b/admin/views/health_data_sets/tmpl/default_head.php index 1901040b..aacdbd92 100644 --- a/admin/views/health_data_sets/tmpl/default_head.php +++ b/admin/views/health_data_sets/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/health_data_sets/tmpl/default_toolbar.php b/admin/views/health_data_sets/tmpl/default_toolbar.php index fd267d24..eb543405 100644 --- a/admin/views/health_data_sets/tmpl/default_toolbar.php +++ b/admin/views/health_data_sets/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/health_data_sets/view.html.php b/admin/views/health_data_sets/view.html.php index 0739924d..b4f51aeb 100644 --- a/admin/views/health_data_sets/view.html.php +++ b/admin/views/health_data_sets/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 587c2806..84273c8e 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index d15e2e7e..01dff536 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index 0d14d5d2..7a507589 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index 2d985986..b826d3d5 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index a5215a33..7fa900c4 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index c1288801..3fec91c0 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 51863fbf..834de347 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index d2829516..867cfdb1 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index 00a6be12..a6e820a9 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index 52eb2eb9..4511e762 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index ef2381a9..ef3f91ee 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 3d6fb6d3..b5d8814f 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 150944bf..e7d35660 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js index 275902ec..998ae976 100644 --- a/admin/views/intervention/submitbutton.js +++ b/admin/views/intervention/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/intervention/tmpl/edit.php b/admin/views/intervention/tmpl/edit.php index bd112cc4..531a7cbc 100644 --- a/admin/views/intervention/tmpl/edit.php +++ b/admin/views/intervention/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/intervention/view.html.php b/admin/views/intervention/view.html.php index 7d97e8d2..0a199624 100644 --- a/admin/views/intervention/view.html.php +++ b/admin/views/intervention/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/interventions/tmpl/default.php b/admin/views/interventions/tmpl/default.php index f7c426f6..5e432d49 100644 --- a/admin/views/interventions/tmpl/default.php +++ b/admin/views/interventions/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/interventions/tmpl/default_batch_body.php b/admin/views/interventions/tmpl/default_batch_body.php index c03370ea..7869ae0f 100644 --- a/admin/views/interventions/tmpl/default_batch_body.php +++ b/admin/views/interventions/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/interventions/tmpl/default_batch_footer.php b/admin/views/interventions/tmpl/default_batch_footer.php index ff50ef6e..79f09d23 100644 --- a/admin/views/interventions/tmpl/default_batch_footer.php +++ b/admin/views/interventions/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/interventions/tmpl/default_body.php b/admin/views/interventions/tmpl/default_body.php index 012fd607..ec673701 100644 --- a/admin/views/interventions/tmpl/default_body.php +++ b/admin/views/interventions/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php index 8edf624b..177f0354 100644 --- a/admin/views/interventions/tmpl/default_foot.php +++ b/admin/views/interventions/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/interventions/tmpl/default_head.php b/admin/views/interventions/tmpl/default_head.php index 35ac255d..7ce9262a 100644 --- a/admin/views/interventions/tmpl/default_head.php +++ b/admin/views/interventions/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php index 3cbee621..9be1bdfc 100644 --- a/admin/views/interventions/tmpl/default_toolbar.php +++ b/admin/views/interventions/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/interventions/view.html.php b/admin/views/interventions/view.html.php index 750440c6..fe823fbc 100644 --- a/admin/views/interventions/view.html.php +++ b/admin/views/interventions/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/scaling_factor/submitbutton.js b/admin/views/scaling_factor/submitbutton.js index a8543cd1..ada622b0 100644 --- a/admin/views/scaling_factor/submitbutton.js +++ b/admin/views/scaling_factor/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/scaling_factor/tmpl/edit.php b/admin/views/scaling_factor/tmpl/edit.php index 130ec6b2..5b4e81a6 100644 --- a/admin/views/scaling_factor/tmpl/edit.php +++ b/admin/views/scaling_factor/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/scaling_factor/view.html.php b/admin/views/scaling_factor/view.html.php index 387a3d7d..bc5d73cd 100644 --- a/admin/views/scaling_factor/view.html.php +++ b/admin/views/scaling_factor/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/scaling_factors/tmpl/default.php b/admin/views/scaling_factors/tmpl/default.php index 72512c26..59a18284 100644 --- a/admin/views/scaling_factors/tmpl/default.php +++ b/admin/views/scaling_factors/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_body.php b/admin/views/scaling_factors/tmpl/default_batch_body.php index ba1ef170..810395e1 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_body.php +++ b/admin/views/scaling_factors/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_footer.php b/admin/views/scaling_factors/tmpl/default_batch_footer.php index 8b5324aa..2bed9a7c 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_footer.php +++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/scaling_factors/tmpl/default_body.php b/admin/views/scaling_factors/tmpl/default_body.php index 77ca84c9..99f41857 100644 --- a/admin/views/scaling_factors/tmpl/default_body.php +++ b/admin/views/scaling_factors/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/scaling_factors/tmpl/default_foot.php b/admin/views/scaling_factors/tmpl/default_foot.php index f93fafe2..156dba4a 100644 --- a/admin/views/scaling_factors/tmpl/default_foot.php +++ b/admin/views/scaling_factors/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/scaling_factors/tmpl/default_head.php b/admin/views/scaling_factors/tmpl/default_head.php index 67878ed6..450885df 100644 --- a/admin/views/scaling_factors/tmpl/default_head.php +++ b/admin/views/scaling_factors/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/scaling_factors/tmpl/default_toolbar.php b/admin/views/scaling_factors/tmpl/default_toolbar.php index 8ca47ec8..e753344c 100644 --- a/admin/views/scaling_factors/tmpl/default_toolbar.php +++ b/admin/views/scaling_factors/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/scaling_factors/view.html.php b/admin/views/scaling_factors/view.html.php index 684a6c6b..f752b923 100644 --- a/admin/views/scaling_factors/view.html.php +++ b/admin/views/scaling_factors/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/service_provider/submitbutton.js b/admin/views/service_provider/submitbutton.js index 0b904b7c..c7618ab8 100644 --- a/admin/views/service_provider/submitbutton.js +++ b/admin/views/service_provider/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/service_provider/tmpl/edit.php b/admin/views/service_provider/tmpl/edit.php index 279db0dd..2f40013a 100644 --- a/admin/views/service_provider/tmpl/edit.php +++ b/admin/views/service_provider/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/service_provider/view.html.php b/admin/views/service_provider/view.html.php index 4b8dfe12..beaf952f 100644 --- a/admin/views/service_provider/view.html.php +++ b/admin/views/service_provider/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/service_providers/tmpl/default.php b/admin/views/service_providers/tmpl/default.php index 089bb89b..3e9b522d 100644 --- a/admin/views/service_providers/tmpl/default.php +++ b/admin/views/service_providers/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/service_providers/tmpl/default_batch_body.php b/admin/views/service_providers/tmpl/default_batch_body.php index 065bd29b..db3924d1 100644 --- a/admin/views/service_providers/tmpl/default_batch_body.php +++ b/admin/views/service_providers/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/service_providers/tmpl/default_batch_footer.php b/admin/views/service_providers/tmpl/default_batch_footer.php index c0d26639..7c2219d6 100644 --- a/admin/views/service_providers/tmpl/default_batch_footer.php +++ b/admin/views/service_providers/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/service_providers/tmpl/default_body.php b/admin/views/service_providers/tmpl/default_body.php index 28bf2110..dc0bb487 100644 --- a/admin/views/service_providers/tmpl/default_body.php +++ b/admin/views/service_providers/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/service_providers/tmpl/default_foot.php b/admin/views/service_providers/tmpl/default_foot.php index d2829516..867cfdb1 100644 --- a/admin/views/service_providers/tmpl/default_foot.php +++ b/admin/views/service_providers/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/service_providers/tmpl/default_head.php b/admin/views/service_providers/tmpl/default_head.php index b67441df..7aee692d 100644 --- a/admin/views/service_providers/tmpl/default_head.php +++ b/admin/views/service_providers/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/service_providers/tmpl/default_toolbar.php b/admin/views/service_providers/tmpl/default_toolbar.php index a9d59fbe..1dac4e17 100644 --- a/admin/views/service_providers/tmpl/default_toolbar.php +++ b/admin/views/service_providers/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/service_providers/view.html.php b/admin/views/service_providers/view.html.php index 1aa07210..1749c746 100644 --- a/admin/views/service_providers/view.html.php +++ b/admin/views/service_providers/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml index ae9a1e11..2604e93f 100644 --- a/costbenefitprojection.xml +++ b/costbenefitprojection.xml @@ -1,15 +1,15 @@ COM_COSTBENEFITPROJECTION - 10th March, 2016 + 11th March, 2016 Llewellyn van der Merwe llewellyn@vdm.io http://www.vdm.io Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 3.3.8 + 3.3.9 Cost Benefit Projection (v.3.3.8) +

Cost Benefit Projection (v.3.3.9)

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

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

'; +

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

'; } } } diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css index f41e62e2..5693e3e1 100644 --- a/site/assets/css/combinedresults.css +++ b/site/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/site/assets/css/company.css b/site/assets/css/company.css index 66eef523..ef276221 100644 --- a/site/assets/css/company.css +++ b/site/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css index f894381a..9508e0df 100644 --- a/site/assets/css/companyresults.css +++ b/site/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css index 53f5be81..d0853a7c 100644 --- a/site/assets/css/cpanel.css +++ b/site/assets/css/cpanel.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.css diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css index 6a3ff6b4..2ae4f547 100644 --- a/site/assets/css/createaccount.css +++ b/site/assets/css/createaccount.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.css diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css index 87ee4016..55e5ff73 100644 --- a/site/assets/css/intervention.css +++ b/site/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/site/assets/css/publicresults.css b/site/assets/css/publicresults.css index 9da71568..16b47dfa 100644 --- a/site/assets/css/publicresults.css +++ b/site/assets/css/publicresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publicresults.css diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css index 8b18e57a..aaea500f 100644 --- a/site/assets/css/scaling_factor.css +++ b/site/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index eb6f17b4..75f691ca 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.css diff --git a/site/controller.php b/site/controller.php index bc0edea8..a022ed80 100644 --- a/site/controller.php +++ b/site/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index cbfd378f..06ddc517 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php diff --git a/site/controllers/company.php b/site/controllers/company.php index dbf7ebee..390d4c33 100644 --- a/site/controllers/company.php +++ b/site/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 4ea61534..315d4f53 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php index 71439aac..364593b7 100644 --- a/site/controllers/intervention.php +++ b/site/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/site/controllers/scaling_factor.php b/site/controllers/scaling_factor.php index aa1b4eaa..70d8915f 100644 --- a/site/controllers/scaling_factor.php +++ b/site/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php index 234f5f15..e82cccd1 100644 --- a/site/costbenefitprojection.php +++ b/site/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php index 1515e7f9..e08eafbb 100644 --- a/site/helpers/costbenefitprojection.php +++ b/site/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index dbdaad72..9866a15c 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 291e09c2..03533380 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage route.php diff --git a/site/language/en-GB/en-GB.com_costbenefitprojection.ini b/site/language/en-GB/en-GB.com_costbenefitprojection.ini index ef1d0203..f2185c11 100644 --- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -149,6 +149,8 @@ COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_DEPARTMENT_DESC="Allows the users in th COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_DESC="Allows the users in this group to edit the company" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_EMAIL="Companies Edit Email" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_EMAIL_DESC="Allows the users in this group to update the edit email of the company" +COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_MODE="Companies Edit Mode" +COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_MODE_DESC="Allows the users in this group to update the edit mode of the company" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_OWN="Companies Edit Own" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_OWN_DESC="Allows the users in this group to edit edit own companies created by them" COM_COSTBENEFITPROJECTION_COMPANIES_EDIT_PER="Companies Edit Per" @@ -245,6 +247,9 @@ COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES="Medical Turnovers Mal COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_DESCRIPTION="The total number of medical turnovers for males per/year." COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_HINT="per/year" COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_LABEL="Total Number Medical Turnovers Male" +COM_COSTBENEFITPROJECTION_COMPANY_MODE="Mode" +COM_COSTBENEFITPROJECTION_COMPANY_MODE_DESCRIPTION="Please tell us if this company is a real company or only for testing purposes." +COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL="Mode" COM_COSTBENEFITPROJECTION_COMPANY_NAME="Name" COM_COSTBENEFITPROJECTION_COMPANY_NAME_DESCRIPTION="Enter Company Name Here" COM_COSTBENEFITPROJECTION_COMPANY_NAME_HINT="Company Name Here" @@ -270,6 +275,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_DESCRIPTION="The interim n COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_HINT="Between 0 and 1" COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_LABEL="Medical Turnover Cost Factor" COM_COSTBENEFITPROJECTION_COMPANY_PUBLISHING="Publishing" +COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY="Real company" COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS="Company Results Access" COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_DESC=" Allows the users in this group to access company results." COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE="Company results (Site) Access" @@ -292,6 +298,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_HINT="per/year" COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_LABEL="Total Number Sick Leave Days Males" COM_COSTBENEFITPROJECTION_COMPANY_SIXTYSIXTY_FOUR="60-64" COM_COSTBENEFITPROJECTION_COMPANY_STATUS="Status" +COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY="Testing company" COM_COSTBENEFITPROJECTION_COMPANY_THIRTYTHIRTY_FOUR="30-34" COM_COSTBENEFITPROJECTION_COMPANY_THIRTY_FIVETHIRTY_NINE="35-39" COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_HEALTHCARE="Total Healthcare" diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php index f85afd69..3491c2ce 100644 --- a/site/layouts/appnotice.php +++ b/site/layouts/appnotice.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage appnotice.php diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php index 6cc1994f..78098778 100644 --- a/site/layouts/company/age_groups_percentages_fullwidth.php +++ b/site/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php index 39e9ec1a..37857f8a 100644 --- a/site/layouts/company/age_groups_percentages_left.php +++ b/site/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php index 865e70fc..833c067c 100644 --- a/site/layouts/company/age_groups_percentages_right.php +++ b/site/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php index 62e767d0..ebfccdb0 100644 --- a/site/layouts/company/causerisk_selection_fullwidth.php +++ b/site/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php index d54d5aba..31be6e8d 100644 --- a/site/layouts/company/details_above.php +++ b/site/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php index 109ccf1c..7ec439d4 100644 --- a/site/layouts/company/details_left.php +++ b/site/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php @@ -28,7 +28,8 @@ $fields = $displayData->get('fields') ?: array( 'email', 'country', 'service_provider', - 'datayear' + 'datayear', + 'mode' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php index b57a476c..ae6ebeda 100644 --- a/site/layouts/company/details_right.php +++ b/site/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php index aeffffcb..b4bd60d9 100644 --- a/site/layouts/company/details_under.php +++ b/site/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php index fe722340..ab48ced5 100644 --- a/site/layouts/company/interventions_fullwidth.php +++ b/site/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php index f19ccb95..adc6f1ef 100644 --- a/site/layouts/company/publishing.php +++ b/site/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php index b88f1570..76e05f97 100644 --- a/site/layouts/company/publlshing.php +++ b/site/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php index d8a4573e..84d204a9 100644 --- a/site/layouts/company/scaling_factors_fullwidth.php +++ b/site/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php diff --git a/site/layouts/companydetails.php b/site/layouts/companydetails.php index ff980fe5..9f53331d 100644 --- a/site/layouts/companydetails.php +++ b/site/layouts/companydetails.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companydetails.php diff --git a/site/layouts/databreakdownmalefemale.php b/site/layouts/databreakdownmalefemale.php index c4057dd3..654cead2 100644 --- a/site/layouts/databreakdownmalefemale.php +++ b/site/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php index ed102cb1..f78b9f99 100644 --- a/site/layouts/intervention/details_above.php +++ b/site/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php index 74f1e688..3782fd84 100644 --- a/site/layouts/intervention/details_fullwidth.php +++ b/site/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php index aeffffcb..b4bd60d9 100644 --- a/site/layouts/intervention/details_under.php +++ b/site/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php index f19ccb95..adc6f1ef 100644 --- a/site/layouts/intervention/publishing.php +++ b/site/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php index 63a3c25f..0751ab56 100644 --- a/site/layouts/intervention/publlshing.php +++ b/site/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php index 4cf93226..a5a0c7c4 100644 --- a/site/layouts/intervention/settings_fullwidth.php +++ b/site/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php index 562607ee..60669fcd 100644 --- a/site/layouts/intervention/settings_left.php +++ b/site/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php index 539c760f..80fc9595 100644 --- a/site/layouts/scaling_factor/details_above.php +++ b/site/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php index a4f0539a..6d6b3bcb 100644 --- a/site/layouts/scaling_factor/details_left.php +++ b/site/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php index 91c8c970..7f1e39c7 100644 --- a/site/layouts/scaling_factor/details_right.php +++ b/site/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php index f19ccb95..adc6f1ef 100644 --- a/site/layouts/scaling_factor/publishing.php +++ b/site/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php index 63a3c25f..0751ab56 100644 --- a/site/layouts/scaling_factor/publlshing.php +++ b/site/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/models/ajax.php b/site/models/ajax.php index dfaf575c..d61a020d 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/site/models/combinedresults.php b/site/models/combinedresults.php index 4482b946..f5d79229 100644 --- a/site/models/combinedresults.php +++ b/site/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php @@ -162,11 +162,6 @@ class CostbenefitprojectionModelCombinedresults extends JModelList { // Always create a slug for sef URL's $item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id; - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) - { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); - } if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // Decode females @@ -177,6 +172,16 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Decode sick_leave_males $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + { + // Decode medical_turnovers_females + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + } + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // Decode males + $item->males = rtrim($advanced->decryptString($item->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($item->causesrisks)) { // Decode causesrisks @@ -187,26 +192,21 @@ class CostbenefitprojectionModelCombinedresults extends JModelList // Decode medical_turnovers_males $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } - if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) - { - // Decode total_salary - $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); - } if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) { // Decode sick_leave_females $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); } + if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) + { + // Decode total_salary + $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); + } if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // Decode total_healthcare $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); } - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // Decode males - $item->males = rtrim($advanced->decryptString($item->males), "\0"); - } if (CostbenefitprojectionHelper::checkString($item->country_causesrisks)) { // Decode country_causesrisks diff --git a/site/models/company.php b/site/models/company.php index 5a3b0434..12a559cc 100644 --- a/site/models/company.php +++ b/site/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -100,12 +100,6 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object. $advanced = new FOFEncryptAes($advancedkey, 256); - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) - { - // advanced decript data medical_turnovers_females. - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); - } - if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // advanced decript data females. @@ -118,34 +112,40 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + { + // advanced decript data medical_turnovers_females. + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + } + + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // advanced decript data males. + $item->males = rtrim($advanced->decryptString($item->males), "\0"); + } + if (!empty($item->medical_turnovers_males) && $advancedkey && !is_numeric($item->medical_turnovers_males) && $item->medical_turnovers_males === base64_encode(base64_decode($item->medical_turnovers_males, true))) { // advanced decript data medical_turnovers_males. $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } - if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) - { - // advanced decript data total_salary. - $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); - } - if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) { // advanced decript data sick_leave_females. $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); } + if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) + { + // advanced decript data total_salary. + $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); + } + if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // advanced decript data total_healthcare. $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); - } - - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // advanced decript data males. - $item->males = rtrim($advanced->decryptString($item->males), "\0"); } if (!empty($item->id)) @@ -538,6 +538,25 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $form->setFieldAttribute('service_provider', 'required', 'false'); } } + // Modify the form based on Edit Mode access controls. + if ($id != 0 && (!$user->authorise('company.edit.mode', 'com_costbenefitprojection.company.' . (int) $id)) + || ($id == 0 && !$user->authorise('company.edit.mode', 'com_costbenefitprojection'))) + { + // Disable fields for display. + $form->setFieldAttribute('mode', 'disabled', 'true'); + // Disable fields for display. + $form->setFieldAttribute('mode', 'readonly', 'true'); + // Disable radio button for display. + $class = $form->getFieldAttribute('mode', 'class', ''); + $form->setFieldAttribute('mode', 'class', $class.' disabled no-click'); + if (!$form->getValue('mode')) + { + // Disable fields while saving. + $form->setFieldAttribute('mode', 'filter', 'unset'); + // Disable fields while saving. + $form->setFieldAttribute('mode', 'required', 'false'); + } + } // Modify the form based on Edit Per access controls. if ($id != 0 && (!$user->authorise('company.edit.per', 'com_costbenefitprojection.company.' . (int) $id)) || ($id == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection'))) @@ -1315,12 +1334,6 @@ class CostbenefitprojectionModelCompany extends JModelAdmin // Get the encription object $advanced = new FOFEncryptAes($advancedkey, 256); - // Encript data medical_turnovers_females. - if (isset($data['medical_turnovers_females']) && $advancedkey) - { - $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); - } - // Encript data females. if (isset($data['females']) && $advancedkey) { @@ -1333,36 +1346,42 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $data['sick_leave_males'] = $advanced->encryptString($data['sick_leave_males']); } + // Encript data medical_turnovers_females. + if (isset($data['medical_turnovers_females']) && $advancedkey) + { + $data['medical_turnovers_females'] = $advanced->encryptString($data['medical_turnovers_females']); + } + + // Encript data males. + if (isset($data['males']) && $advancedkey) + { + $data['males'] = $advanced->encryptString($data['males']); + } + // Encript data medical_turnovers_males. if (isset($data['medical_turnovers_males']) && $advancedkey) { $data['medical_turnovers_males'] = $advanced->encryptString($data['medical_turnovers_males']); } - // Encript data total_salary. - if (isset($data['total_salary']) && $advancedkey) - { - $data['total_salary'] = $advanced->encryptString($data['total_salary']); - } - // Encript data sick_leave_females. if (isset($data['sick_leave_females']) && $advancedkey) { $data['sick_leave_females'] = $advanced->encryptString($data['sick_leave_females']); } + // Encript data total_salary. + if (isset($data['total_salary']) && $advancedkey) + { + $data['total_salary'] = $advanced->encryptString($data['total_salary']); + } + // Encript data total_healthcare. if (isset($data['total_healthcare']) && $advancedkey) { $data['total_healthcare'] = $advanced->encryptString($data['total_healthcare']); } - // Encript data males. - if (isset($data['males']) && $advancedkey) - { - $data['males'] = $advanced->encryptString($data['males']); - } - // make sure new company does not get locked $user = JFactory::getUser(); if ($data['id'] == 0 && !$user->authorise('company.edit.per', 'com_costbenefitprojection')) diff --git a/site/models/companyresults.php b/site/models/companyresults.php index a7916b3e..5cce9648 100644 --- a/site/models/companyresults.php +++ b/site/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php @@ -176,11 +176,6 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel'); return false; } - if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true))) - { - // Decode medical_turnovers_females - $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0"); - } if (!empty($data->females) && $advancedkey && !is_numeric($data->females) && $data->females === base64_encode(base64_decode($data->females, true))) { // Decode females @@ -191,6 +186,16 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem // Decode sick_leave_males $data->sick_leave_males = rtrim($advanced->decryptString($data->sick_leave_males), "\0"); } + if (!empty($data->medical_turnovers_females) && $advancedkey && !is_numeric($data->medical_turnovers_females) && $data->medical_turnovers_females === base64_encode(base64_decode($data->medical_turnovers_females, true))) + { + // Decode medical_turnovers_females + $data->medical_turnovers_females = rtrim($advanced->decryptString($data->medical_turnovers_females), "\0"); + } + if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true))) + { + // Decode males + $data->males = rtrim($advanced->decryptString($data->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($data->causesrisks)) { // Decode causesrisks @@ -201,26 +206,21 @@ class CostbenefitprojectionModelCompanyresults extends JModelItem // Decode medical_turnovers_males $data->medical_turnovers_males = rtrim($advanced->decryptString($data->medical_turnovers_males), "\0"); } - if (!empty($data->total_salary) && $advancedkey && !is_numeric($data->total_salary) && $data->total_salary === base64_encode(base64_decode($data->total_salary, true))) - { - // Decode total_salary - $data->total_salary = rtrim($advanced->decryptString($data->total_salary), "\0"); - } if (!empty($data->sick_leave_females) && $advancedkey && !is_numeric($data->sick_leave_females) && $data->sick_leave_females === base64_encode(base64_decode($data->sick_leave_females, true))) { // Decode sick_leave_females $data->sick_leave_females = rtrim($advanced->decryptString($data->sick_leave_females), "\0"); } + if (!empty($data->total_salary) && $advancedkey && !is_numeric($data->total_salary) && $data->total_salary === base64_encode(base64_decode($data->total_salary, true))) + { + // Decode total_salary + $data->total_salary = rtrim($advanced->decryptString($data->total_salary), "\0"); + } if (!empty($data->total_healthcare) && $advancedkey && !is_numeric($data->total_healthcare) && $data->total_healthcare === base64_encode(base64_decode($data->total_healthcare, true))) { // Decode total_healthcare $data->total_healthcare = rtrim($advanced->decryptString($data->total_healthcare), "\0"); } - if (!empty($data->males) && $advancedkey && !is_numeric($data->males) && $data->males === base64_encode(base64_decode($data->males, true))) - { - // Decode males - $data->males = rtrim($advanced->decryptString($data->males), "\0"); - } if (CostbenefitprojectionHelper::checkString($data->country_causesrisks)) { // Decode country_causesrisks diff --git a/site/models/cpanel.php b/site/models/cpanel.php index 4878217e..b51f2a25 100644 --- a/site/models/cpanel.php +++ b/site/models/cpanel.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.php @@ -135,11 +135,6 @@ class CostbenefitprojectionModelCpanel extends JModelList { // Always create a slug for sef URL's $item->slug = (isset($item->alias)) ? $item->id.':'.$item->alias : $item->id; - if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) - { - // Decode medical_turnovers_females - $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); - } if (!empty($item->females) && $advancedkey && !is_numeric($item->females) && $item->females === base64_encode(base64_decode($item->females, true))) { // Decode females @@ -150,6 +145,16 @@ class CostbenefitprojectionModelCpanel extends JModelList // Decode sick_leave_males $item->sick_leave_males = rtrim($advanced->decryptString($item->sick_leave_males), "\0"); } + if (!empty($item->medical_turnovers_females) && $advancedkey && !is_numeric($item->medical_turnovers_females) && $item->medical_turnovers_females === base64_encode(base64_decode($item->medical_turnovers_females, true))) + { + // Decode medical_turnovers_females + $item->medical_turnovers_females = rtrim($advanced->decryptString($item->medical_turnovers_females), "\0"); + } + if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) + { + // Decode males + $item->males = rtrim($advanced->decryptString($item->males), "\0"); + } if (CostbenefitprojectionHelper::checkString($item->causesrisks)) { // Decode causesrisks @@ -160,26 +165,21 @@ class CostbenefitprojectionModelCpanel extends JModelList // Decode medical_turnovers_males $item->medical_turnovers_males = rtrim($advanced->decryptString($item->medical_turnovers_males), "\0"); } - if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) - { - // Decode total_salary - $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); - } if (!empty($item->sick_leave_females) && $advancedkey && !is_numeric($item->sick_leave_females) && $item->sick_leave_females === base64_encode(base64_decode($item->sick_leave_females, true))) { // Decode sick_leave_females $item->sick_leave_females = rtrim($advanced->decryptString($item->sick_leave_females), "\0"); } + if (!empty($item->total_salary) && $advancedkey && !is_numeric($item->total_salary) && $item->total_salary === base64_encode(base64_decode($item->total_salary, true))) + { + // Decode total_salary + $item->total_salary = rtrim($advanced->decryptString($item->total_salary), "\0"); + } if (!empty($item->total_healthcare) && $advancedkey && !is_numeric($item->total_healthcare) && $item->total_healthcare === base64_encode(base64_decode($item->total_healthcare, true))) { // Decode total_healthcare $item->total_healthcare = rtrim($advanced->decryptString($item->total_healthcare), "\0"); } - if (!empty($item->males) && $advancedkey && !is_numeric($item->males) && $item->males === base64_encode(base64_decode($item->males, true))) - { - // Decode males - $item->males = rtrim($advanced->decryptString($item->males), "\0"); - } // Make sure the content prepare plugins fire on country_publicaddress. $item->country_publicaddress = JHtml::_('content.prepare',$item->country_publicaddress); // Checking if country_publicaddress has uikit components that must be loaded. diff --git a/site/models/createaccount.php b/site/models/createaccount.php index e1570137..1fa830f5 100644 --- a/site/models/createaccount.php +++ b/site/models/createaccount.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.php diff --git a/site/models/forms/company.js b/site/models/forms/company.js index a5d5336e..5b12cdb6 100644 --- a/site/models/forms/company.js +++ b/site/models/forms/company.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.8 - @build 10th March, 2016 + @version 3.3.9 + @build 11th March, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/site/models/forms/company.xml b/site/models/forms/company.xml index 9f3f280a..2c0e43b9 100644 --- a/site/models/forms/company.xml +++ b/site/models/forms/company.xml @@ -159,6 +159,21 @@ required="true" button="true" /> + + + + + + COM_COSTBENEFITPROJECTION_COMPANY_LOCKED + + + + + + + + - + - - - - - - - - - + - + - + + + + + - - - -