From c9c131446e8019278249bb8550d214958301d7b1 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Thu, 5 May 2016 17:05:50 +0100 Subject: [PATCH] First code implementation of issue #2 the advanced import method is still being modeled. --- README.md | 8 +- admin/assets/css/admin.css | 2 +- admin/assets/css/causerisk.css | 2 +- admin/assets/css/causesrisks.css | 2 +- admin/assets/css/combinedresults.css | 2 +- admin/assets/css/companies.css | 2 +- admin/assets/css/company.css | 2 +- admin/assets/css/companyresults.css | 2 +- admin/assets/css/countries.css | 2 +- admin/assets/css/country.css | 2 +- admin/assets/css/currencies.css | 2 +- admin/assets/css/currency.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/health_data.css | 2 +- admin/assets/css/health_data_sets.css | 2 +- admin/assets/css/help_document.css | 2 +- admin/assets/css/help_documents.css | 2 +- admin/assets/css/intervention.css | 2 +- admin/assets/css/interventions.css | 2 +- admin/assets/css/scaling_factor.css | 2 +- admin/assets/css/scaling_factors.css | 2 +- admin/assets/css/service_provider.css | 2 +- admin/assets/css/service_providers.css | 2 +- admin/controller.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/causerisk.php | 2 +- admin/controllers/causesrisks.php | 2 +- admin/controllers/combinedresults.php | 2 +- admin/controllers/companies.php | 2 +- admin/controllers/company.php | 2 +- admin/controllers/companyresults.php | 2 +- admin/controllers/costbenefitprojection.php | 2 +- admin/controllers/countries.php | 2 +- admin/controllers/country.php | 2 +- admin/controllers/currencies.php | 2 +- admin/controllers/currency.php | 2 +- admin/controllers/health_data.php | 2 +- admin/controllers/health_data_sets.php | 4 +- admin/controllers/help.php | 2 +- admin/controllers/help_document.php | 2 +- admin/controllers/help_documents.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/import_health_data_sets.php | 61 ++ admin/controllers/intervention.php | 2 +- admin/controllers/interventions.php | 2 +- admin/controllers/scaling_factor.php | 2 +- admin/controllers/scaling_factors.php | 2 +- admin/controllers/service_provider.php | 2 +- admin/controllers/service_providers.php | 2 +- admin/costbenefitprojection.php | 2 +- admin/helpers/costbenefitprojection.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/sum.php | 2 +- admin/helpers/sumcombine.php | 2 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 5 + admin/layouts/batchselection.php | 2 +- admin/layouts/causerisk/details_above.php | 2 +- admin/layouts/causerisk/details_left.php | 2 +- admin/layouts/causerisk/publishing.php | 2 +- admin/layouts/causerisk/publlshing.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- admin/layouts/company/details_above.php | 2 +- admin/layouts/company/details_left.php | 2 +- admin/layouts/company/details_right.php | 2 +- admin/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 2 +- admin/layouts/company/publishing.php | 2 +- admin/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- .../country/age_groups_percentages_left.php | 2 +- .../country/age_groups_percentages_right.php | 2 +- .../country/causerisk_selection_fullwidth.php | 2 +- admin/layouts/country/companies_fullwidth.php | 2 +- admin/layouts/country/details_above.php | 2 +- admin/layouts/country/details_left.php | 2 +- admin/layouts/country/details_right.php | 2 +- .../country/health_data_totals_left.php | 2 +- .../country/health_data_totals_right.php | 2 +- .../country/interventions_fullwidth.php | 2 +- .../country/public_details_fullwidth.php | 2 +- admin/layouts/country/publishing.php | 2 +- admin/layouts/country/publlshing.php | 2 +- .../country/service_providers_fullwidth.php | 2 +- admin/layouts/currency/details_above.php | 2 +- admin/layouts/currency/details_left.php | 2 +- admin/layouts/currency/details_right.php | 2 +- admin/layouts/currency/publishing.php | 2 +- admin/layouts/currency/publlshing.php | 2 +- admin/layouts/databreakdownmalefemale.php | 2 +- admin/layouts/health_data/details_above.php | 2 +- admin/layouts/health_data/details_left.php | 2 +- admin/layouts/health_data/details_right.php | 2 +- .../layouts/health_data/details_rightside.php | 2 +- admin/layouts/health_data/publishing.php | 2 +- admin/layouts/health_data/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- admin/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- admin/layouts/intervention/details_under.php | 2 +- admin/layouts/intervention/publishing.php | 2 +- admin/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- admin/layouts/intervention/settings_left.php | 2 +- .../layouts/scaling_factor/details_above.php | 2 +- admin/layouts/scaling_factor/details_left.php | 2 +- .../layouts/scaling_factor/details_right.php | 2 +- admin/layouts/scaling_factor/publishing.php | 2 +- admin/layouts/scaling_factor/publlshing.php | 2 +- .../service_provider/companies_fullwidth.php | 2 +- .../service_provider/details_above.php | 2 +- .../layouts/service_provider/details_left.php | 2 +- .../service_provider/details_right.php | 2 +- admin/layouts/service_provider/publishing.php | 2 +- admin/layouts/service_provider/publlshing.php | 2 +- admin/models/ajax.php | 2 +- admin/models/causerisk.php | 2 +- admin/models/causesrisks.php | 2 +- admin/models/combinedresults.php | 2 +- admin/models/companies.php | 2 +- admin/models/company.php | 2 +- admin/models/companyresults.php | 2 +- admin/models/costbenefitprojection.php | 2 +- admin/models/countries.php | 2 +- admin/models/country.php | 2 +- admin/models/currencies.php | 2 +- admin/models/currency.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/causesrisks.php | 2 +- admin/models/fields/causesriskscheck.php | 2 +- admin/models/fields/company.php | 2 +- admin/models/fields/companycheck.php | 2 +- admin/models/fields/countries.php | 2 +- admin/models/fields/countryuser.php | 2 +- admin/models/fields/currency.php | 2 +- admin/models/fields/datayear.php | 2 +- admin/models/fields/interventions.php | 2 +- admin/models/fields/memberuser.php | 2 +- admin/models/fields/serviceprovider.php | 2 +- admin/models/fields/serviceprovideruser.php | 2 +- admin/models/forms/causerisk.js | 2 +- admin/models/forms/company.js | 2 +- admin/models/forms/country.js | 2 +- admin/models/forms/currency.js | 2 +- admin/models/forms/health_data.js | 2 +- admin/models/forms/help_document.js | 2 +- admin/models/forms/intervention.js | 2 +- admin/models/forms/scaling_factor.js | 2 +- admin/models/forms/service_provider.js | 2 +- admin/models/health_data.php | 2 +- admin/models/health_data_sets.php | 2 +- admin/models/help_document.php | 2 +- admin/models/help_documents.php | 2 +- admin/models/import.php | 4 +- admin/models/import_health_data_sets.php | 750 ++++++++++++++++++ admin/models/intervention.php | 2 +- admin/models/interventions.php | 2 +- admin/models/scaling_factor.php | 2 +- admin/models/scaling_factors.php | 2 +- admin/models/service_provider.php | 2 +- admin/models/service_providers.php | 2 +- admin/sql/install.mysql.utf8.sql | 2 +- admin/tables/causerisk.php | 2 +- admin/tables/company.php | 2 +- admin/tables/country.php | 2 +- admin/tables/currency.php | 2 +- admin/tables/health_data.php | 2 +- admin/tables/help_document.php | 2 +- admin/tables/intervention.php | 2 +- admin/tables/scaling_factor.php | 2 +- admin/tables/service_provider.php | 2 +- admin/vdm.php | 2 +- admin/views/causerisk/submitbutton.js | 2 +- admin/views/causerisk/tmpl/edit.php | 2 +- admin/views/causerisk/view.html.php | 2 +- admin/views/causesrisks/tmpl/default.php | 2 +- .../causesrisks/tmpl/default_batch_body.php | 2 +- .../causesrisks/tmpl/default_batch_footer.php | 2 +- admin/views/causesrisks/tmpl/default_body.php | 2 +- admin/views/causesrisks/tmpl/default_foot.php | 2 +- admin/views/causesrisks/tmpl/default_head.php | 2 +- .../causesrisks/tmpl/default_toolbar.php | 2 +- admin/views/causesrisks/view.html.php | 2 +- admin/views/combinedresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- .../combinedresults/tmpl/default_main.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- admin/views/combinedresults/view.html.php | 2 +- admin/views/companies/tmpl/default.php | 2 +- .../companies/tmpl/default_batch_body.php | 2 +- .../companies/tmpl/default_batch_footer.php | 2 +- admin/views/companies/tmpl/default_body.php | 2 +- admin/views/companies/tmpl/default_foot.php | 2 +- admin/views/companies/tmpl/default_head.php | 2 +- .../views/companies/tmpl/default_toolbar.php | 2 +- admin/views/companies/view.html.php | 2 +- admin/views/company/submitbutton.js | 2 +- admin/views/company/tmpl/edit.php | 2 +- admin/views/company/view.html.php | 2 +- admin/views/companyresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- .../companyresults/tmpl/default_main.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- .../companyresults/tmpl/default_variables.php | 2 +- admin/views/companyresults/view.html.php | 2 +- .../costbenefitprojection/tmpl/default.php | 2 +- .../tmpl/default_main.php | 2 +- .../tmpl/default_usage_statistics_table.php | 2 +- .../tmpl/default_vdm.php | 2 +- .../views/costbenefitprojection/view.html.php | 2 +- admin/views/countries/tmpl/default.php | 2 +- .../countries/tmpl/default_batch_body.php | 2 +- .../countries/tmpl/default_batch_footer.php | 2 +- admin/views/countries/tmpl/default_body.php | 2 +- admin/views/countries/tmpl/default_foot.php | 2 +- admin/views/countries/tmpl/default_head.php | 2 +- .../views/countries/tmpl/default_toolbar.php | 2 +- admin/views/countries/view.html.php | 2 +- admin/views/country/submitbutton.js | 2 +- admin/views/country/tmpl/edit.php | 2 +- admin/views/country/view.html.php | 2 +- admin/views/currencies/tmpl/default.php | 2 +- .../currencies/tmpl/default_batch_body.php | 2 +- .../currencies/tmpl/default_batch_footer.php | 2 +- admin/views/currencies/tmpl/default_body.php | 2 +- admin/views/currencies/tmpl/default_foot.php | 2 +- admin/views/currencies/tmpl/default_head.php | 2 +- .../views/currencies/tmpl/default_toolbar.php | 2 +- admin/views/currencies/view.html.php | 2 +- admin/views/currency/submitbutton.js | 2 +- admin/views/currency/tmpl/edit.php | 2 +- admin/views/currency/view.html.php | 2 +- admin/views/health_data/submitbutton.js | 2 +- admin/views/health_data/tmpl/edit.php | 2 +- admin/views/health_data/view.html.php | 2 +- admin/views/health_data_sets/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../health_data_sets/tmpl/default_body.php | 2 +- .../health_data_sets/tmpl/default_foot.php | 2 +- .../health_data_sets/tmpl/default_head.php | 2 +- .../health_data_sets/tmpl/default_toolbar.php | 2 +- admin/views/health_data_sets/view.html.php | 2 +- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 2 +- admin/views/help_document/view.html.php | 2 +- admin/views/help_documents/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../help_documents/tmpl/default_body.php | 2 +- .../help_documents/tmpl/default_foot.php | 2 +- .../help_documents/tmpl/default_head.php | 2 +- .../help_documents/tmpl/default_toolbar.php | 2 +- admin/views/help_documents/view.html.php | 2 +- admin/views/import/tmpl/default.php | 205 +++-- admin/views/import/view.html.php | 2 +- .../views/import_health_data_sets/index.html | 1 + .../import_health_data_sets/tmpl/default.php | 263 ++++++ .../import_health_data_sets/tmpl/index.html | 1 + .../import_health_data_sets/view.html.php | 104 +++ admin/views/intervention/submitbutton.js | 2 +- admin/views/intervention/tmpl/edit.php | 2 +- admin/views/intervention/view.html.php | 2 +- admin/views/interventions/tmpl/default.php | 2 +- .../interventions/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/interventions/tmpl/default_body.php | 2 +- .../views/interventions/tmpl/default_foot.php | 2 +- .../views/interventions/tmpl/default_head.php | 2 +- .../interventions/tmpl/default_toolbar.php | 2 +- admin/views/interventions/view.html.php | 2 +- admin/views/scaling_factor/submitbutton.js | 2 +- admin/views/scaling_factor/tmpl/edit.php | 2 +- admin/views/scaling_factor/view.html.php | 2 +- admin/views/scaling_factors/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../scaling_factors/tmpl/default_body.php | 2 +- .../scaling_factors/tmpl/default_foot.php | 2 +- .../scaling_factors/tmpl/default_head.php | 2 +- .../scaling_factors/tmpl/default_toolbar.php | 2 +- admin/views/scaling_factors/view.html.php | 2 +- admin/views/service_provider/submitbutton.js | 2 +- admin/views/service_provider/tmpl/edit.php | 2 +- admin/views/service_provider/view.html.php | 2 +- .../views/service_providers/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../service_providers/tmpl/default_body.php | 2 +- .../service_providers/tmpl/default_foot.php | 2 +- .../service_providers/tmpl/default_head.php | 2 +- .../tmpl/default_toolbar.php | 2 +- admin/views/service_providers/view.html.php | 2 +- costbenefitprojection.xml | 2 +- script.php | 2 +- site/assets/css/combinedresults.css | 2 +- site/assets/css/company.css | 2 +- site/assets/css/companyresults.css | 2 +- site/assets/css/cpanel.css | 2 +- site/assets/css/createaccount.css | 2 +- site/assets/css/intervention.css | 2 +- site/assets/css/publicresults.css | 2 +- site/assets/css/scaling_factor.css | 2 +- site/assets/css/site.css | 2 +- site/controller.php | 2 +- site/controllers/ajax.json.php | 2 +- site/controllers/company.php | 2 +- site/controllers/help.php | 2 +- site/controllers/intervention.php | 2 +- site/controllers/scaling_factor.php | 2 +- site/costbenefitprojection.php | 2 +- site/helpers/costbenefitprojection.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 5 + site/layouts/appnotice.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- site/layouts/company/details_above.php | 2 +- site/layouts/company/details_left.php | 2 +- site/layouts/company/details_right.php | 2 +- site/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 2 +- site/layouts/company/publishing.php | 2 +- site/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- site/layouts/companydetails.php | 2 +- site/layouts/databreakdownmalefemale.php | 2 +- site/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- site/layouts/intervention/details_under.php | 2 +- site/layouts/intervention/publishing.php | 2 +- site/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- site/layouts/intervention/settings_left.php | 2 +- site/layouts/scaling_factor/details_above.php | 2 +- site/layouts/scaling_factor/details_left.php | 2 +- site/layouts/scaling_factor/details_right.php | 2 +- site/layouts/scaling_factor/publishing.php | 2 +- site/layouts/scaling_factor/publlshing.php | 2 +- site/models/ajax.php | 2 +- site/models/combinedresults.php | 2 +- site/models/company.php | 2 +- site/models/companyresults.php | 2 +- site/models/cpanel.php | 2 +- site/models/createaccount.php | 2 +- site/models/forms/company.js | 2 +- site/models/forms/intervention.js | 2 +- site/models/forms/scaling_factor.js | 2 +- site/models/intervention.php | 2 +- site/models/publicresults.php | 2 +- site/models/scaling_factor.php | 2 +- site/router.php | 2 +- site/views/combinedresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- ...t_chart_intervention_cost_benefit_save.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- site/views/combinedresults/view.html.php | 2 +- site/views/company/submitbutton.js | 2 +- site/views/company/tmpl/edit.php | 2 +- site/views/company/view.html.php | 2 +- site/views/companyresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- ...t_chart_intervention_cost_benefit_save.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- site/views/companyresults/view.html.php | 2 +- site/views/cpanel/tmpl/default.php | 2 +- site/views/cpanel/view.html.php | 2 +- site/views/createaccount/tmpl/default.php | 2 +- .../tmpl/default_cbpmenumodule.php | 2 +- site/views/createaccount/view.html.php | 2 +- site/views/intervention/submitbutton.js | 2 +- site/views/intervention/tmpl/edit.php | 2 +- site/views/intervention/view.html.php | 2 +- site/views/publicresults/tmpl/default.php | 2 +- .../tmpl/default_cbpmenumodule.php | 2 +- .../tmpl/default_chart_cost_public.php | 2 +- ...chart_intervention_cost_benefit_public.php | 2 +- .../tmpl/default_contact_form_public.php | 2 +- site/views/publicresults/view.html.php | 2 +- site/views/scaling_factor/submitbutton.js | 2 +- site/views/scaling_factor/tmpl/edit.php | 2 +- site/views/scaling_factor/view.html.php | 2 +- 421 files changed, 1708 insertions(+), 521 deletions(-) create mode 100644 admin/controllers/import_health_data_sets.php create mode 100644 admin/models/import_health_data_sets.php create mode 100644 admin/views/import_health_data_sets/index.html create mode 100644 admin/views/import_health_data_sets/tmpl/default.php create mode 100644 admin/views/import_health_data_sets/tmpl/index.html create mode 100644 admin/views/import_health_data_sets/view.html.php diff --git a/README.md b/README.md index 6b62fc1e..d4a71adc 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ 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*: 2nd May, 2016 ++ *Last Build*: 5th May, 2016 + *Version*: 3.3.11 + *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*: **84128** -+ *File count*: **559** -+ *Folder count*: **101** ++ *Line count*: **85312** ++ *File count*: **565** ++ *Folder count*: **103** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). > Developed by [Llewellyn van der Merwe] (mailto:joomla@vdm.io) \ No newline at end of file diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index c6bf34ff..b583c8fe 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ed50c679..633186cf 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 76574c39..04646f68 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ad4e5117..8ad4aea9 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6064ba14..af6fe803 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f9ad16d0..354c6b4f 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a44e55a8..d4fe2d36 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f7e872ce..8981ad28 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d5331278..b4ff85fd 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 386acaf7..ca649e04 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9dcec53e..7e01edaf 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b26909bc..009733a9 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 dad97161..3692581e 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 34c02846..d54218c4 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4c860bfe..6cf703a3 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a3867a72..783a2ee1 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1af941b2..66597f4d 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 af9513d1..7c313d97 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a516abb2..6949bcd7 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a6b88f44..229dc08d 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d327c0c7..e4fede76 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 cf00acc9..31eb420e 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/controller.php b/admin/controller.php index 5d44cfcd..108fd8aa 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 96b95f9b..573adc3c 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 edffd118..217b80c8 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9af9714a..caf4f2d5 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 3f9bbd14..20835d3a 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a230866a..bfc40653 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e0d51965..ed021ecd 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1713a63a..6ff9c811 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ce7775ee..b7fac3f9 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 87ffb15e..53b900df 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e4a5024f..7fbd7811 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 231959d0..e5971d7e 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6df9c05d..0915712d 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 37c8cd46..e4d5c0af 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e8a6af0b..0aca959e 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php @@ -93,7 +93,7 @@ class CostbenefitprojectionControllerHealth_data_sets extends JControllerAdmin $session->set('dataType_VDM_IMPORTINTO', 'health_data'); // Redirect to import view. $message = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_SELECT_FILE_FOR_HEALTH_DATA_SETS'); - $this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import', false), $message); + $this->setRedirect(JRoute::_('index.php?option=com_costbenefitprojection&view=import_health_data_sets', false), $message); return; } } diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 5acb9f69..aaf96f81 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9602fc56..d0fe1b56 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a4372cc3..ba2d0dd7 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 98bfae67..0d5334b9 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/controllers/import_health_data_sets.php b/admin/controllers/import_health_data_sets.php new file mode 100644 index 00000000..0ed6b166 --- /dev/null +++ b/admin/controllers/import_health_data_sets.php @@ -0,0 +1,61 @@ + + @owner Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/-------------------------------------------------------------------------------------------------------/ + Cost Benefit Projection Tool. +/------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +/** + * Costbenefitprojection Import_health_data_sets Controller + */ +class CostbenefitprojectionControllerImport_health_data_sets extends JControllerLegacy +{ + /** + * Import an spreadsheet. + * + * @return void + */ + public function import() + { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + + $model = $this->getModel('Import_health_data_sets'); + if ($model->import()) + { + $cache = JFactory::getCache('mod_menu'); + $cache->clean(); + // TODO: Reset the users acl here as well to kill off any missing bits + } + + $app = JFactory::getApplication(); + $redirect_url = $app->getUserState('com_costbenefitprojection.redirect_url'); + if (empty($redirect_url)) + { + $redirect_url = JRoute::_('index.php?option=com_costbenefitprojection&view=import_health_data_sets', false); + } + else + { + // wipe out the user state when we're going to redirect + $app->setUserState('com_costbenefitprojection.redirect_url', ''); + $app->setUserState('com_costbenefitprojection.message', ''); + $app->setUserState('com_costbenefitprojection.extension_message', ''); + } + $this->setRedirect($redirect_url); + } +} diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index 104d0176..a06f37aa 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a63e3ea6..0af470a5 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 bb99d599..7cd039fb 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e29ab0e2..97063ce8 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 773f8008..c14f9bc4 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1d2f4ef6..a3b06983 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index 98f5f093..dc30da57 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4e1cba71..6091e382 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 3f0d7712..5651df16 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 dd7b25ea..ec2887be 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9588e0ec..ba4a39f8 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 73ae001a..13d15d7f 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -1,11 +1,14 @@ COM_COSTBENEFITPROJECTION="Cost Benefit Projection" COM_COSTBENEFITPROJECTION_ACCESS_TO_COMBINEDRESULTS_FAILED="Access to combinedresults was denied." +COM_COSTBENEFITPROJECTION_ADDING_CONTROL_STRUCTURE="Adding control structure" +COM_COSTBENEFITPROJECTION_ADVANCED_METHOD="Advanced Method" COM_COSTBENEFITPROJECTION_ALL_NUMBERS_IN_BRACKETS_ARE_THE_RELATED_EMPLOYEES="All numbers in brackets are the related employees." COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT="Annual Benefit" COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION="Annual Cost of Intervention" COM_COSTBENEFITPROJECTION_ANNUAL_COST_PER_EMPLOYEE="Annual Cost per Employee" COM_COSTBENEFITPROJECTION_AUTHOR="Author" COM_COSTBENEFITPROJECTION_BACK="Back" +COM_COSTBENEFITPROJECTION_BASIC_METHOD="Basic Method" COM_COSTBENEFITPROJECTION_CALCULATED_COSTS_IN_DETAIL="Calculated Costs in Detail" COM_COSTBENEFITPROJECTION_CAUSERISK="Cause/Risk" COM_COSTBENEFITPROJECTION_CAUSERISK_ALIAS="Alias" @@ -970,6 +973,7 @@ COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL_LABEL="URL" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_VERSION_DESC="A count of the number of times this Help Document has been revised." COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_VERSION_LABEL="Revision" COM_COSTBENEFITPROJECTION_HELP_MANAGER="Help" +COM_COSTBENEFITPROJECTION_HERE_YOU_CAN_SET_THE_IMPORT_RELATIONSHIPS_TO_ALL_ADVANCED_DATA_MAPPING_AND_RECONSTRUCTION="Here you can set the import relationships to all advanced data mapping and reconstruction." COM_COSTBENEFITPROJECTION_IMPORT_CONTINUE="Continue" COM_COSTBENEFITPROJECTION_IMPORT_DATA="Import Data" COM_COSTBENEFITPROJECTION_IMPORT_DATA_DESC=" Allows users in this group to import data." @@ -1349,6 +1353,7 @@ COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER_HINT="select a service provider" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_USER_LABEL="User (Service Provider)" COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_VERSION_DESC="A count of the number of times this Service Provider has been revised." COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_VERSION_LABEL="Revision" +COM_COSTBENEFITPROJECTION_SOON="Soon" COM_COSTBENEFITPROJECTION_SUBMENU_CAUSESRISKS="Causes/Risks" COM_COSTBENEFITPROJECTION_SUBMENU_COMPANIES="Companies" COM_COSTBENEFITPROJECTION_SUBMENU_COUNTRIES="Countries" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index b707f8c0..5c117725 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a6510387..b334ee15 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1c88393f..2dd5a68d 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4b5b9b9c..fc32ca84 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 517d420c..6b7179d6 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 cdc2bfc1..2a2eec3b 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8db0d28f..5412af6b 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9a15800e..4cd4ca6b 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c25b1834..d7867017 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a1e6c0f8..46355b66 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index 7a3182df..d00caec7 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a55ceef0..03e4427c 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 7aadcb73..398ba66a 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4b5b9b9c..fc32ca84 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d2a8a225..014e8029 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 cdc2bfc1..2a2eec3b 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8db0d28f..5412af6b 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8523707e..f1422c43 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 18ee3245..e327535d 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 20ac3b2c..1e1e4201 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 80678c6c..0fff441f 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f2dbbccd..131bf4c8 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 7ace06e7..79da3fad 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9b0dae6b..84ba0fce 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 bfbaa4f5..a8cf4060 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d5792f06..0daca4f7 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4b5b9b9c..fc32ca84 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0fd7d824..e09ffa0a 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 54047bfa..ea2736f9 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 04d15305..a074fc6b 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8a2c32ed..bf953f68 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4b5b9b9c..fc32ca84 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 57258270..de43f7bd 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9aeb3229..c9c71b00 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 077ce2f7..73cb92c2 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 de9135be..074478f8 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 3167a714..201e0bc8 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4b5b9b9c..fc32ca84 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6ce24dd4..31df9fa2 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5fb9dd0e..e31a1ab2 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 88607e57..111e87f0 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d9f1c6ca..84f9d428 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a55ceef0..03e4427c 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ced4b5d1..731265dd 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c525c245..d8016da9 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e89a71f2..44ba1398 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a55ceef0..03e4427c 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ced4b5d1..731265dd 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 20073eec..46dd82b8 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0cb1ab7e..c804f53c 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0f3ad151..bc657a11 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ede9a50c..14a2b343 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 95051e37..d465bcce 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ced4b5d1..731265dd 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 3be612da..ddfbe436 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index 2384ae7c..2caf4f2d 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/service_provider/details_left.php b/admin/layouts/service_provider/details_left.php index 666047d8..8166baec 100644 --- a/admin/layouts/service_provider/details_left.php +++ b/admin/layouts/service_provider/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/service_provider/details_right.php b/admin/layouts/service_provider/details_right.php index 6c5f6f61..7598e6b4 100644 --- a/admin/layouts/service_provider/details_right.php +++ b/admin/layouts/service_provider/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index 6c7c5880..c26f6c72 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ced4b5d1..731265dd 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 22b5e6e5..5cc978cb 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 41f4dbbd..97ca8e69 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9c4c6a1c..f9ae9c3c 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 793869c7..d89a63d8 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/models/companies.php b/admin/models/companies.php index 66501bf0..1e5ccbad 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/models/company.php b/admin/models/company.php index b3981476..fa5fe0c9 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index 22f7b6a5..660bac46 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index d92173f6..4df90dc9 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/models/countries.php b/admin/models/countries.php index 78b920a2..091cc598 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f517102b..e2d12166 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 17ab8d30..2159f093 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 fd9e86d0..b8d9e61b 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e9e970a5..d872074f 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b9bba851..e2bad296 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5f42e049..d03bef27 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 de989137..16089aef 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/fields/companycheck.php b/admin/models/fields/companycheck.php index 58c54da9..f2da4e99 100644 --- a/admin/models/fields/companycheck.php +++ b/admin/models/fields/companycheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companycheck.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 1f25a335..ee360a05 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 54ce9694..4b678a3b 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c31895a5..cc7e3a2c 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 82ec0a59..d21e52a2 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ba02347e..92ec28cb 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 7d2466ad..7e904185 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a8b65e17..b6f95bb0 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 82d111b2..365c1f1f 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 85ef3e84..a2547636 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b1de8bec..7fbd8b0f 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js index caf4131d..0bdf6384 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.js diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js index 9b66e223..88b664b4 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.js diff --git a/admin/models/forms/health_data.js b/admin/models/forms/health_data.js index 1ea88850..ca5f12a8 100644 --- a/admin/models/forms/health_data.js +++ b/admin/models/forms/health_data.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.js diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 22fb3ad6..5a9649dd 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.js diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index d767d5ce..546574b3 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index 510e1f2a..d4debba5 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.js diff --git a/admin/models/forms/service_provider.js b/admin/models/forms/service_provider.js index 835c56a4..d8d164af 100644 --- a/admin/models/forms/service_provider.js +++ b/admin/models/forms/service_provider.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.js diff --git a/admin/models/health_data.php b/admin/models/health_data.php index 74bea12e..feb7cf33 100644 --- a/admin/models/health_data.php +++ b/admin/models/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index b6937f44..74462671 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/models/help_document.php b/admin/models/help_document.php index efdbc314..8c1183da 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 54c5651c..8c59e580 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 59816995..02bede83 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php @@ -46,7 +46,7 @@ class CostbenefitprojectionModelImport extends JModelLegacy * Import Settings */ protected $getType = NULL; - protected $dataType = NULL; + protected $dataType = NULL; /** * Method to auto-populate the model state. diff --git a/admin/models/import_health_data_sets.php b/admin/models/import_health_data_sets.php new file mode 100644 index 00000000..9fa82228 --- /dev/null +++ b/admin/models/import_health_data_sets.php @@ -0,0 +1,750 @@ + + @owner Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/-------------------------------------------------------------------------------------------------------/ + Cost Benefit Projection Tool. +/------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +/** + * Costbenefitprojection Import_health_data_sets Model + */ +class CostbenefitprojectionModelImport_health_data_sets extends JModelLegacy +{ + /** + * @var object JTable object + */ + protected $_table = null; + + /** + * @var object JTable object + */ + protected $_url = null; + + /** + * Model context string. + * + * @var string + */ + protected $_context = 'com_costbenefitprojection.import_health_data_sets'; + + /** + * Import Settings + */ + protected $getType = NULL; + protected $dataType = NULL; + + /** + * Method to auto-populate the model state. + * + * Note. Calling getState in this method will result in recursion. + * + * @return void + * + */ + protected function populateState() + { + $app = JFactory::getApplication('administrator'); + + $this->setState('message', $app->getUserState('com_costbenefitprojection.message')); + $app->setUserState('com_costbenefitprojection.message', ''); + + // Recall the 'Import from Directory' path. + $path = $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory', $app->get('tmp_path')); + $this->setState('import.directory', $path); + // set uploading values + $this->use_streams = false; + $this->allow_unsafe = false; + $this->safeFileOptions = array(); + parent::populateState(); + } + + /** + * Import an spreadsheet from either folder, url or upload. + * + * @return boolean result of import + * + */ + public function import() + { + $this->setState('action', 'import'); + $app = JFactory::getApplication(); + $session = JFactory::getSession(); + $package = null; + $continue = false; + // get import type + $this->getType = $app->input->getString('gettype', NULL); + // get import type + $this->dataType = $session->get('dataType_VDM_IMPORTINTO', NULL); + + if ($package === null) + { + switch ($this->getType) + { + case 'folder': + // Remember the 'Import from Directory' path. + $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory'); + $package = $this->_getPackageFromFolder(); + break; + + case 'upload': + $package = $this->_getPackageFromUpload(); + break; + + case 'url': + $package = $this->_getPackageFromUrl(); + break; + + case 'continue-basic': + case 'continue-adv': + $continue = true; + $package = $session->get('package', null); + $package = json_decode($package, true); + // clear session + $session->clear('package'); + $session->clear('dataType'); + $session->clear('hasPackage'); + break; + + default: + $app->setUserState('com_costbenefitprojection.message', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_NO_IMPORT_TYPE_FOUND')); + return false; + break; + } + } + // Was the package valid? + if (!$package || !$package['type']) + { + if (in_array($this->getType, array('upload', 'url'))) + { + $this->remove($package['packagename']); + } + + $app->setUserState('com_costbenefitprojection.message', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE')); + return false; + } + + // first link data to table headers + if(!$continue){ + $package = json_encode($package); + $session->set('package', $package); + $session->set('dataType', $this->dataType); + $session->set('hasPackage', true); + return true; + } + // set the data + $headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false), true); + if (!$this->setData($package,$headerList)) + { + // There was an error importing the package + $msg = JText::_('COM_COSTBENEFITPROJECTION_IMPORT_ERROR'); + $back = $session->get('backto_VDM_IMPORT', NULL); + if ($back) + { + $app->setUserState('com_costbenefitprojection.redirect_url', 'index.php?option=com_costbenefitprojection&view='.$back); + $session->clear('backto_VDM_IMPORT'); + } + $result = false; + } + else + { + // Package imported sucessfully + $msg = JText::sprintf('COM_COSTBENEFITPROJECTION_IMPORT_SUCCESS', $package['packagename']); + $back = $session->get('backto_VDM_IMPORT', NULL); + if ($back) + { + $app->setUserState('com_costbenefitprojection.redirect_url', 'index.php?option=com_costbenefitprojection&view='.$back); + $session->clear('backto_VDM_IMPORT'); + } + $result = true; + } + + // Set some model state values + $app->enqueueMessage($msg); + + // remove file after import + $this->remove($package['packagename']); + $session->clear($this->getType.'_VDM_IMPORTHEADERS'); + return $result; + } + + /** + * Works out an importation spreadsheet from a HTTP upload + * + * @return spreadsheet definition or false on failure + */ + protected function _getPackageFromUpload() + { + // Get the uploaded file information + $input = JFactory::getApplication()->input; + + // Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get. + $userfile = $input->files->get('import_package', null, 'raw'); + + // Make sure that file uploads are enabled in php + if (!(bool) ini_get('file_uploads')) + { + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_WARNIMPORTFILE')); + return false; + } + + // If there is no uploaded file, we have a problem... + if (!is_array($userfile)) + { + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_NO_FILE_SELECTED')); + return false; + } + + // Check if there was a problem uploading the file. + if ($userfile['error'] || $userfile['size'] < 1) + { + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_WARNIMPORTUPLOADERROR')); + return false; + } + + // Build the appropriate paths + $config = JFactory::getConfig(); + $tmp_dest = $config->get('tmp_path') . '/' . $userfile['name']; + $tmp_src = $userfile['tmp_name']; + + // Move uploaded file + jimport('joomla.filesystem.file'); + $p_file = JFile::upload($tmp_src, $tmp_dest, $this->use_streams, $this->allow_unsafe, $this->safeFileOptions); + + // Was the package downloaded? + if (!$p_file) + { + $session = JFactory::getSession(); + $session->clear('package'); + $session->clear('dataType'); + $session->clear('hasPackage'); + // was not uploaded + return false; + } + + // check that this is a valid spreadsheet + $package = $this->check($userfile['name']); + + return $package; + } + + /** + * Import an spreadsheet from a directory + * + * @return array Spreadsheet details or false on failure + * + */ + protected function _getPackageFromFolder() + { + $input = JFactory::getApplication()->input; + + // Get the path to the package to import + $p_dir = $input->getString('import_directory'); + $p_dir = JPath::clean($p_dir); + // Did you give us a valid path? + if (!file_exists($p_dir)) + { + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY')); + return false; + } + + // Detect the package type + $type = $this->getType; + + // Did you give us a valid package? + if (!$type) + { + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE')); + } + + // check the extention + switch(strtolower(pathinfo($p_dir, PATHINFO_EXTENSION))){ + case 'xls': + case 'ods': + case 'csv': + break; + + default: + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE')); + return false; + break; + } + + $package['packagename'] = null; + $package['dir'] = $p_dir; + $package['type'] = $type; + + return $package; + } + + /** + * Import an spreadsheet from a URL + * + * @return Package details or false on failure + * + */ + protected function _getPackageFromUrl() + { + $input = JFactory::getApplication()->input; + + // Get the URL of the package to import + $url = $input->getString('import_url'); + + // Did you give us a URL? + if (!$url) + { + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_ENTER_A_URL')); + return false; + } + + // Download the package at the URL given + $p_file = JInstallerHelper::downloadPackage($url); + + // Was the package downloaded? + if (!$p_file) + { + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_INVALID_URL')); + return false; + } + + // check that this is a valid spreadsheet + $package = $this->check($p_file); + + return $package; + } + + /** + * Check a file and verifies it as a spreadsheet file + * Supports .csv .xlsx .xls and .ods + * + * @param string $p_filename The uploaded package filename or import directory + * + * @return array of elements + * + */ + protected function check($archivename) + { + // Clean the name + $archivename = JPath::clean($archivename); + + // check the extention + switch(strtolower(pathinfo($archivename, PATHINFO_EXTENSION))){ + case 'xls': + case 'ods': + case 'csv': + break; + + default: + // Cleanup the import files + $this->remove($archivename); + JError::raiseWarning('', JText::_('COM_COSTBENEFITPROJECTION_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE')); + return false; + break; + } + + $config = JFactory::getConfig(); + // set Package Name + $check['packagename'] = $archivename; + + // set directory + $check['dir'] = $config->get('tmp_path'). '/' .$archivename; + + // set type + $check['type'] = $this->getType; + + return $check; + } + + /** + * Clean up temporary uploaded spreadsheet + * + * @param string $package Name of the uploaded spreadsheet file + * + * @return boolean True on success + * + */ + protected function remove($package) + { + jimport('joomla.filesystem.file'); + + $config = JFactory::getConfig(); + $package = $config->get('tmp_path'). '/' .$package; + + // Is the package file a valid file? + if (is_file($package)) + { + JFile::delete($package); + } + elseif (is_file(JPath::clean($package))) + { + // It might also be just a base filename + JFile::delete(JPath::clean($package)); + } + } + + /** + * Set the data from the spreadsheet to the database + * + * @param string $package Paths to the uploaded package file + * + * @return boolean false on failure + * + **/ + protected function setData($package,$target_headers) + { + // make sure the file is loaded + JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers'); + $jinput = JFactory::getApplication()->input; + // set the data based on the type of import being done + if ('continue-basic' == $this->getType && CostbenefitprojectionHelper::checkArray($target_headers)) + { + foreach($target_headers as $header) + { + $data['target_headers'][$header] = $jinput->getString($header, null); + } + // set the data + if(isset($package['dir'])) + { + $inputFileType = PHPExcel_IOFactory::identify($package['dir']); + $excelReader = PHPExcel_IOFactory::createReader($inputFileType); + $excelReader->setReadDataOnly(true); + $excelObj = $excelReader->load($package['dir']); + $data['array'] = $excelObj->getActiveSheet()->toArray(null, true,true,true); + $excelObj->disconnectWorksheets(); + unset($excelObj); + return $this->save($data); + } + } + elseif ('continue-adv' == $this->getType) + { + var_dump('we got the new builder'); exit; + + // Get a db connection. + $db = JFactory::getDbo(); + // get list of cause & risks + // Create a new query object. + $query = $db->getQuery(true); + // Select all disease names. + // Order it by the disease_name field. + $query->select($db->quoteName('importname')); + $query->from($db->quoteName('#__costbenefitprojection_causerisk')); + $query->order('importname ASC'); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + // set global for import + $get_list = $db->loadColumn(); + // todays date + $dateSql = JFactory::getDate()->toSql(); + // ages to get + $ages = array("15-19 years","20-24 years","25-29 years","30-34 years","35-39 years","40-44 years","45-49 years","50-54 years","55-59 years","60-64 years"); + // the types + $types = array("death","yld"); + // the gender + $genders = array("Males","Females"); + // to get the totals + $totals = array("Total (All Causes)"); + + } + return false; + } + + /** + * Save the data from the file to the database + * + * @param string $package Paths to the uploaded package file + * + * @return boolean false on failure + * + **/ + protected function save($data) + { + // import the data if there is any + if(CostbenefitprojectionHelper::checkArray($data['array'])) + { + // get user object + $user = JFactory::getUser(); + // remove header if it has headers + $id_key = $data['target_headers']['id']; + $published_key = $data['target_headers']['published']; + $ordering_key = $data['target_headers']['ordering']; + // get the first array set + $firstSet = reset($data['array']); + + // check if first array is a header array and remove if true + if($firstSet[$id_key] == 'id' || $firstSet[$published_key] == 'published' || $firstSet[$ordering_key] == 'ordering') + { + array_shift($data['array']); + } + + // make sure there is still values in array and that it was not only headers + if(CostbenefitprojectionHelper::checkArray($data['array']) && $user->authorise($this->dataType.'.import', 'com_costbenefitprojection') && $user->authorise('core.import', 'com_costbenefitprojection')) + { + // set target. + $target = array_flip($data['target_headers']); + // Get a db connection. + $db = JFactory::getDbo(); + // set some defaults + $todayDate = JFactory::getDate()->toSql(); + // get global action permissions + $canDo = CostbenefitprojectionHelper::getActions($this->dataType); + $canEdit = $canDo->get('core.edit'); + $canState = $canDo->get('core.edit.state'); + $canCreate = $canDo->get('core.create'); + $hasAlias = $this->getAliasesUsed($this->dataType); + // prosses the data + foreach($data['array'] as $row) + { + $found = false; + if (isset($row[$id_key]) && is_numeric($row[$id_key]) && $row[$id_key] > 0) + { + // raw items import & update! + $query = $db->getQuery(true); + $query + ->select('version') + ->from($db->quoteName('#__costbenefitprojection_'.$this->dataType)) + ->where($db->quoteName('id') . ' = '. $db->quote($row[$id_key])); + // Reset the query using our newly populated query object. + $db->setQuery($query); + $db->execute(); + $found = $db->getNumRows(); + } + + if($found && $canEdit) + { + // update item + $id = $row[$id_key]; + $version = $db->loadResult(); + // reset all buckets + $query = $db->getQuery(true); + $fields = array(); + // Fields to update. + foreach($row as $key => $cell) + { + // ignore column + if ('IGNORE' == $target[$key]) + { + continue; + } + // update modified + if ('modified_by' == $target[$key]) + { + continue; + } + // update modified + if ('modified' == $target[$key]) + { + continue; + } + // update version + if ('version' == $target[$key]) + { + $cell = (int) $version + 1; + } + // verify publish authority + if ('published' == $target[$key] && !$canState) + { + continue; + } + // set to update array + if(in_array($key, $data['target_headers']) && is_numeric($cell)) + { + $fields[] = $db->quoteName($target[$key]) . ' = ' . $cell; + } + elseif(in_array($key, $data['target_headers']) && is_string($cell)) + { + $fields[] = $db->quoteName($target[$key]) . ' = ' . $db->quote($cell); + } + elseif(in_array($key, $data['target_headers']) && is_null($cell)) + { + // if import data is null then set empty + $fields[] = $db->quoteName($target[$key]) . " = ''"; + } + } + // load the defaults + $fields[] = $db->quoteName('modified_by') . ' = ' . $db->quote($user->id); + $fields[] = $db->quoteName('modified') . ' = ' . $db->quote($todayDate); + // Conditions for which records should be updated. + $conditions = array( + $db->quoteName('id') . ' = ' . $id + ); + + $query->update($db->quoteName('#__costbenefitprojection_'.$this->dataType))->set($fields)->where($conditions); + $db->setQuery($query); + $db->execute(); + } + elseif ($canCreate) + { + // insert item + $query = $db->getQuery(true); + // reset all buckets + $columns = array(); + $values = array(); + $version = false; + // Insert columns. Insert values. + foreach($row as $key => $cell) + { + // ignore column + if ('IGNORE' == $target[$key]) + { + continue; + } + // remove id + if ('id' == $target[$key]) + { + continue; + } + // update created + if ('created_by' == $target[$key]) + { + continue; + } + // update created + if ('created' == $target[$key]) + { + continue; + } + // Make sure the alias is incremented + if ('alias' == $target[$key]) + { + $cell = $this->getAlias($cell,$this->dataType); + } + // update version + if ('version' == $target[$key]) + { + $cell = 1; + $version = true; + } + // set to insert array + if(in_array($key, $data['target_headers']) && is_numeric($cell)) + { + $columns[] = $target[$key]; + $values[] = $cell; + } + elseif(in_array($key, $data['target_headers']) && is_string($cell)) + { + $columns[] = $target[$key]; + $values[] = $db->quote($cell); + } + elseif(in_array($key, $data['target_headers']) && is_null($cell)) + { + // if import data is null then set empty + $columns[] = $target[$key]; + $values[] = "''"; + } + } + // load the defaults + $columns[] = 'created_by'; + $values[] = $db->quote($user->id); + $columns[] = 'created'; + $values[] = $db->quote($todayDate); + if (!$version) + { + $columns[] = 'version'; + $values[] = 1; + } + // Prepare the insert query. + $query + ->insert($db->quoteName('#__costbenefitprojection_'.$this->dataType)) + ->columns($db->quoteName($columns)) + ->values(implode(',', $values)); + // Set the query using our newly populated query object and execute it. + $db->setQuery($query); + $done = $db->execute(); + if ($done) + { + $aId = $db->insertid(); + // make sure the access of asset is set + CostbenefitprojectionHelper::setAsset($aId,$this->dataType); + } + } + else + { + return false; + } + } + return true; + } + } + return false; + } + + protected function getAlias($name,$type = false) + { + // sanitize the name to an alias + if (JFactory::getConfig()->get('unicodeslugs') == 1) + { + $alias = JFilterOutput::stringURLUnicodeSlug($name); + } + else + { + $alias = JFilterOutput::stringURLSafe($name); + } + // must be a uniqe alias + if ($type) + { + return $this->getUniqe($alias,'alias',$type); + } + return $alias; + } + + /** + * Method to generate a uniqe value. + * + * @param string $field name. + * @param string $value data. + * @param string $type table. + * + * @return string New value. + */ + protected function getUniqe($value,$field,$type) + { + // insure the filed is always uniqe + while (isset($this->uniqeValueArray[$type][$field][$value])) + { + $value = JString::increment($value, 'dash'); + } + $this->uniqeValueArray[$type][$field][$value] = $value; + return $value; + } + + protected function getAliasesUsed($table) + { + // Get a db connection. + $db = JFactory::getDbo(); + // first we check if there is a alias column + $columns = $db->getTableColumns('#__costbenefitprojection_'.$table); + if(isset($columns['alias'])){ + // Create a new query object. + $query = $db->getQuery(true); + $query->select($db->quoteName(array('alias'))); + $query->from($db->quoteName('#__costbenefitprojection_'.$table)); + $db->setQuery($query); + $db->execute(); + if ($db->getNumRows()) + { + $aliases = $db->loadColumn(); + foreach($aliases as $alias) + { + $this->uniqeValueArray[$table]['alias'][$alias] = $alias; + } + } + return true; + } + return false; + } +} diff --git a/admin/models/intervention.php b/admin/models/intervention.php index 9a86c6d1..44c6df92 100644 --- a/admin/models/intervention.php +++ b/admin/models/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/models/interventions.php b/admin/models/interventions.php index 2e21399f..ee3d5af9 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php index 9dff127e..10cfa894 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index ff9539b8..3dba7e44 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 08821a18..66ef28e5 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index 73816b76..3a0cfd7f 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e789be79..11d5cfda 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -940,7 +940,7 @@ INSERT INTO `#__costbenefitprojection_causerisk` (`id`, `alias`, `description`, -- INSERT INTO `#__costbenefitprojection_health_data` (`id`, `causerisk`, `country`, `femaledeath`, `femaleyld`, `maledeath`, `maleyld`, `year`, `params`, `published`, `created_by`, `modified_by`, `created`, `modified`, `checked_out`, `checked_out_time`, `version`, `hits`, `access`, `ordering`) VALUES -(1, 1, 146, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[46.3793,234.16,477.483,555.166,529.772,428.857,352.866,214.388,178.984,150.74]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[178.713,744.408,2242.74,2815.4,2938.78,2130.71,1614.33,1066.78,990.016,716.162]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[32.8181,117.749,346.287,538.703,696.208,682.248,686.295,556.957,487.59,460.879]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[248.839,471.109,1624.2,2603.64,3582.07,3454.67,3570.7,2500.97,2850.36,1622.08]}', 2010, '', 1, '', 845, '2014-04-30 02:24:33', '2015-09-06 02:29:39', '', '0000-00-00 00:00:00', 6, '', 2, ''), +(1, 1, 146, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[46.3793,234.16,477.483,555.166,529.772,428.857,352.866,214.388,178.984,150.74]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[178.713,744.408,2242.74,2815.4,2938.78,2130.71,1614.33,1066.78,990.016,716.162]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[32.8181,117.749,346.287,538.703,696.208,682.248,686.295,556.957,487.59,460.879]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[248.839,471.109,1624.2,2603.64,3582.07,3454.67,3570.7,2500.97,2850.36,1622.08]}', 2010, '', 1, '', 450, '2014-04-30 02:24:33', '2016-05-05 03:20:59', '', '0000-00-00 00:00:00', 16, '', 2, ''), (2, 2, 146, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[8.24735,16.0503,14.5321,14.9564,16.5978,21.7498,29.8159,38.5368,59.8757,78.3472]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[48.4955,72.0443,188.735,226.306,271.605,346.617,396.822,367.363,443.855,319.841]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[11.923,30.4912,48.5095,63.0872,74.7477,100.983,141.175,208.398,265.937,333.805]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[123.226,179.899,560.179,806.62,962.532,1152.51,1435.38,1106.52,1423.39,798.232]}', 2010, '', 1, '', 845, '2014-04-30 02:24:33', '2015-09-06 02:10:06', '', '0000-00-00 00:00:00', 1, '', 2, ''), (3, 3, 146, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[38.1319,218.11,462.951,540.209,513.174,407.108,323.05,175.852,119.108,72.3927]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[130.217,672.363,2054,2589.09,2667.17,1784.1,1217.51,699.413,546.16,396.321]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[20.8952,87.2578,297.777,475.616,621.46,581.264,545.12,348.559,221.653,127.074]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[125.613,291.21,1064.02,1797.02,2619.53,2302.15,2135.32,1394.45,1426.97,823.843]}', 2010, '', 1, '', 845, '2014-04-30 02:24:33', '2015-09-06 02:10:06', '', '0000-00-00 00:00:00', 1, '', 2, ''), (4, 4, 146, '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[8.02791,45.9186,97.6289,114.766,110.145,85.8119,68.0118,37.022,25.0758,15.2408]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[37.8955,56.6701,149.048,176.87,214.213,272.904,309.906,286.458,346.943,249.511]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[4.39906,18.3704,62.691,100.131,130.844,122.374,114.764,73.382,46.6646,26.7528]}', '{\"age\":[\"15-19\",\"20-24\",\"25-29\",\"30-34\",\"35-39\",\"40-44\",\"45-49\",\"50-54\",\"55-59\",\"60-64\"],\"number\":[96.2047,141.008,439.947,630.98,751.261,896.67,1114.54,862.183,1107.65,621.835]}', 2010, '', 1, '', 845, '2014-04-30 02:24:33', '2015-09-06 02:10:06', '', '0000-00-00 00:00:00', 1, '', 2, ''), diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index 461bd5f8..24ac75c8 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 86011701..c82600dd 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 24e500b7..04db0a5b 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5cb1209b..b90c4f1f 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1dba3015..c2d5c053 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 afc8ab9b..1b06a3c8 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8b87ddc9..0b7135e7 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 2c43ca1d..f31edf5a 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 fc55d89d..3bf651c7 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/vdm.php b/admin/vdm.php index 2b897d0e..38bb5708 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1a6c10f0..2b2d83ab 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 3503b551..fe82b239 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a5408acb..10130bcd 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5ef9b46b..a6430c78 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e4c6890f..36f8c57e 100644 --- a/admin/views/causesrisks/tmpl/default_batch_body.php +++ b/admin/views/causesrisks/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e258f762..0c396525 100644 --- a/admin/views/causesrisks/tmpl/default_batch_footer.php +++ b/admin/views/causesrisks/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 84fd002f..779a8818 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b4ecc6cd..3bec62a4 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0ebb8668..d2c13067 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ae930ace..a6179d52 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f02a2121..ac1fe278 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 59476574..f5dffbb5 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8ea19374..e0c86a77 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4345e26a..6ff75f16 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d5b53367..ebe8916b 100644 --- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 06a5b5e9..d8cef665 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0c49cb05..acd08cf0 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e5832869..b02bd338 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b07a5e02..cb323e36 100644 --- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 2a4da021..5f2afbf4 100644 --- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9605be65..bdf0e9e4 100644 --- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 11898e30..cf2f2039 100644 --- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 bfdebf66..50063365 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 06559cd1..03447516 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 554bc81d..0f14a2ac 100644 --- a/admin/views/companies/tmpl/default_batch_body.php +++ b/admin/views/companies/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d389402d..a37fdefe 100644 --- a/admin/views/companies/tmpl/default_batch_footer.php +++ b/admin/views/companies/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 cb844203..fce0ae87 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php index e1a3e4bf..ada963bc 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php index c67cd566..891fcc03 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php index 34f66aa8..6d4ebdd3 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e70c537e..df3fada9 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js index d969b34c..45ef69f9 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 35125c65..b500c83b 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 64b494a5..e2e0a904 100644 --- a/admin/views/company/view.html.php +++ b/admin/views/company/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c3e163fc..81175cb2 100644 --- a/admin/views/companyresults/tmpl/default.php +++ b/admin/views/companyresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8ea19374..e0c86a77 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost.php +++ b/admin/views/companyresults/tmpl/default_chart_cost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4345e26a..6ff75f16 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d5b53367..ebe8916b 100644 --- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 06a5b5e9..d8cef665 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0c49cb05..acd08cf0 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 @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e5832869..b02bd338 100644 --- a/admin/views/companyresults/tmpl/default_main.php +++ b/admin/views/companyresults/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b07a5e02..cb323e36 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 @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 2a4da021..5f2afbf4 100644 --- a/admin/views/companyresults/tmpl/default_table_cost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9605be65..bdf0e9e4 100644 --- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 11898e30..cf2f2039 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 @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8094a5fe..94dfce61 100644 --- a/admin/views/companyresults/tmpl/default_variables.php +++ b/admin/views/companyresults/tmpl/default_variables.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9c9d6d7e..3f74e5d2 100644 --- a/admin/views/companyresults/view.html.php +++ b/admin/views/companyresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 2b367057..412cb14a 100644 --- a/admin/views/costbenefitprojection/tmpl/default.php +++ b/admin/views/costbenefitprojection/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d62cf8f0..e7e22e80 100644 --- a/admin/views/costbenefitprojection/tmpl/default_main.php +++ b/admin/views/costbenefitprojection/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 86632ba1..0a5bd04b 100644 --- a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php +++ b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f2fbcfe1..e5b4867e 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vdm.php +++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 454e4bf7..b09f68f2 100644 --- a/admin/views/costbenefitprojection/view.html.php +++ b/admin/views/costbenefitprojection/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 fb018473..49f86de2 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 92256204..8de40ee8 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 26163016..5cdcfe97 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1abcf308..80e1bfc5 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e1a3e4bf..ada963bc 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 217ae0c2..4170fa2c 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d1baa505..1d0f647c 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5658d31a..52cde080 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d49e4bad..51c6589c 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e1ad0979..aa6016ea 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e935801a..2252c876 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 fc7818b8..e8863e8c 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 3f0d0a09..5e2e92e7 100644 --- a/admin/views/currencies/tmpl/default_batch_body.php +++ b/admin/views/currencies/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e2047e96..1bec3ea2 100644 --- a/admin/views/currencies/tmpl/default_batch_footer.php +++ b/admin/views/currencies/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6b56e9a2..e055d585 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5822d399..b0380c1f 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 3407d1d3..7efe25cd 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 647bfcb4..f3c37577 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ccd9ea32..3f3c6792 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 47146533..aa54f448 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4b375fff..e0f0797e 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ac6869de..b496e212 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c48cbb85..9b3cfdd6 100644 --- a/admin/views/health_data/submitbutton.js +++ b/admin/views/health_data/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9eac3994..35e3613e 100644 --- a/admin/views/health_data/tmpl/edit.php +++ b/admin/views/health_data/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 104d498f..7983e6bb 100644 --- a/admin/views/health_data/view.html.php +++ b/admin/views/health_data/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1352667a..dd90afa1 100644 --- a/admin/views/health_data_sets/tmpl/default.php +++ b/admin/views/health_data_sets/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 097a8157..4a3d1e87 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_body.php +++ b/admin/views/health_data_sets/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e5e0ad45..17326619 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_footer.php +++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b8fea522..5735406d 100644 --- a/admin/views/health_data_sets/tmpl/default_body.php +++ b/admin/views/health_data_sets/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c6b59dbd..2f393698 100644 --- a/admin/views/health_data_sets/tmpl/default_foot.php +++ b/admin/views/health_data_sets/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5c508edf..38a83423 100644 --- a/admin/views/health_data_sets/tmpl/default_head.php +++ b/admin/views/health_data_sets/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e20cf0ab..eb1e60f2 100644 --- a/admin/views/health_data_sets/tmpl/default_toolbar.php +++ b/admin/views/health_data_sets/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b5f59276..0792396c 100644 --- a/admin/views/health_data_sets/view.html.php +++ b/admin/views/health_data_sets/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 fbcf7002..74b73a15 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 93f12f74..ca6843f5 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 65959889..ab4f2b5c 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c9e2f9dc..a5659bdc 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c98f5efd..0f74c652 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4d58441a..f9cd7384 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 10b10c39..db3c3765 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e1a3e4bf..ada963bc 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f94880e3..226ba189 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 45697d6e..24aecef2 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 7bec6f65..effa5b1d 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c27cdaf1..50afa45f 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php @@ -25,8 +25,7 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('script', 'system/core.js', false, true); ?> @@ -139,89 +138,87 @@ JHtml::_('script', 'system/core.js', false, true);
- - hasPackage && CostbenefitprojectionHelper::checkArray($this->headerList) && CostbenefitprojectionHelper::checkArray($this->headers)) : ?> -
- -
- -
- -
-
- headerList as $name => $title): ?> -
- -
- -
-
- -
- -
-
- - + + hasPackage && CostbenefitprojectionHelper::checkArray($this->headerList) && CostbenefitprojectionHelper::checkArray($this->headers)) : ?> +
+ +
+ +
+ +
+
+ headerList as $name => $title): ?> +
+ +
+ +
+
+ +
+ +
+
+ + 'upload')); ?> - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - -
- -
- -
- -
-
-
-     (.csv .xls .ods) -
-
- - - - + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + - - - + + + -
+ \ No newline at end of file diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 855b58a5..35cf968f 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/import_health_data_sets/index.html b/admin/views/import_health_data_sets/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/admin/views/import_health_data_sets/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/admin/views/import_health_data_sets/tmpl/default.php b/admin/views/import_health_data_sets/tmpl/default.php new file mode 100644 index 00000000..f937b50d --- /dev/null +++ b/admin/views/import_health_data_sets/tmpl/default.php @@ -0,0 +1,263 @@ + + @owner Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/-------------------------------------------------------------------------------------------------------/ + Cost Benefit Projection Tool. +/------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +JHtml::_('jquery.framework'); +JHtml::_('bootstrap.tooltip'); +JHtml::_('script', 'system/core.js', false, true); +?> + + + +
+
+ + sidebar)) : ?> +
+ sidebar; ?> +
+
+ +
+ + + hasPackage && CostbenefitprojectionHelper::checkArray($this->headerList) && CostbenefitprojectionHelper::checkArray($this->headers)) : ?> + 'basic')); ?> + + +
+ +
+ +
+ +
+
+ headerList as $name => $title): ?> +
+ +
+ +
+
+ +
+ +
+
+ + + +
+ +
+ +
+ +
+
+
+ +
+
+ + + + + + 'upload')); ?> + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + + +
+ +
+ +
+ +
+
+
+     (.csv .xls .ods) +
+
+ + + + + + + +
diff --git a/admin/views/import_health_data_sets/tmpl/index.html b/admin/views/import_health_data_sets/tmpl/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/admin/views/import_health_data_sets/tmpl/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/admin/views/import_health_data_sets/view.html.php b/admin/views/import_health_data_sets/view.html.php new file mode 100644 index 00000000..3993c07d --- /dev/null +++ b/admin/views/import_health_data_sets/view.html.php @@ -0,0 +1,104 @@ + + @owner Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + +/-------------------------------------------------------------------------------------------------------/ + Cost Benefit Projection Tool. +/------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import Joomla view library +jimport('joomla.application.component.view'); + +/** + * Costbenefitprojection Import_health_data_sets View + */ +class CostbenefitprojectionViewImport_health_data_sets extends JViewLegacy +{ + protected $headerList; + protected $hasPackage = false; + protected $headers; + protected $hasHeader = 0; + protected $dataType; + + public function display($tpl = null) + { + if ($this->getLayout() !== 'modal') + { + // Include helper submenu + CostbenefitprojectionHelper::addSubmenu('import'); + } + + // Check for errors. + if (count($errors = $this->get('Errors'))){ + JError::raiseError(500, implode('
', $errors)); + return false; + } + + $paths = new stdClass; + $paths->first = ''; + $state = $this->get('state'); + + $this->paths = &$paths; + $this->state = &$state; + // get global action permissions + $this->canDo = CostbenefitprojectionHelper::getActions('import'); + + // We don't need toolbar in the modal window. + if ($this->getLayout() !== 'modal') + { + $this->addToolbar(); + $this->sidebar = JHtmlSidebar::render(); + } + + // get the session object + $session = JFactory::getSession(); + // check if it has package + $this->hasPackage = $session->get('hasPackage', false); + $this->dataType = $session->get('dataType', false); + if($this->hasPackage && $this->dataType) + { + $this->headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false),true); + $this->headers = CostbenefitprojectionHelper::getFileHeaders($this->dataType); + // clear the data type + $session->clear('dataType'); + } + + // Display the template + parent::display($tpl); + } + + /** + * Setting the toolbar + */ + protected function addToolBar() + { + JToolBarHelper::title(JText::_('COM_COSTBENEFITPROJECTION_IMPORT_TITLE'), 'upload'); + JHtmlSidebar::setAction('index.php?option=com_costbenefitprojection&view=import_health_data_sets'); + + if ($this->canDo->get('core.admin') || $this->canDo->get('core.options')) + { + JToolBarHelper::preferences('com_costbenefitprojection'); + } + + // set help url for this view if found + $help_url = CostbenefitprojectionHelper::getHelpUrl('import_health_data_sets'); + if (CostbenefitprojectionHelper::checkString($help_url)) + { + JToolbarHelper::help('COM_COSTBENEFITPROJECTION_HELP_MANAGER', false, $help_url); + } + } +} diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js index 5feaee7d..1139fa7f 100644 --- a/admin/views/intervention/submitbutton.js +++ b/admin/views/intervention/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 562073f9..68c43060 100644 --- a/admin/views/intervention/tmpl/edit.php +++ b/admin/views/intervention/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 86246590..ae6e6906 100644 --- a/admin/views/intervention/view.html.php +++ b/admin/views/intervention/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c47a0f63..9de90607 100644 --- a/admin/views/interventions/tmpl/default.php +++ b/admin/views/interventions/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ca887499..fa5e62ec 100644 --- a/admin/views/interventions/tmpl/default_batch_body.php +++ b/admin/views/interventions/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 169a889e..3b6c725c 100644 --- a/admin/views/interventions/tmpl/default_batch_footer.php +++ b/admin/views/interventions/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f132eb45..e9451c9d 100644 --- a/admin/views/interventions/tmpl/default_body.php +++ b/admin/views/interventions/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5822d399..b0380c1f 100644 --- a/admin/views/interventions/tmpl/default_foot.php +++ b/admin/views/interventions/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b9f2b986..3d9c3804 100644 --- a/admin/views/interventions/tmpl/default_head.php +++ b/admin/views/interventions/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b2e303fb..849e6adc 100644 --- a/admin/views/interventions/tmpl/default_toolbar.php +++ b/admin/views/interventions/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 85b044f4..5cc24fc4 100644 --- a/admin/views/interventions/view.html.php +++ b/admin/views/interventions/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 24dea6df..075b5d09 100644 --- a/admin/views/scaling_factor/submitbutton.js +++ b/admin/views/scaling_factor/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 348a8980..f81a7c41 100644 --- a/admin/views/scaling_factor/tmpl/edit.php +++ b/admin/views/scaling_factor/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f17a270d..3c8456d7 100644 --- a/admin/views/scaling_factor/view.html.php +++ b/admin/views/scaling_factor/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 45fda423..7063c83b 100644 --- a/admin/views/scaling_factors/tmpl/default.php +++ b/admin/views/scaling_factors/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5905a039..ff7b8de2 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_body.php +++ b/admin/views/scaling_factors/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 99239b23..e75a4489 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_footer.php +++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9e71d9dd..1b8483b9 100644 --- a/admin/views/scaling_factors/tmpl/default_body.php +++ b/admin/views/scaling_factors/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a1446c24..d2a9a1e6 100644 --- a/admin/views/scaling_factors/tmpl/default_foot.php +++ b/admin/views/scaling_factors/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 bd1b9f07..258cb186 100644 --- a/admin/views/scaling_factors/tmpl/default_head.php +++ b/admin/views/scaling_factors/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 17117205..16bec60d 100644 --- a/admin/views/scaling_factors/tmpl/default_toolbar.php +++ b/admin/views/scaling_factors/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 83df9962..9a994ef4 100644 --- a/admin/views/scaling_factors/view.html.php +++ b/admin/views/scaling_factors/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 682e471d..b3e42122 100644 --- a/admin/views/service_provider/submitbutton.js +++ b/admin/views/service_provider/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 08a86c8f..a1d0ea0d 100644 --- a/admin/views/service_provider/tmpl/edit.php +++ b/admin/views/service_provider/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0e9b467a..bec9549d 100644 --- a/admin/views/service_provider/view.html.php +++ b/admin/views/service_provider/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0b333573..978f7d84 100644 --- a/admin/views/service_providers/tmpl/default.php +++ b/admin/views/service_providers/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 067378d3..6dc7f7f1 100644 --- a/admin/views/service_providers/tmpl/default_batch_body.php +++ b/admin/views/service_providers/tmpl/default_batch_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 31da4b83..5f66e990 100644 --- a/admin/views/service_providers/tmpl/default_batch_footer.php +++ b/admin/views/service_providers/tmpl/default_batch_footer.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 bdf31d36..085d5b09 100644 --- a/admin/views/service_providers/tmpl/default_body.php +++ b/admin/views/service_providers/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e1a3e4bf..ada963bc 100644 --- a/admin/views/service_providers/tmpl/default_foot.php +++ b/admin/views/service_providers/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b072a4cb..c900f9c7 100644 --- a/admin/views/service_providers/tmpl/default_head.php +++ b/admin/views/service_providers/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 22a72ada..92b9afab 100644 --- a/admin/views/service_providers/tmpl/default_toolbar.php +++ b/admin/views/service_providers/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 76b7db8d..f2057fdb 100644 --- a/admin/views/service_providers/view.html.php +++ b/admin/views/service_providers/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml index 75dac5aa..acb77b07 100644 --- a/costbenefitprojection.xml +++ b/costbenefitprojection.xml @@ -1,7 +1,7 @@ COM_COSTBENEFITPROJECTION - 2nd May, 2016 + 5th May, 2016 Llewellyn van der Merwe llewellyn@vdm.io http://www.vdm.io diff --git a/script.php b/script.php index be27a4dd..37dab2cb 100644 --- a/script.php +++ b/script.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage script.php diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css index 4d463c7d..02004dd2 100644 --- a/site/assets/css/combinedresults.css +++ b/site/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 f9ad16d0..354c6b4f 100644 --- a/site/assets/css/company.css +++ b/site/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 2c36f7cb..35f6a8ec 100644 --- a/site/assets/css/companyresults.css +++ b/site/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d13ab70b..ea7113d9 100644 --- a/site/assets/css/cpanel.css +++ b/site/assets/css/cpanel.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c0457b7..ab15e3ca 100644 --- a/site/assets/css/createaccount.css +++ b/site/assets/css/createaccount.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 1af941b2..66597f4d 100644 --- a/site/assets/css/intervention.css +++ b/site/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 433a0508..1239022b 100644 --- a/site/assets/css/publicresults.css +++ b/site/assets/css/publicresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a516abb2..6949bcd7 100644 --- a/site/assets/css/scaling_factor.css +++ b/site/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a3f10ebf..48af661d 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.css diff --git a/site/controller.php b/site/controller.php index c1c4eb84..87f3e5d1 100644 --- a/site/controller.php +++ b/site/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 96b95f9b..573adc3c 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 49cb0764..9bbe9309 100644 --- a/site/controllers/company.php +++ b/site/controllers/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6081f0e0..bf5a1328 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 df5d4f62..3095c35f 100644 --- a/site/controllers/intervention.php +++ b/site/controllers/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 00736e4b..16ae5a0f 100644 --- a/site/controllers/scaling_factor.php +++ b/site/controllers/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php index 02782d4b..c9f51bdb 100644 --- a/site/costbenefitprojection.php +++ b/site/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 03298c0d..84d75afd 100644 --- a/site/helpers/costbenefitprojection.php +++ b/site/helpers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d1fd810a..1724c280 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a50141b8..e2da1dfc 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 3165c9ad..9531f7e0 100644 --- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -4,8 +4,10 @@ COM_COSTBENEFITPROJECTION_ABSENTEEISM_FEMALES="Absenteeism Females" COM_COSTBENEFITPROJECTION_ABSENTEEISM_MALES="Absenteeism Males" COM_COSTBENEFITPROJECTION_ACCESS_BACKEND_LOGOUT_FROM_THIS_AREA="Access backend & logout from this area." COM_COSTBENEFITPROJECTION_ACCESS_TO_COMBINEDRESULTS_FAILED="Access to combinedresults was denied." +COM_COSTBENEFITPROJECTION_ADDING_CONTROL_STRUCTURE="Adding control structure" COM_COSTBENEFITPROJECTION_ADDRESS="Address" COM_COSTBENEFITPROJECTION_ADVANCED="Advanced" +COM_COSTBENEFITPROJECTION_ADVANCED_METHOD="Advanced Method" COM_COSTBENEFITPROJECTION_ADVANCED_PROFILE="Advanced Profile" COM_COSTBENEFITPROJECTION_AGE="Age" COM_COSTBENEFITPROJECTION_AGE_GROUPS="Age Groups" @@ -21,6 +23,7 @@ COM_COSTBENEFITPROJECTION_ARCHIVED="Archived" COM_COSTBENEFITPROJECTION_AUTHOR="Author" COM_COSTBENEFITPROJECTION_BACK="Back" COM_COSTBENEFITPROJECTION_BASIC="Basic" +COM_COSTBENEFITPROJECTION_BASIC_METHOD="Basic Method" COM_COSTBENEFITPROJECTION_BASIC_PROFILE="Basic Profile" COM_COSTBENEFITPROJECTION_CALCULATED_COSTS_IN_DETAIL="Calculated Costs in Detail" COM_COSTBENEFITPROJECTION_CAUSERISK="Cause/Risk" @@ -1014,6 +1017,7 @@ COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_URL_LABEL="URL" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_VERSION_DESC="A count of the number of times this Help Document has been revised." COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_VERSION_LABEL="Revision" COM_COSTBENEFITPROJECTION_HELP_MANAGER="Help" +COM_COSTBENEFITPROJECTION_HERE_YOU_CAN_SET_THE_IMPORT_RELATIONSHIPS_TO_ALL_ADVANCED_DATA_MAPPING_AND_RECONSTRUCTION="Here you can set the import relationships to all advanced data mapping and reconstruction." COM_COSTBENEFITPROJECTION_HTWOTHE_SERVICE_PROVIDERS_IN_YOUR_COUNTRY_WILL_SHOW_HEREHTWO="

The service providers in your country will show here.

" COM_COSTBENEFITPROJECTION_HTWOYOUR_COUNTRY_CONTACT_DETAILS_WILL_SHOW_HEREHTWO="

Your country contact details will show here!

" COM_COSTBENEFITPROJECTION_IMPORT_CONTINUE="Continue" @@ -1432,6 +1436,7 @@ COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_VERSION_DESC="A count of the number o COM_COSTBENEFITPROJECTION_SERVICE_PROVIDER_VERSION_LABEL="Revision" COM_COSTBENEFITPROJECTION_SHARE="Share" COM_COSTBENEFITPROJECTION_SINGLE="Single" +COM_COSTBENEFITPROJECTION_SOON="Soon" COM_COSTBENEFITPROJECTION_SOON_THE_MEMBER_ACCESS_WILL_BE_READY="Soon the member access will be ready..." COM_COSTBENEFITPROJECTION_SOON_THE_PUBLIC_ACCESS_WILL_BE_READY="Soon the public access will be ready..." COM_COSTBENEFITPROJECTION_STATUS="Status" diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php index 8220f116..23ccd57c 100644 --- a/site/layouts/appnotice.php +++ b/site/layouts/appnotice.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 517d420c..6b7179d6 100644 --- a/site/layouts/company/age_groups_percentages_fullwidth.php +++ b/site/layouts/company/age_groups_percentages_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 cdc2bfc1..2a2eec3b 100644 --- a/site/layouts/company/age_groups_percentages_left.php +++ b/site/layouts/company/age_groups_percentages_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8db0d28f..5412af6b 100644 --- a/site/layouts/company/age_groups_percentages_right.php +++ b/site/layouts/company/age_groups_percentages_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 9a15800e..4cd4ca6b 100644 --- a/site/layouts/company/causerisk_selection_fullwidth.php +++ b/site/layouts/company/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c25b1834..d7867017 100644 --- a/site/layouts/company/details_above.php +++ b/site/layouts/company/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a1e6c0f8..46355b66 100644 --- a/site/layouts/company/details_left.php +++ b/site/layouts/company/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php index 7a3182df..d00caec7 100644 --- a/site/layouts/company/details_right.php +++ b/site/layouts/company/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a55ceef0..03e4427c 100644 --- a/site/layouts/company/details_under.php +++ b/site/layouts/company/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 7aadcb73..398ba66a 100644 --- a/site/layouts/company/interventions_fullwidth.php +++ b/site/layouts/company/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/site/layouts/company/publishing.php +++ b/site/layouts/company/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 4b5b9b9c..fc32ca84 100644 --- a/site/layouts/company/publlshing.php +++ b/site/layouts/company/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 d2a8a225..014e8029 100644 --- a/site/layouts/company/scaling_factors_fullwidth.php +++ b/site/layouts/company/scaling_factors_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 5d580f07..497f5f4d 100644 --- a/site/layouts/companydetails.php +++ b/site/layouts/companydetails.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 57258270..de43f7bd 100644 --- a/site/layouts/databreakdownmalefemale.php +++ b/site/layouts/databreakdownmalefemale.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 c525c245..d8016da9 100644 --- a/site/layouts/intervention/details_above.php +++ b/site/layouts/intervention/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 e89a71f2..44ba1398 100644 --- a/site/layouts/intervention/details_fullwidth.php +++ b/site/layouts/intervention/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 a55ceef0..03e4427c 100644 --- a/site/layouts/intervention/details_under.php +++ b/site/layouts/intervention/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/site/layouts/intervention/publishing.php +++ b/site/layouts/intervention/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ced4b5d1..731265dd 100644 --- a/site/layouts/intervention/publlshing.php +++ b/site/layouts/intervention/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 20073eec..46dd82b8 100644 --- a/site/layouts/intervention/settings_fullwidth.php +++ b/site/layouts/intervention/settings_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0cb1ab7e..c804f53c 100644 --- a/site/layouts/intervention/settings_left.php +++ b/site/layouts/intervention/settings_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 0f3ad151..bc657a11 100644 --- a/site/layouts/scaling_factor/details_above.php +++ b/site/layouts/scaling_factor/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ede9a50c..14a2b343 100644 --- a/site/layouts/scaling_factor/details_left.php +++ b/site/layouts/scaling_factor/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 95051e37..d465bcce 100644 --- a/site/layouts/scaling_factor/details_right.php +++ b/site/layouts/scaling_factor/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 6c7c5880..c26f6c72 100644 --- a/site/layouts/scaling_factor/publishing.php +++ b/site/layouts/scaling_factor/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 ced4b5d1..731265dd 100644 --- a/site/layouts/scaling_factor/publlshing.php +++ b/site/layouts/scaling_factor/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 8893ea06..26045608 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 56e683ea..73095344 100644 --- a/site/models/combinedresults.php +++ b/site/models/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/site/models/company.php b/site/models/company.php index 078f8868..b5e65b09 100644 --- a/site/models/company.php +++ b/site/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/site/models/companyresults.php b/site/models/companyresults.php index dd4b9757..6de6a0b9 100644 --- a/site/models/companyresults.php +++ b/site/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/site/models/cpanel.php b/site/models/cpanel.php index 7bc729b0..36421c28 100644 --- a/site/models/cpanel.php +++ b/site/models/cpanel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.php diff --git a/site/models/createaccount.php b/site/models/createaccount.php index 8b0bad94..87a1a47f 100644 --- a/site/models/createaccount.php +++ b/site/models/createaccount.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 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 b1de8bec..7fbd8b0f 100644 --- a/site/models/forms/company.js +++ b/site/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/site/models/forms/intervention.js b/site/models/forms/intervention.js index d767d5ce..546574b3 100644 --- a/site/models/forms/intervention.js +++ b/site/models/forms/intervention.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js diff --git a/site/models/forms/scaling_factor.js b/site/models/forms/scaling_factor.js index 510e1f2a..d4debba5 100644 --- a/site/models/forms/scaling_factor.js +++ b/site/models/forms/scaling_factor.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.js diff --git a/site/models/intervention.php b/site/models/intervention.php index d9d0809f..d3d7e8e8 100644 --- a/site/models/intervention.php +++ b/site/models/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/site/models/publicresults.php b/site/models/publicresults.php index c05f25f1..1b6ea397 100644 --- a/site/models/publicresults.php +++ b/site/models/publicresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publicresults.php diff --git a/site/models/scaling_factor.php b/site/models/scaling_factor.php index 50b8b0ad..8a1a3213 100644 --- a/site/models/scaling_factor.php +++ b/site/models/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/site/router.php b/site/router.php index e26ccf73..c7c7de5a 100644 --- a/site/router.php +++ b/site/router.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage router.php diff --git a/site/views/combinedresults/tmpl/default.php b/site/views/combinedresults/tmpl/default.php index 82465236..d8c2c761 100644 --- a/site/views/combinedresults/tmpl/default.php +++ b/site/views/combinedresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/combinedresults/tmpl/default_chart_cost.php b/site/views/combinedresults/tmpl/default_chart_cost.php index 8ea19374..e0c86a77 100644 --- a/site/views/combinedresults/tmpl/default_chart_cost.php +++ b/site/views/combinedresults/tmpl/default_chart_cost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/site/views/combinedresults/tmpl/default_chart_cost_percent.php b/site/views/combinedresults/tmpl/default_chart_cost_percent.php index 4345e26a..6ff75f16 100644 --- a/site/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/site/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index d5b53367..ebe8916b 100644 --- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php index 94955109..dc0fb6a1 100644 --- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php +++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_save.php diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php index 06a5b5e9..d8cef665 100644 --- a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index 0c49cb05..acd08cf0 100644 --- a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index b07a5e02..cb323e36 100644 --- a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/site/views/combinedresults/tmpl/default_table_cost_summary.php b/site/views/combinedresults/tmpl/default_table_cost_summary.php index 2a4da021..5f2afbf4 100644 --- a/site/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_cost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index 9605be65..bdf0e9e4 100644 --- a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index 11898e30..cf2f2039 100644 --- a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/site/views/combinedresults/view.html.php b/site/views/combinedresults/view.html.php index b238cc12..0fa686d8 100644 --- a/site/views/combinedresults/view.html.php +++ b/site/views/combinedresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/company/submitbutton.js b/site/views/company/submitbutton.js index d969b34c..45ef69f9 100644 --- a/site/views/company/submitbutton.js +++ b/site/views/company/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/company/tmpl/edit.php b/site/views/company/tmpl/edit.php index f0fa350d..93281c80 100644 --- a/site/views/company/tmpl/edit.php +++ b/site/views/company/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/company/view.html.php b/site/views/company/view.html.php index d27c9547..50e84f91 100644 --- a/site/views/company/view.html.php +++ b/site/views/company/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/companyresults/tmpl/default.php b/site/views/companyresults/tmpl/default.php index bb55ac5f..521273df 100644 --- a/site/views/companyresults/tmpl/default.php +++ b/site/views/companyresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/companyresults/tmpl/default_chart_cost.php b/site/views/companyresults/tmpl/default_chart_cost.php index 8ea19374..e0c86a77 100644 --- a/site/views/companyresults/tmpl/default_chart_cost.php +++ b/site/views/companyresults/tmpl/default_chart_cost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/site/views/companyresults/tmpl/default_chart_cost_percent.php b/site/views/companyresults/tmpl/default_chart_cost_percent.php index 4345e26a..6ff75f16 100644 --- a/site/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/site/views/companyresults/tmpl/default_chart_cost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index d5b53367..ebe8916b 100644 --- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php index 94955109..dc0fb6a1 100644 --- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php +++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_save.php diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost.php b/site/views/companyresults/tmpl/default_chart_work_days_lost.php index 06a5b5e9..d8cef665 100644 --- a/site/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/site/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index 0c49cb05..acd08cf0 100644 --- a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index b07a5e02..cb323e36 100644 --- a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/site/views/companyresults/tmpl/default_table_cost_summary.php b/site/views/companyresults/tmpl/default_table_cost_summary.php index 2a4da021..5f2afbf4 100644 --- a/site/views/companyresults/tmpl/default_table_cost_summary.php +++ b/site/views/companyresults/tmpl/default_table_cost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php index 9605be65..bdf0e9e4 100644 --- a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php diff --git a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php index 11898e30..cf2f2039 100644 --- a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/site/views/companyresults/view.html.php b/site/views/companyresults/view.html.php index 20c3281f..1fd90f19 100644 --- a/site/views/companyresults/view.html.php +++ b/site/views/companyresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/cpanel/tmpl/default.php b/site/views/cpanel/tmpl/default.php index c5d4374d..f9e63739 100644 --- a/site/views/cpanel/tmpl/default.php +++ b/site/views/cpanel/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/cpanel/view.html.php b/site/views/cpanel/view.html.php index eb09b930..f9372cf6 100644 --- a/site/views/cpanel/view.html.php +++ b/site/views/cpanel/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/createaccount/tmpl/default.php b/site/views/createaccount/tmpl/default.php index fcc6cfa4..b9565062 100644 --- a/site/views/createaccount/tmpl/default.php +++ b/site/views/createaccount/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/createaccount/tmpl/default_cbpmenumodule.php b/site/views/createaccount/tmpl/default_cbpmenumodule.php index 3a94edec..c962c70d 100644 --- a/site/views/createaccount/tmpl/default_cbpmenumodule.php +++ b/site/views/createaccount/tmpl/default_cbpmenumodule.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_cbpmenumodule.php diff --git a/site/views/createaccount/view.html.php b/site/views/createaccount/view.html.php index 5fc01c71..4f04f643 100644 --- a/site/views/createaccount/view.html.php +++ b/site/views/createaccount/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/intervention/submitbutton.js b/site/views/intervention/submitbutton.js index 5feaee7d..1139fa7f 100644 --- a/site/views/intervention/submitbutton.js +++ b/site/views/intervention/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/intervention/tmpl/edit.php b/site/views/intervention/tmpl/edit.php index abc5bdb7..5f126b3a 100644 --- a/site/views/intervention/tmpl/edit.php +++ b/site/views/intervention/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/intervention/view.html.php b/site/views/intervention/view.html.php index b82970ab..df82c3ec 100644 --- a/site/views/intervention/view.html.php +++ b/site/views/intervention/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/publicresults/tmpl/default.php b/site/views/publicresults/tmpl/default.php index 70a8fe70..e108cbb1 100644 --- a/site/views/publicresults/tmpl/default.php +++ b/site/views/publicresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/publicresults/tmpl/default_cbpmenumodule.php b/site/views/publicresults/tmpl/default_cbpmenumodule.php index 3a94edec..c962c70d 100644 --- a/site/views/publicresults/tmpl/default_cbpmenumodule.php +++ b/site/views/publicresults/tmpl/default_cbpmenumodule.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_cbpmenumodule.php diff --git a/site/views/publicresults/tmpl/default_chart_cost_public.php b/site/views/publicresults/tmpl/default_chart_cost_public.php index 1a10b471..9e0f9c50 100644 --- a/site/views/publicresults/tmpl/default_chart_cost_public.php +++ b/site/views/publicresults/tmpl/default_chart_cost_public.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_public.php diff --git a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php index 7f868c8a..3b1c3c31 100644 --- a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php +++ b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_public.php diff --git a/site/views/publicresults/tmpl/default_contact_form_public.php b/site/views/publicresults/tmpl/default_contact_form_public.php index 300e90d4..2341d025 100644 --- a/site/views/publicresults/tmpl/default_contact_form_public.php +++ b/site/views/publicresults/tmpl/default_contact_form_public.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_contact_form_public.php diff --git a/site/views/publicresults/view.html.php b/site/views/publicresults/view.html.php index 3cb5ff06..930714e7 100644 --- a/site/views/publicresults/view.html.php +++ b/site/views/publicresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/scaling_factor/submitbutton.js b/site/views/scaling_factor/submitbutton.js index 24dea6df..075b5d09 100644 --- a/site/views/scaling_factor/submitbutton.js +++ b/site/views/scaling_factor/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/scaling_factor/tmpl/edit.php b/site/views/scaling_factor/tmpl/edit.php index 19468930..f14ce590 100644 --- a/site/views/scaling_factor/tmpl/edit.php +++ b/site/views/scaling_factor/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/scaling_factor/view.html.php b/site/views/scaling_factor/view.html.php index 8ddd4ada..9f63fe71 100644 --- a/site/views/scaling_factor/view.html.php +++ b/site/views/scaling_factor/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.11 - @build 2nd May, 2016 + @build 5th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php