From 4d041e878c0d06512d10212416a440c2602cf664 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sun, 28 Feb 2016 22:30:37 +0200 Subject: [PATCH] ref 2 We added the hidden field for duration and removed the field from the list view. --- README.md | 4 +- admin/assets/css/admin.css | 2 +- admin/assets/css/causerisk.css | 2 +- admin/assets/css/causesrisks.css | 2 +- admin/assets/css/combinedresults.css | 2 +- admin/assets/css/companies.css | 2 +- admin/assets/css/company.css | 2 +- admin/assets/css/companyresults.css | 2 +- admin/assets/css/countries.css | 2 +- admin/assets/css/country.css | 2 +- admin/assets/css/currencies.css | 2 +- admin/assets/css/currency.css | 2 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/health_data.css | 2 +- admin/assets/css/health_data_sets.css | 2 +- admin/assets/css/help_document.css | 2 +- admin/assets/css/help_documents.css | 2 +- admin/assets/css/intervention.css | 2 +- admin/assets/css/interventions.css | 2 +- admin/assets/css/scaling_factor.css | 2 +- admin/assets/css/scaling_factors.css | 2 +- admin/assets/css/service_provider.css | 2 +- admin/assets/css/service_providers.css | 2 +- admin/controller.php | 2 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/causerisk.php | 2 +- admin/controllers/causesrisks.php | 2 +- admin/controllers/combinedresults.php | 2 +- admin/controllers/companies.php | 2 +- admin/controllers/company.php | 2 +- admin/controllers/companyresults.php | 2 +- admin/controllers/costbenefitprojection.php | 2 +- admin/controllers/countries.php | 2 +- admin/controllers/country.php | 2 +- admin/controllers/currencies.php | 2 +- admin/controllers/currency.php | 2 +- admin/controllers/health_data.php | 2 +- admin/controllers/health_data_sets.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/help_document.php | 2 +- admin/controllers/help_documents.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/intervention.php | 2 +- admin/controllers/interventions.php | 2 +- admin/controllers/scaling_factor.php | 2 +- admin/controllers/scaling_factors.php | 2 +- admin/controllers/service_provider.php | 2 +- admin/controllers/service_providers.php | 2 +- admin/costbenefitprojection.php | 2 +- admin/helpers/costbenefitprojection.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/sum.php | 2 +- admin/helpers/sumcombine.php | 2 +- .../en-GB/en-GB.com_costbenefitprojection.ini | 2 - admin/layouts/batchselection.php | 2 +- admin/layouts/causerisk/details_above.php | 2 +- admin/layouts/causerisk/details_left.php | 2 +- admin/layouts/causerisk/publishing.php | 2 +- admin/layouts/causerisk/publlshing.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- admin/layouts/company/details_above.php | 2 +- admin/layouts/company/details_left.php | 2 +- admin/layouts/company/details_right.php | 2 +- admin/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 10 +- 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 | 10 +- .../country/public_details_fullwidth.php | 2 +- admin/layouts/country/publishing.php | 2 +- admin/layouts/country/publlshing.php | 2 +- .../country/service_providers_fullwidth.php | 2 +- admin/layouts/currency/details_above.php | 2 +- admin/layouts/currency/details_left.php | 2 +- admin/layouts/currency/details_right.php | 2 +- admin/layouts/currency/publishing.php | 2 +- admin/layouts/currency/publlshing.php | 2 +- admin/layouts/databreakdownmalefemale.php | 2 +- admin/layouts/health_data/details_above.php | 2 +- admin/layouts/health_data/details_left.php | 2 +- admin/layouts/health_data/details_right.php | 2 +- .../layouts/health_data/details_rightside.php | 2 +- admin/layouts/health_data/publishing.php | 2 +- admin/layouts/health_data/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- admin/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- admin/layouts/intervention/details_under.php | 2 +- admin/layouts/intervention/publishing.php | 2 +- admin/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- admin/layouts/intervention/settings_left.php | 2 +- .../layouts/scaling_factor/details_above.php | 2 +- admin/layouts/scaling_factor/details_left.php | 2 +- .../layouts/scaling_factor/details_right.php | 2 +- admin/layouts/scaling_factor/publishing.php | 2 +- admin/layouts/scaling_factor/publlshing.php | 2 +- .../service_provider/companies_fullwidth.php | 2 +- .../service_provider/details_above.php | 2 +- .../service_provider/details_fullwidth.php | 2 +- admin/layouts/service_provider/publishing.php | 2 +- admin/layouts/service_provider/publlshing.php | 2 +- admin/models/ajax.php | 2 +- admin/models/causerisk.php | 2 +- admin/models/causesrisks.php | 2 +- admin/models/combinedresults.php | 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/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/intervention.xml | 94 +++++++++---------- admin/models/forms/scaling_factor.js | 2 +- admin/models/forms/service_provider.js | 2 +- admin/models/health_data.php | 2 +- admin/models/health_data_sets.php | 2 +- admin/models/help_document.php | 2 +- admin/models/help_documents.php | 2 +- admin/models/import.php | 2 +- admin/models/intervention.php | 2 +- admin/models/interventions.php | 14 +-- 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/tables/causerisk.php | 2 +- admin/tables/company.php | 2 +- admin/tables/country.php | 2 +- admin/tables/currency.php | 2 +- admin/tables/health_data.php | 2 +- admin/tables/help_document.php | 2 +- admin/tables/intervention.php | 2 +- admin/tables/scaling_factor.php | 2 +- admin/tables/service_provider.php | 2 +- admin/vdm.php | 2 +- admin/views/causerisk/submitbutton.js | 2 +- admin/views/causerisk/tmpl/edit.php | 2 +- admin/views/causerisk/view.html.php | 2 +- admin/views/causesrisks/tmpl/default.php | 2 +- .../causesrisks/tmpl/default_batch_body.php | 2 +- .../causesrisks/tmpl/default_batch_footer.php | 2 +- admin/views/causesrisks/tmpl/default_body.php | 2 +- admin/views/causesrisks/tmpl/default_foot.php | 2 +- admin/views/causesrisks/tmpl/default_head.php | 2 +- .../causesrisks/tmpl/default_toolbar.php | 2 +- admin/views/causesrisks/view.html.php | 2 +- admin/views/combinedresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- .../combinedresults/tmpl/default_main.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- admin/views/combinedresults/view.html.php | 2 +- admin/views/companies/tmpl/default.php | 2 +- .../companies/tmpl/default_batch_body.php | 2 +- .../companies/tmpl/default_batch_footer.php | 2 +- admin/views/companies/tmpl/default_body.php | 2 +- admin/views/companies/tmpl/default_foot.php | 2 +- admin/views/companies/tmpl/default_head.php | 2 +- .../views/companies/tmpl/default_toolbar.php | 2 +- admin/views/companies/view.html.php | 2 +- admin/views/company/submitbutton.js | 2 +- admin/views/company/tmpl/edit.php | 2 +- admin/views/company/view.html.php | 2 +- admin/views/companyresults/tmpl/default.php | 2 +- .../tmpl/default_chart_cost.php | 2 +- .../tmpl/default_chart_cost_percent.php | 2 +- ...efault_chart_intervention_cost_benefit.php | 2 +- .../tmpl/default_chart_work_days_lost.php | 2 +- .../default_chart_work_days_lost_percent.php | 2 +- .../companyresults/tmpl/default_main.php | 2 +- ...efault_table_calculated_cost_in_detail.php | 2 +- .../tmpl/default_table_cost_summary.php | 2 +- ...default_table_intervention_net_benefit.php | 2 +- .../default_table_work_days_lost_summary.php | 2 +- .../companyresults/tmpl/default_variables.php | 2 +- admin/views/companyresults/view.html.php | 2 +- .../costbenefitprojection/tmpl/default.php | 2 +- .../tmpl/default_main.php | 2 +- .../tmpl/default_usage_statistics_table.php | 2 +- .../tmpl/default_vdm.php | 2 +- .../views/costbenefitprojection/view.html.php | 2 +- admin/views/countries/tmpl/default.php | 2 +- .../countries/tmpl/default_batch_body.php | 2 +- .../countries/tmpl/default_batch_footer.php | 2 +- admin/views/countries/tmpl/default_body.php | 2 +- admin/views/countries/tmpl/default_foot.php | 2 +- admin/views/countries/tmpl/default_head.php | 2 +- .../views/countries/tmpl/default_toolbar.php | 2 +- admin/views/countries/view.html.php | 2 +- admin/views/country/submitbutton.js | 2 +- admin/views/country/tmpl/edit.php | 2 +- admin/views/country/view.html.php | 2 +- admin/views/currencies/tmpl/default.php | 2 +- .../currencies/tmpl/default_batch_body.php | 2 +- .../currencies/tmpl/default_batch_footer.php | 2 +- admin/views/currencies/tmpl/default_body.php | 2 +- admin/views/currencies/tmpl/default_foot.php | 2 +- admin/views/currencies/tmpl/default_head.php | 2 +- .../views/currencies/tmpl/default_toolbar.php | 2 +- admin/views/currencies/view.html.php | 2 +- admin/views/currency/submitbutton.js | 2 +- admin/views/currency/tmpl/edit.php | 2 +- admin/views/currency/view.html.php | 2 +- admin/views/health_data/submitbutton.js | 2 +- admin/views/health_data/tmpl/edit.php | 2 +- admin/views/health_data/view.html.php | 2 +- admin/views/health_data_sets/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../health_data_sets/tmpl/default_body.php | 2 +- .../health_data_sets/tmpl/default_foot.php | 2 +- .../health_data_sets/tmpl/default_head.php | 2 +- .../health_data_sets/tmpl/default_toolbar.php | 2 +- admin/views/health_data_sets/view.html.php | 2 +- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 2 +- admin/views/help_document/view.html.php | 2 +- admin/views/help_documents/tmpl/default.php | 2 +- .../tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../help_documents/tmpl/default_body.php | 2 +- .../help_documents/tmpl/default_foot.php | 2 +- .../help_documents/tmpl/default_head.php | 2 +- .../help_documents/tmpl/default_toolbar.php | 2 +- admin/views/help_documents/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/intervention/submitbutton.js | 2 +- admin/views/intervention/tmpl/edit.php | 2 +- admin/views/intervention/view.html.php | 2 +- admin/views/interventions/tmpl/default.php | 2 +- .../interventions/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/interventions/tmpl/default_body.php | 5 +- .../views/interventions/tmpl/default_foot.php | 4 +- .../views/interventions/tmpl/default_head.php | 5 +- .../interventions/tmpl/default_toolbar.php | 2 +- admin/views/interventions/view.html.php | 57 +---------- 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 | 10 +- 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 | 2 - site/layouts/appnotice.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- site/layouts/company/details_above.php | 2 +- site/layouts/company/details_left.php | 2 +- site/layouts/company/details_right.php | 2 +- site/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 10 +- 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/intervention.xml | 94 +++++++++---------- 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 +- 414 files changed, 508 insertions(+), 613 deletions(-) diff --git a/README.md b/README.md index 40bae68d..1341214e 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ 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*: 26th February, 2016 ++ *Last Build*: 28th February, 2016 + *Version*: 3.3.7 + *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*: **83719** ++ *Line count*: **83614** + *File count*: **553** + *Folder count*: **101** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index db3ce4ae..fa1a7c73 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c96eaf39..08770968 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 cd7e52b7..706367a7 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 5fe53bd3..d02f66b0 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 a0f11150..bf0efe83 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6771a2fe..5efde04a 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 59bbde33..e36e10a4 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9d4e7b67..4791f53c 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 fbf88b32..6aaa688c 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c89c30c9..97c9d491 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 3e0d948f..2425415b 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 7139979c..31e7db6c 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 3c07ca34..2b982d00 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 ce8fea18..e084f8b5 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 f75a9673..87aeb811 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9578ec97..a6d8200f 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 aa472c17..1f2ddb89 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 f05db3af..03fe683c 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9b4c3756..ba6878bc 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e9e0b78d..f91bc044 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 299f8383..c4359344 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c37ca965..7c3bc2c4 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/controller.php b/admin/controller.php index 29404b03..ba2b80c2 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 62941cc9..a58cfe5f 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 934a56ae..0661ab4a 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 0def90b6..c74add6e 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 56edb529..99f48d33 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 f3bef64b..643f57a9 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 91b396a7..d4da53f0 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 52d253b4..295b1358 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 8a9f3924..e126255b 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 dbbe845d..1a6b32eb 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 31272522..b740ac99 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6d1a99da..0cef4e47 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 3266c711..4736e200 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6ca36aa8..ba03c1e9 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9e8d8822..b9a1ee44 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 4137b94e..b14eca51 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 42a5b9ff..f8bc0d04 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 eb724123..cad41cbc 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e3363abf..8bb30daa 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index 10142ae0..aa1d2371 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e13ef9bd..5afd91c5 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 623ee8a7..6c6b180b 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 a34c02ac..9897c0c0 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 5fb64519..46a02055 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 4ef4c9dd..ab67bc31 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index 49d9729c..a68e41f4 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 390424d5..0068d9e7 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 aab90cb4..2e17ea56 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e06450fa..f21c43da 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 470802df..958ee169 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 bce8739b..bdacd721 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -1081,8 +1081,6 @@ COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_HINT="Add Description Here" COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_LABEL="Description" COM_COSTBENEFITPROJECTION_INTERVENTION_DETAILS="Details" COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION="Duration" -COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_DESCRIPTION="Length of intervention in years." -COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL="Duration" COM_COSTBENEFITPROJECTION_INTERVENTION_EDIT="Editing the Intervention" COM_COSTBENEFITPROJECTION_INTERVENTION_ERROR_UNIQUE_ALIAS="Another Intervention has the same alias." COM_COSTBENEFITPROJECTION_INTERVENTION_ID="Id" diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 7d3c7db6..014e868c 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 8023f1aa..1382c3aa 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 290a984e..42102add 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 bf814e5e..da726045 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 1f24e75a..b180d343 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.7 - @build 26th February, 2016 + @build 28th February, 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 64a1f182..d130af0e 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.7 - @build 26th February, 2016 + @build 28th February, 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 1001f2dd..b4356a73 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.7 - @build 26th February, 2016 + @build 28th February, 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 3805bc72..12be3228 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 58acd7c1..aa98f41f 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 32466d17..599b0f51 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 5d543710..5643e7ad 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 010c32c9..e43ef68d 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 89faf005..2106d9a8 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -51,9 +51,6 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - - - @@ -92,9 +89,6 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); escape($item->coverage); ?> - - escape($item->duration); ?> - escape($item->description); ?> @@ -131,7 +125,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - + diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index 9c992503..08f6bb5a 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 bf814e5e..da726045 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 b9ff9c2e..3ce5c39b 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 64a1f182..d130af0e 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.7 - @build 26th February, 2016 + @build 28th February, 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 1001f2dd..b4356a73 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.7 - @build 26th February, 2016 + @build 28th February, 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 76435293..058adb24 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 dd9cbc3b..331b404d 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 5124673a..624f67cb 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 98fd2d17..3083757d 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 599c92cc..49dc2414 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 68f3ce9a..9182263b 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.7 - @build 26th February, 2016 + @build 28th February, 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 a8bf578a..5fcafbab 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.7 - @build 26th February, 2016 + @build 28th February, 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 67e59ffd..a3c92d67 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -51,9 +51,6 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - - - @@ -96,9 +93,6 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); escape($item->coverage); ?> - - escape($item->duration); ?> - escape($item->description); ?> @@ -135,7 +129,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - + diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index 6437a9cb..bf1821a3 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 bf814e5e..da726045 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 26f2a31f..dcee89d8 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 782b2ba6..2d65615f 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 a47b3cc5..7e9b630e 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c4e44d20..caf25d40 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 bf814e5e..da726045 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 441007a8..7c72dd68 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2100a17a..fdad1ba9 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9f9a1c05..5e3f43a0 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 52496cce..13f5411d 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 8a8b8de8..9aff2ded 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 bf814e5e..da726045 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 ca77c805..c5b459a4 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 286e9567..a2eee1ce 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 120e7173..a3ddac3d 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 f144f61c..ca613dec 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 010c32c9..e43ef68d 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9a68677c..d38998cb 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 7707ae69..ebb00833 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c52b11ac..be4cc2dd 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 010c32c9..e43ef68d 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9a68677c..d38998cb 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2ea9cb67..b16651a2 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 308b46ca..f6bdd032 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e578ace3..6dbf4fc2 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 cf35fc54..bfe038c5 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e61dfb89..be7fa788 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9a68677c..d38998cb 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 00ce6391..c7ee502b 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 b8aa1b71..7be162db 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/service_provider/details_fullwidth.php b/admin/layouts/service_provider/details_fullwidth.php index de775a3b..f0d0d45c 100644 --- a/admin/layouts/service_provider/details_fullwidth.php +++ b/admin/layouts/service_provider/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index 9c992503..08f6bb5a 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9a68677c..d38998cb 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c76e0979..a5764e16 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 91712a53..10b83755 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6f548704..61ecdcb0 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 92250424..a9e99ca2 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 62c03249..3e9e270e 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 92f2cddc..f116ed80 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 8c2b7d66..f44c8ee2 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 937ffc8a..42b44741 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 79e3daa6..73abba85 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 384f7525..d4d3c23f 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 97432df7..5f81ac7a 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 ef493ae0..4cadd197 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 1e8d6ec2..d14de2be 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 ca8ce5f6..2e086b44 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2af7b1f0..fbfa8471 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 bc9d91f5..9f25c11b 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 695be092..13d1a0ba 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 3599abbf..27c9ebdb 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 d8570bb9..33b3948a 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2f5f399c..7494aaa3 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 889527dc..5a17e70c 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e7115719..20526a3c 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c2426894..775bfccc 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2dfc8252..bb59a18d 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 767725d6..638f0e64 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e6ae18d6..55c374c2 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2a3b22ad..2b5ad320 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 5d11867d..4779e046 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 02ed8c00..ca71bc24 100644 --- a/admin/models/forms/health_data.js +++ b/admin/models/forms/health_data.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e6591a73..7eb1f105 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 0f212097..c5c24d76 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js diff --git a/admin/models/forms/intervention.xml b/admin/models/forms/intervention.xml index d12370e6..40079f09 100644 --- a/admin/models/forms/intervention.xml +++ b/admin/models/forms/intervention.xml @@ -128,18 +128,6 @@ last="100" step="10" /> - - - + - - - - - - - + + + + + + + + + - + getUserStateFromRequest($this->context . '.filter.coverage', 'filter_coverage'); $this->setState('filter.coverage', $coverage); - $duration = $this->getUserStateFromRequest($this->context . '.filter.duration', 'filter_duration'); - $this->setState('filter.duration', $duration); - $description = $this->getUserStateFromRequest($this->context . '.filter.description', 'filter_description'); $this->setState('filter.description', $description); @@ -246,7 +242,7 @@ class CostbenefitprojectionModelInterventions extends JModelList else { $search = $db->quote('%' . $db->escape($search, true) . '%'); - $query->where('(a.name LIKE '.$search.' OR a.company LIKE '.$search.' OR g.name LIKE '.$search.' OR a.type LIKE '.$search.' OR a.coverage LIKE '.$search.' OR a.duration LIKE '.$search.' OR a.description LIKE '.$search.' OR a.reference LIKE '.$search.')'); + $query->where('(a.name LIKE '.$search.' OR a.company LIKE '.$search.' OR g.name LIKE '.$search.' OR a.type LIKE '.$search.' OR a.coverage LIKE '.$search.' OR a.description LIKE '.$search.' OR a.reference LIKE '.$search.' OR a.duration LIKE '.$search.')'); } } @@ -265,11 +261,6 @@ class CostbenefitprojectionModelInterventions extends JModelList { $query->where('a.coverage = ' . $db->quote($db->escape($coverage, true))); } - // Filter by Duration. - if ($duration = $this->getState('filter.duration')) - { - $query->where('a.duration = ' . $db->quote($db->escape($duration, true))); - } // Add the list ordering clause. $orderCol = $this->state->get('list.ordering', 'a.id'); @@ -423,7 +414,6 @@ class CostbenefitprojectionModelInterventions extends JModelList $id .= ':' . $this->getState('filter.company'); $id .= ':' . $this->getState('filter.type'); $id .= ':' . $this->getState('filter.coverage'); - $id .= ':' . $this->getState('filter.duration'); $id .= ':' . $this->getState('filter.description'); return parent::getStoreId($id); diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php index 5132d7b2..aff1cf58 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 7f49680e..83ff1ec3 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e97db9a5..e573f9e5 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 7a29d5b9..7ebf8537 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index 916d66e7..4b31d901 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 425f2b9d..29d2bf8c 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 f11415ff..689fc4ab 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 d570c0a1..469268ea 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 4e8385fe..cff916f3 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 91fdcde4..d6421faf 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 272a1de8..761b6546 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 7eee6f74..542fd520 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 0576112f..ffee7a6a 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/vdm.php b/admin/vdm.php index bd4bafcd..e8eaddf9 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 14f9d994..aae2d8ff 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 66f1ac23..ba896b36 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 0c71bbc4..aee8ec44 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 55a6fa9d..8d888a3f 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 96baadab..a0250bae 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.7 - @build 26th February, 2016 + @build 28th February, 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 1cb2b5e0..53654b75 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.7 - @build 26th February, 2016 + @build 28th February, 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 dd3b54a3..19c2adae 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 fc3e967b..061aa16f 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 b8478516..4bdfdaab 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 93961148..c8d0c94d 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 775abc24..ca3fd31e 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 862e70b9..51071b44 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 03600cab..9e2679f0 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.7 - @build 26th February, 2016 + @build 28th February, 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 2a29d43e..1796c802 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.7 - @build 26th February, 2016 + @build 28th February, 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 0147ad30..b10c1f0c 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.7 - @build 26th February, 2016 + @build 28th February, 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 9ac98d90..1f35859e 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.7 - @build 26th February, 2016 + @build 28th February, 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 f5d18c62..df41d587 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.7 - @build 26th February, 2016 + @build 28th February, 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 600c51ca..e92ec83d 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 d5c822e8..4cea59ec 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.7 - @build 26th February, 2016 + @build 28th February, 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 88242ff8..2a9f8c59 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.7 - @build 26th February, 2016 + @build 28th February, 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 968ee92b..92562328 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.7 - @build 26th February, 2016 + @build 28th February, 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 18365088..0ce8dffb 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.7 - @build 26th February, 2016 + @build 28th February, 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 8241d064..d7fc04ec 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 38badb3c..3e1ba048 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 16c3fceb..3c16e387 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.7 - @build 26th February, 2016 + @build 28th February, 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 95c123de..b6856634 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.7 - @build 26th February, 2016 + @build 28th February, 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 b41cbb57..e2ae98ec 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 eb2c8348..594ff113 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 b1d2704a..b6d1c497 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c75f3e27..ef2cbe86 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 29b3c1d5..66c7cf7f 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 18320ac0..9683f3a8 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 a4198f8b..d0323a9b 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 4231e97e..5dec2562 100644 --- a/admin/views/company/view.html.php +++ b/admin/views/company/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 eaa3ed64..5b7fabe7 100644 --- a/admin/views/companyresults/tmpl/default.php +++ b/admin/views/companyresults/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 03600cab..9e2679f0 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.7 - @build 26th February, 2016 + @build 28th February, 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 2a29d43e..1796c802 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.7 - @build 26th February, 2016 + @build 28th February, 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 0147ad30..b10c1f0c 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.7 - @build 26th February, 2016 + @build 28th February, 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 9ac98d90..1f35859e 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.7 - @build 26th February, 2016 + @build 28th February, 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 f5d18c62..df41d587 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.7 - @build 26th February, 2016 + @build 28th February, 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 600c51ca..e92ec83d 100644 --- a/admin/views/companyresults/tmpl/default_main.php +++ b/admin/views/companyresults/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 d5c822e8..4cea59ec 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.7 - @build 26th February, 2016 + @build 28th February, 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 88242ff8..2a9f8c59 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.7 - @build 26th February, 2016 + @build 28th February, 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 968ee92b..92562328 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.7 - @build 26th February, 2016 + @build 28th February, 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 18365088..0ce8dffb 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.7 - @build 26th February, 2016 + @build 28th February, 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 02183f3c..2b63cc3a 100644 --- a/admin/views/companyresults/tmpl/default_variables.php +++ b/admin/views/companyresults/tmpl/default_variables.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 ff7ab37e..fdf8c75f 100644 --- a/admin/views/companyresults/view.html.php +++ b/admin/views/companyresults/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2486ccd5..7098e36f 100644 --- a/admin/views/costbenefitprojection/tmpl/default.php +++ b/admin/views/costbenefitprojection/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 df8df739..94509394 100644 --- a/admin/views/costbenefitprojection/tmpl/default_main.php +++ b/admin/views/costbenefitprojection/tmpl/default_main.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 598b3dfb..93529a57 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.7 - @build 26th February, 2016 + @build 28th February, 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 aa0d81b2..d653ae1c 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vdm.php +++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 d20b8084..66649c20 100644 --- a/admin/views/costbenefitprojection/view.html.php +++ b/admin/views/costbenefitprojection/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 a7eb0725..b3f5c5c3 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 339379b3..4362dd93 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.7 - @build 26th February, 2016 + @build 28th February, 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 c50b3c5a..a82f62b8 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.7 - @build 26th February, 2016 + @build 28th February, 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 4c319d0a..f723ad77 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 eb2c8348..594ff113 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 3181d660..654d7381 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 7393eb40..c6086fbb 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c0fade41..b4977c48 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 198bae00..875961c1 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 647ec2f0..b21cb689 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 d0a84727..e9aad5f6 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9504dc99..88f04707 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c0dc1887..8b06f32c 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.7 - @build 26th February, 2016 + @build 28th February, 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 a249ca12..e39bafd6 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.7 - @build 26th February, 2016 + @build 28th February, 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 b8a20cb1..326d4b05 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6dc19023..210cbb2a 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 18da94d3..43358d55 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 f33df314..f8c73056 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9a9b2090..87a5daf3 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 33807c56..f48f4ae8 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c1c7990b..d5a83daf 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 65279041..83f6e202 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 163bd97a..29610beb 100644 --- a/admin/views/health_data/submitbutton.js +++ b/admin/views/health_data/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 80024544..321b8c26 100644 --- a/admin/views/health_data/tmpl/edit.php +++ b/admin/views/health_data/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 dc9bf3f9..6da181a9 100644 --- a/admin/views/health_data/view.html.php +++ b/admin/views/health_data/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 a8a5d8d6..16dcca67 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.7 - @build 26th February, 2016 + @build 28th February, 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 a679c3c8..3efc2d0e 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.7 - @build 26th February, 2016 + @build 28th February, 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 17518886..cbb2fe2a 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.7 - @build 26th February, 2016 + @build 28th February, 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 2c43311f..b030fb0a 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.7 - @build 26th February, 2016 + @build 28th February, 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 b43d8023..693bd561 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.7 - @build 26th February, 2016 + @build 28th February, 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 b2262af6..50f0b256 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.7 - @build 26th February, 2016 + @build 28th February, 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 44369bff..666edfa0 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.7 - @build 26th February, 2016 + @build 28th February, 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 f51f6ae4..e7ebc670 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.7 - @build 26th February, 2016 + @build 28th February, 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 c69226a6..c35fde11 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 01d21b98..d51bd53d 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 f1e8a914..94065394 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 8f2d7feb..e73a3481 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 d1e8f755..51cf04b2 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.7 - @build 26th February, 2016 + @build 28th February, 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 53e88dd4..3e235dae 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.7 - @build 26th February, 2016 + @build 28th February, 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 50d86fea..2c842ca3 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.7 - @build 26th February, 2016 + @build 28th February, 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 eb2c8348..594ff113 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.7 - @build 26th February, 2016 + @build 28th February, 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 55a1afa3..d7a0e90c 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.7 - @build 26th February, 2016 + @build 28th February, 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 b92e7355..d8bc61a8 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.7 - @build 26th February, 2016 + @build 28th February, 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 8c189873..ab3992a7 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 95f33eb6..cbfae048 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 3f5c5c3f..da1625c8 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/intervention/submitbutton.js b/admin/views/intervention/submitbutton.js index acc1fc53..fd52353b 100644 --- a/admin/views/intervention/submitbutton.js +++ b/admin/views/intervention/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c355ee4f..da93803d 100644 --- a/admin/views/intervention/tmpl/edit.php +++ b/admin/views/intervention/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c6207a63..8bd54cf6 100644 --- a/admin/views/intervention/view.html.php +++ b/admin/views/intervention/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2d8ec773..4f5259d9 100644 --- a/admin/views/interventions/tmpl/default.php +++ b/admin/views/interventions/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 580ccec6..3e127a71 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.7 - @build 26th February, 2016 + @build 28th February, 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 9308e3b5..d4fc7a62 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.7 - @build 26th February, 2016 + @build 28th February, 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 e1a5a002..b253285e 100644 --- a/admin/views/interventions/tmpl/default_body.php +++ b/admin/views/interventions/tmpl/default_body.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -95,9 +95,6 @@ $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=inte escape($item->coverage); ?> - - escape($item->duration); ?> - escape($item->description); ?> diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php index eb2c8348..210cbb2a 100644 --- a/admin/views/interventions/tmpl/default_foot.php +++ b/admin/views/interventions/tmpl/default_foot.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php @@ -22,5 +22,5 @@ defined('_JEXEC') or die('Restricted access'); ?> - pagination->getListFooter(); ?> + pagination->getListFooter(); ?> \ No newline at end of file diff --git a/admin/views/interventions/tmpl/default_head.php b/admin/views/interventions/tmpl/default_head.php index 09fb40fa..ef46fb50 100644 --- a/admin/views/interventions/tmpl/default_head.php +++ b/admin/views/interventions/tmpl/default_head.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php @@ -49,9 +49,6 @@ defined('_JEXEC') or die('Restricted access'); listDirn, $this->listOrder); ?> - - listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php index 67af1343..5597bc18 100644 --- a/admin/views/interventions/tmpl/default_toolbar.php +++ b/admin/views/interventions/tmpl/default_toolbar.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 82f96d97..828efcb7 100644 --- a/admin/views/interventions/view.html.php +++ b/admin/views/interventions/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -260,28 +260,6 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy JHtml::_('select.options', $this->coverageOptions, 'value', 'text') ); } - } - - // Set Duration Selection - $this->durationOptions = $this->getTheDurationSelections(); - if ($this->durationOptions) - { - // Duration Filter - JHtmlSidebar::addFilter( - '- Select '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL').' -', - 'filter_duration', - JHtml::_('select.options', $this->durationOptions, 'value', 'text', $this->state->get('filter.duration')) - ); - - if ($this->canBatch && $this->canCreate && $this->canEdit) - { - // Duration Batch Selection - JHtmlBatch_::addListSelection( - '- Keep Original '.JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL').' -', - 'batch[duration]', - JHtml::_('select.options', $this->durationOptions, 'value', 'text') - ); - } } } @@ -329,7 +307,6 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy 'g.name' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COMPANY_LABEL'), 'a.type' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_TYPE_LABEL'), 'a.coverage' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COVERAGE_LABEL'), - 'a.duration' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL'), 'a.description' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_LABEL'), 'a.id' => JText::_('JGRID_HEADING_ID') ); @@ -401,37 +378,5 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy return $filter; } return false; - } - - protected function getTheDurationSelections() - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - - // Select the text. - $query->select($db->quoteName('duration')); - $query->from($db->quoteName('#__costbenefitprojection_intervention')); - $query->order($db->quoteName('duration') . ' ASC'); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - - $results = $db->loadColumn(); - - if ($results) - { - $results = array_unique($results); - $filter = array(); - foreach ($results as $duration) - { - // Now add the duration and its text to the options array - $filter[] = JHtml::_('select.option', $duration, $duration); - } - return $filter; - } - return false; } } diff --git a/admin/views/scaling_factor/submitbutton.js b/admin/views/scaling_factor/submitbutton.js index c2ed44c7..073cbc45 100644 --- a/admin/views/scaling_factor/submitbutton.js +++ b/admin/views/scaling_factor/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 abb8d3f9..6854b1c5 100644 --- a/admin/views/scaling_factor/tmpl/edit.php +++ b/admin/views/scaling_factor/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c6fea2f1..3e59274a 100644 --- a/admin/views/scaling_factor/view.html.php +++ b/admin/views/scaling_factor/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 8506eb2e..64da7a2e 100644 --- a/admin/views/scaling_factors/tmpl/default.php +++ b/admin/views/scaling_factors/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 fa66aef2..67a504f1 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.7 - @build 26th February, 2016 + @build 28th February, 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 ccba1974..b8bbef21 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.7 - @build 26th February, 2016 + @build 28th February, 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 b64d6055..e2673163 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.7 - @build 26th February, 2016 + @build 28th February, 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 b15a3d7c..bedff873 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.7 - @build 26th February, 2016 + @build 28th February, 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 6201b675..24efc0cd 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.7 - @build 26th February, 2016 + @build 28th February, 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 504eb540..de9cb504 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.7 - @build 26th February, 2016 + @build 28th February, 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 551a2fda..10393269 100644 --- a/admin/views/scaling_factors/view.html.php +++ b/admin/views/scaling_factors/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 4de2e137..dab3efbd 100644 --- a/admin/views/service_provider/submitbutton.js +++ b/admin/views/service_provider/submitbutton.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 56ab6b3e..955ef576 100644 --- a/admin/views/service_provider/tmpl/edit.php +++ b/admin/views/service_provider/tmpl/edit.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 66d4dc22..22e51055 100644 --- a/admin/views/service_provider/view.html.php +++ b/admin/views/service_provider/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 57a9d2e1..0f588f53 100644 --- a/admin/views/service_providers/tmpl/default.php +++ b/admin/views/service_providers/tmpl/default.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 4a56f657..40979e66 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.7 - @build 26th February, 2016 + @build 28th February, 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 b1386cee..242d434e 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.7 - @build 26th February, 2016 + @build 28th February, 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 041839f8..ab596295 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.7 - @build 26th February, 2016 + @build 28th February, 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 eb2c8348..594ff113 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.7 - @build 26th February, 2016 + @build 28th February, 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 bb43d960..a67e8f98 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.7 - @build 26th February, 2016 + @build 28th February, 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 a8712428..eb4b5c48 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.7 - @build 26th February, 2016 + @build 28th February, 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 d26e597f..938eab43 100644 --- a/admin/views/service_providers/view.html.php +++ b/admin/views/service_providers/view.html.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml index c1dfb047..ef2a6af6 100644 --- a/costbenefitprojection.xml +++ b/costbenefitprojection.xml @@ -1,7 +1,7 @@ COM_COSTBENEFITPROJECTION - 26th February, 2016 + 28th February, 2016 Llewellyn van der Merwe llewellyn@vdm.io http://www.vdm.io diff --git a/script.php b/script.php index fe9b78d5..dbbc2ad1 100644 --- a/script.php +++ b/script.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage script.php @@ -976,9 +976,9 @@ class com_costbenefitprojectionInstallerScript $intervention->type_title = 'Costbenefitprojection Intervention'; $intervention->type_alias = 'com_costbenefitprojection.intervention'; $intervention->table = '{"special": {"dbtable": "#__costbenefitprojection_intervention","key": "id","type": "Intervention","prefix": "costbenefitprojectionTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $intervention->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","company":"company","type":"type","coverage":"coverage","duration":"duration","description":"description","country":"country","share":"share","interventions":"interventions","reference":"reference","not_required":"not_required"}}'; + $intervention->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","company":"company","type":"type","coverage":"coverage","description":"description","reference":"reference","country":"country","share":"share","interventions":"interventions","duration":"duration","not_required":"not_required"}}'; $intervention->router = 'CostbenefitprojectionHelperRoute::getInterventionRoute'; - $intervention->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/intervention.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","company","type","coverage","duration","country","share","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "company","targetTable": "#__costbenefitprojection_company","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "interventions","targetTable": "#__costbenefitprojection_intervention","targetColumn": "id","displayColumn": "name"}]}'; + $intervention->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/intervention.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","duration","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","company","type","coverage","country","share","duration","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "company","targetTable": "#__costbenefitprojection_company","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "interventions","targetTable": "#__costbenefitprojection_intervention","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $intervention_Inserted = $db->insertObject('#__content_types', $intervention); @@ -1214,9 +1214,9 @@ class com_costbenefitprojectionInstallerScript $intervention->type_title = 'Costbenefitprojection Intervention'; $intervention->type_alias = 'com_costbenefitprojection.intervention'; $intervention->table = '{"special": {"dbtable": "#__costbenefitprojection_intervention","key": "id","type": "Intervention","prefix": "costbenefitprojectionTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $intervention->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","company":"company","type":"type","coverage":"coverage","duration":"duration","description":"description","country":"country","share":"share","interventions":"interventions","reference":"reference","not_required":"not_required"}}'; + $intervention->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","company":"company","type":"type","coverage":"coverage","description":"description","reference":"reference","country":"country","share":"share","interventions":"interventions","duration":"duration","not_required":"not_required"}}'; $intervention->router = 'CostbenefitprojectionHelperRoute::getInterventionRoute'; - $intervention->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/intervention.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","company","type","coverage","duration","country","share","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "company","targetTable": "#__costbenefitprojection_company","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "interventions","targetTable": "#__costbenefitprojection_intervention","targetColumn": "id","displayColumn": "name"}]}'; + $intervention->content_history_options = '{"formFile": "administrator/components/com_costbenefitprojection/models/forms/intervention.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","duration","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","company","type","coverage","country","share","duration","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "company","targetTable": "#__costbenefitprojection_company","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "country","targetTable": "#__costbenefitprojection_country","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "interventions","targetTable": "#__costbenefitprojection_intervention","targetColumn": "id","displayColumn": "name"}]}'; // Check if intervention type is already in content_type DB. $intervention_id = null; diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css index 6060d7a7..9917a6e2 100644 --- a/site/assets/css/combinedresults.css +++ b/site/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6771a2fe..5efde04a 100644 --- a/site/assets/css/company.css +++ b/site/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6c28018d..d8fdcacb 100644 --- a/site/assets/css/companyresults.css +++ b/site/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 066d91bb..23aef468 100644 --- a/site/assets/css/cpanel.css +++ b/site/assets/css/cpanel.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9e0114ce..49bb4bf8 100644 --- a/site/assets/css/createaccount.css +++ b/site/assets/css/createaccount.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 aa472c17..1f2ddb89 100644 --- a/site/assets/css/intervention.css +++ b/site/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 ba6aa872..e42fe565 100644 --- a/site/assets/css/publicresults.css +++ b/site/assets/css/publicresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9b4c3756..ba6878bc 100644 --- a/site/assets/css/scaling_factor.css +++ b/site/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 4d7b1108..06330cdc 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.css diff --git a/site/controller.php b/site/controller.php index 819f0522..99c12a4a 100644 --- a/site/controller.php +++ b/site/controller.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 62941cc9..a58cfe5f 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6eac1e03..bb7ebb83 100644 --- a/site/controllers/company.php +++ b/site/controllers/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9e562409..184283ff 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 3ffb31d4..3df9210c 100644 --- a/site/controllers/intervention.php +++ b/site/controllers/intervention.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 cb951dc6..fe39ba35 100644 --- a/site/controllers/scaling_factor.php +++ b/site/controllers/scaling_factor.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php index 9f2b4c10..5a467ca2 100644 --- a/site/costbenefitprojection.php +++ b/site/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 65fe7594..9c97f643 100644 --- a/site/helpers/costbenefitprojection.php +++ b/site/helpers/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 4c0e3a93..e169c77b 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2a4d062b..78ac0cd9 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c01063c8..98b98903 100644 --- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -1126,8 +1126,6 @@ COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_HINT="Add Description Here" COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_LABEL="Description" COM_COSTBENEFITPROJECTION_INTERVENTION_DETAILS="Details" COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION="Duration" -COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_DESCRIPTION="Length of intervention in years." -COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL="Duration" COM_COSTBENEFITPROJECTION_INTERVENTION_EDIT="Editing the Intervention" COM_COSTBENEFITPROJECTION_INTERVENTION_ERROR_UNIQUE_ALIAS="Another Intervention has the same alias." COM_COSTBENEFITPROJECTION_INTERVENTION_ID="Id" diff --git a/site/layouts/appnotice.php b/site/layouts/appnotice.php index 312c4097..a49f1312 100644 --- a/site/layouts/appnotice.php +++ b/site/layouts/appnotice.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 1f24e75a..b180d343 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.7 - @build 26th February, 2016 + @build 28th February, 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 64a1f182..d130af0e 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.7 - @build 26th February, 2016 + @build 28th February, 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 1001f2dd..b4356a73 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.7 - @build 26th February, 2016 + @build 28th February, 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 3805bc72..12be3228 100644 --- a/site/layouts/company/causerisk_selection_fullwidth.php +++ b/site/layouts/company/causerisk_selection_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 58acd7c1..aa98f41f 100644 --- a/site/layouts/company/details_above.php +++ b/site/layouts/company/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 32466d17..599b0f51 100644 --- a/site/layouts/company/details_left.php +++ b/site/layouts/company/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 5d543710..5643e7ad 100644 --- a/site/layouts/company/details_right.php +++ b/site/layouts/company/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 010c32c9..e43ef68d 100644 --- a/site/layouts/company/details_under.php +++ b/site/layouts/company/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 89faf005..2106d9a8 100644 --- a/site/layouts/company/interventions_fullwidth.php +++ b/site/layouts/company/interventions_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -51,9 +51,6 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - - - @@ -92,9 +89,6 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); escape($item->coverage); ?> - - escape($item->duration); ?> - escape($item->description); ?> @@ -131,7 +125,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - + diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php index 9c992503..08f6bb5a 100644 --- a/site/layouts/company/publishing.php +++ b/site/layouts/company/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 bf814e5e..da726045 100644 --- a/site/layouts/company/publlshing.php +++ b/site/layouts/company/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 b9ff9c2e..3ce5c39b 100644 --- a/site/layouts/company/scaling_factors_fullwidth.php +++ b/site/layouts/company/scaling_factors_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 21146b55..9ec76fea 100644 --- a/site/layouts/companydetails.php +++ b/site/layouts/companydetails.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 441007a8..7c72dd68 100644 --- a/site/layouts/databreakdownmalefemale.php +++ b/site/layouts/databreakdownmalefemale.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 7707ae69..ebb00833 100644 --- a/site/layouts/intervention/details_above.php +++ b/site/layouts/intervention/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 c52b11ac..be4cc2dd 100644 --- a/site/layouts/intervention/details_fullwidth.php +++ b/site/layouts/intervention/details_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 010c32c9..e43ef68d 100644 --- a/site/layouts/intervention/details_under.php +++ b/site/layouts/intervention/details_under.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/site/layouts/intervention/publishing.php +++ b/site/layouts/intervention/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9a68677c..d38998cb 100644 --- a/site/layouts/intervention/publlshing.php +++ b/site/layouts/intervention/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 2ea9cb67..b16651a2 100644 --- a/site/layouts/intervention/settings_fullwidth.php +++ b/site/layouts/intervention/settings_fullwidth.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 308b46ca..f6bdd032 100644 --- a/site/layouts/intervention/settings_left.php +++ b/site/layouts/intervention/settings_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e578ace3..6dbf4fc2 100644 --- a/site/layouts/scaling_factor/details_above.php +++ b/site/layouts/scaling_factor/details_above.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 cf35fc54..bfe038c5 100644 --- a/site/layouts/scaling_factor/details_left.php +++ b/site/layouts/scaling_factor/details_left.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e61dfb89..be7fa788 100644 --- a/site/layouts/scaling_factor/details_right.php +++ b/site/layouts/scaling_factor/details_right.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9c992503..08f6bb5a 100644 --- a/site/layouts/scaling_factor/publishing.php +++ b/site/layouts/scaling_factor/publishing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 9a68677c..d38998cb 100644 --- a/site/layouts/scaling_factor/publlshing.php +++ b/site/layouts/scaling_factor/publlshing.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 492b1724..8f987a3e 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 269520b4..1e877044 100644 --- a/site/models/combinedresults.php +++ b/site/models/combinedresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 f7907fe6..a1edd7bd 100644 --- a/site/models/company.php +++ b/site/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 6cb43b1a..518d0851 100644 --- a/site/models/companyresults.php +++ b/site/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 0dcfbc52..02923373 100644 --- a/site/models/cpanel.php +++ b/site/models/cpanel.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 83aa52fd..4fdb252a 100644 --- a/site/models/createaccount.php +++ b/site/models/createaccount.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 e6ae18d6..55c374c2 100644 --- a/site/models/forms/company.js +++ b/site/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 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 0f212097..c5c24d76 100644 --- a/site/models/forms/intervention.js +++ b/site/models/forms/intervention.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.3.7 - @build 26th February, 2016 + @build 28th February, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.js diff --git a/site/models/forms/intervention.xml b/site/models/forms/intervention.xml index d12370e6..40079f09 100644 --- a/site/models/forms/intervention.xml +++ b/site/models/forms/intervention.xml @@ -128,18 +128,6 @@ last="100" step="10" /> - - - + - - - - - - - + + + + + + + + + - +