From e0ca73380ec2f4052152ed7ca7ee29b8d0eae49b Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Wed, 12 Jun 2019 22:53:36 +0200 Subject: [PATCH] Updated with JCB v2.9.20 --- README.md | 4 +- admin/README.txt | 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/assets/js/admin.js | 2 +- admin/config.xml | 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/import_health_data_sets.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/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/sum.php | 2 +- admin/helpers/sumcombine.php | 2 +- admin/layouts/batchselection.php | 2 +- admin/layouts/causerisk/details_above.php | 2 +- admin/layouts/causerisk/details_fullwidth.php | 2 +- admin/layouts/causerisk/details_left.php | 2 +- admin/layouts/causerisk/details_right.php | 2 +- admin/layouts/causerisk/publishing.php | 2 +- admin/layouts/causerisk/publlshing.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- admin/layouts/company/details_above.php | 2 +- admin/layouts/company/details_left.php | 2 +- admin/layouts/company/details_right.php | 2 +- admin/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 2 +- admin/layouts/company/publishing.php | 2 +- admin/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- .../country/age_groups_percentages_left.php | 2 +- .../country/age_groups_percentages_right.php | 2 +- .../country/causerisk_selection_fullwidth.php | 2 +- admin/layouts/country/companies_fullwidth.php | 2 +- admin/layouts/country/details_above.php | 2 +- admin/layouts/country/details_left.php | 2 +- admin/layouts/country/details_right.php | 2 +- .../country/health_data_totals_left.php | 2 +- .../country/health_data_totals_right.php | 2 +- .../country/interventions_fullwidth.php | 2 +- .../country/public_details_fullwidth.php | 2 +- admin/layouts/country/publishing.php | 2 +- admin/layouts/country/publlshing.php | 2 +- .../country/service_providers_fullwidth.php | 2 +- admin/layouts/currency/details_above.php | 2 +- admin/layouts/currency/details_left.php | 2 +- admin/layouts/currency/details_right.php | 2 +- admin/layouts/currency/publishing.php | 2 +- admin/layouts/currency/publlshing.php | 2 +- admin/layouts/databreakdownmalefemale.php | 2 +- admin/layouts/health_data/details_above.php | 2 +- admin/layouts/health_data/details_left.php | 2 +- admin/layouts/health_data/details_right.php | 2 +- .../layouts/health_data/details_rightside.php | 2 +- admin/layouts/health_data/publishing.php | 2 +- admin/layouts/health_data/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- admin/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- admin/layouts/intervention/details_under.php | 2 +- admin/layouts/intervention/publishing.php | 2 +- admin/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- admin/layouts/intervention/settings_left.php | 2 +- .../layouts/scaling_factor/details_above.php | 2 +- admin/layouts/scaling_factor/details_left.php | 2 +- .../layouts/scaling_factor/details_right.php | 2 +- admin/layouts/scaling_factor/publishing.php | 2 +- admin/layouts/scaling_factor/publlshing.php | 2 +- .../service_provider/companies_fullwidth.php | 2 +- .../service_provider/details_above.php | 2 +- .../layouts/service_provider/details_left.php | 2 +- .../service_provider/details_right.php | 2 +- admin/layouts/service_provider/publishing.php | 2 +- admin/layouts/service_provider/publlshing.php | 2 +- admin/models/ajax.php | 2 +- admin/models/causerisk.php | 2 +- admin/models/causesrisks.php | 2 +- admin/models/combinedresults.php | 38 +-- 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/adminviewfolderlist.php | 2 +- admin/models/fields/articles.php | 2 +- admin/models/fields/causesrisks.php | 2 +- admin/models/fields/causesriskscheck.php | 2 +- admin/models/fields/company.php | 2 +- admin/models/fields/companycheck.php | 2 +- admin/models/fields/countries.php | 2 +- admin/models/fields/countryuser.php | 2 +- admin/models/fields/currency.php | 2 +- admin/models/fields/datayear.php | 2 +- admin/models/fields/interventions.php | 2 +- admin/models/fields/memberuser.php | 2 +- admin/models/fields/serviceprovider.php | 2 +- admin/models/fields/serviceprovideruser.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/forms/causerisk.js | 2 +- admin/models/forms/company.js | 2 +- admin/models/forms/company.xml | 6 +- admin/models/forms/country.js | 2 +- admin/models/forms/country.xml | 18 +- admin/models/forms/currency.js | 2 +- admin/models/forms/health_data.js | 2 +- admin/models/forms/health_data.xml | 4 - admin/models/forms/help_document.js | 2 +- admin/models/forms/intervention.js | 2 +- admin/models/forms/intervention.xml | 4 - 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/import_health_data_sets.php | 2 +- admin/models/intervention.php | 2 +- admin/models/interventions.php | 2 +- admin/models/scaling_factor.php | 2 +- admin/models/scaling_factors.php | 2 +- admin/models/service_provider.php | 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/views/causerisk/submitbutton.js | 2 +- admin/views/causerisk/tmpl/edit.php | 3 +- 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 | 42 ++- admin/views/company/submitbutton.js | 2 +- admin/views/company/tmpl/edit.php | 3 +- 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 +- ...sed_issues_the_closed_issues_on_github.php | 2 +- .../tmpl/default_main.php | 2 +- ..._open_issues_the_open_issues_on_github.php | 2 +- .../tmpl/default_readme_information.php | 2 +- .../tmpl/default_usage_statistics_table.php | 2 +- ...t_vast_development_method_notice_board.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 | 12 +- admin/views/country/submitbutton.js | 2 +- admin/views/country/tmpl/edit.php | 3 +- 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 | 3 +- 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 | 32 ++- admin/views/help_document/submitbutton.js | 2 +- admin/views/help_document/tmpl/edit.php | 3 +- 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 | 42 ++- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- .../import_health_data_sets/tmpl/default.php | 2 +- .../import_health_data_sets/view.html.php | 2 +- admin/views/intervention/submitbutton.js | 2 +- admin/views/intervention/tmpl/edit.php | 3 +- admin/views/intervention/view.html.php | 2 +- admin/views/interventions/tmpl/default.php | 2 +- .../interventions/tmpl/default_batch_body.php | 2 +- .../tmpl/default_batch_footer.php | 2 +- .../views/interventions/tmpl/default_body.php | 2 +- .../views/interventions/tmpl/default_foot.php | 2 +- .../views/interventions/tmpl/default_head.php | 2 +- .../interventions/tmpl/default_toolbar.php | 2 +- admin/views/interventions/view.html.php | 42 ++- admin/views/scaling_factor/submitbutton.js | 2 +- admin/views/scaling_factor/tmpl/edit.php | 3 +- 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 | 22 +- admin/views/service_provider/submitbutton.js | 2 +- admin/views/service_provider/tmpl/edit.php | 3 +- 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 | 12 +- admin/whmcs.php | 2 +- costbenefitprojection.xml | 2 +- media/js/table2excel.js | 2 +- .../css/components/accordion.almost-flat.css | 2 +- .../components/accordion.almost-flat.min.css | 2 +- media/uikit-v2/css/components/accordion.css | 2 +- .../css/components/accordion.gradient.css | 2 +- .../css/components/accordion.gradient.min.css | 2 +- .../uikit-v2/css/components/accordion.min.css | 2 +- .../components/autocomplete.almost-flat.css | 2 +- .../autocomplete.almost-flat.min.css | 2 +- .../uikit-v2/css/components/autocomplete.css | 2 +- .../css/components/autocomplete.gradient.css | 2 +- .../components/autocomplete.gradient.min.css | 2 +- .../css/components/autocomplete.min.css | 2 +- .../css/components/datepicker.almost-flat.css | 2 +- .../components/datepicker.almost-flat.min.css | 2 +- media/uikit-v2/css/components/datepicker.css | 2 +- .../css/components/datepicker.gradient.css | 2 +- .../components/datepicker.gradient.min.css | 2 +- .../css/components/datepicker.min.css | 2 +- .../css/components/dotnav.almost-flat.css | 2 +- .../css/components/dotnav.almost-flat.min.css | 2 +- media/uikit-v2/css/components/dotnav.css | 2 +- .../css/components/dotnav.gradient.css | 2 +- .../css/components/dotnav.gradient.min.css | 2 +- media/uikit-v2/css/components/dotnav.min.css | 2 +- .../components/form-advanced.almost-flat.css | 2 +- .../form-advanced.almost-flat.min.css | 2 +- .../uikit-v2/css/components/form-advanced.css | 2 +- .../css/components/form-advanced.gradient.css | 2 +- .../components/form-advanced.gradient.min.css | 2 +- .../css/components/form-advanced.min.css | 2 +- .../css/components/form-file.almost-flat.css | 2 +- .../components/form-file.almost-flat.min.css | 2 +- media/uikit-v2/css/components/form-file.css | 2 +- .../css/components/form-file.gradient.css | 2 +- .../css/components/form-file.gradient.min.css | 2 +- .../uikit-v2/css/components/form-file.min.css | 2 +- .../components/form-password.almost-flat.css | 2 +- .../form-password.almost-flat.min.css | 2 +- .../uikit-v2/css/components/form-password.css | 2 +- .../css/components/form-password.gradient.css | 2 +- .../components/form-password.gradient.min.css | 2 +- .../css/components/form-password.min.css | 2 +- .../components/form-select.almost-flat.css | 2 +- .../form-select.almost-flat.min.css | 2 +- media/uikit-v2/css/components/form-select.css | 2 +- .../css/components/form-select.gradient.css | 2 +- .../components/form-select.gradient.min.css | 2 +- .../css/components/form-select.min.css | 2 +- .../css/components/htmleditor.almost-flat.css | 2 +- .../components/htmleditor.almost-flat.min.css | 2 +- media/uikit-v2/css/components/htmleditor.css | 2 +- .../css/components/htmleditor.gradient.css | 2 +- .../components/htmleditor.gradient.min.css | 2 +- .../css/components/htmleditor.min.css | 2 +- .../css/components/nestable.almost-flat.css | 2 +- .../components/nestable.almost-flat.min.css | 2 +- media/uikit-v2/css/components/nestable.css | 2 +- .../css/components/nestable.gradient.css | 2 +- .../css/components/nestable.gradient.min.css | 2 +- .../uikit-v2/css/components/nestable.min.css | 2 +- .../css/components/notify.almost-flat.css | 2 +- .../css/components/notify.almost-flat.min.css | 2 +- media/uikit-v2/css/components/notify.css | 2 +- .../css/components/notify.gradient.css | 2 +- .../css/components/notify.gradient.min.css | 2 +- media/uikit-v2/css/components/notify.min.css | 2 +- .../components/placeholder.almost-flat.css | 2 +- .../placeholder.almost-flat.min.css | 2 +- media/uikit-v2/css/components/placeholder.css | 2 +- .../css/components/placeholder.gradient.css | 2 +- .../components/placeholder.gradient.min.css | 2 +- .../css/components/placeholder.min.css | 2 +- .../css/components/progress.almost-flat.css | 2 +- .../components/progress.almost-flat.min.css | 2 +- media/uikit-v2/css/components/progress.css | 2 +- .../css/components/progress.gradient.css | 2 +- .../css/components/progress.gradient.min.css | 2 +- .../uikit-v2/css/components/progress.min.css | 2 +- .../css/components/search.almost-flat.css | 2 +- .../css/components/search.almost-flat.min.css | 2 +- media/uikit-v2/css/components/search.css | 2 +- .../css/components/search.gradient.css | 2 +- .../css/components/search.gradient.min.css | 2 +- media/uikit-v2/css/components/search.min.css | 2 +- .../css/components/slidenav.almost-flat.css | 2 +- .../components/slidenav.almost-flat.min.css | 2 +- media/uikit-v2/css/components/slidenav.css | 2 +- .../css/components/slidenav.gradient.css | 2 +- .../css/components/slidenav.gradient.min.css | 2 +- .../uikit-v2/css/components/slidenav.min.css | 2 +- .../css/components/slider.almost-flat.css | 2 +- .../css/components/slider.almost-flat.min.css | 2 +- media/uikit-v2/css/components/slider.css | 2 +- .../css/components/slider.gradient.css | 2 +- .../css/components/slider.gradient.min.css | 2 +- media/uikit-v2/css/components/slider.min.css | 2 +- .../css/components/slideshow.almost-flat.css | 2 +- .../components/slideshow.almost-flat.min.css | 2 +- media/uikit-v2/css/components/slideshow.css | 2 +- .../css/components/slideshow.gradient.css | 2 +- .../css/components/slideshow.gradient.min.css | 2 +- .../uikit-v2/css/components/slideshow.min.css | 2 +- .../css/components/sortable.almost-flat.css | 2 +- .../components/sortable.almost-flat.min.css | 2 +- media/uikit-v2/css/components/sortable.css | 2 +- .../css/components/sortable.gradient.css | 2 +- .../css/components/sortable.gradient.min.css | 2 +- .../uikit-v2/css/components/sortable.min.css | 2 +- .../css/components/sticky.almost-flat.css | 2 +- .../css/components/sticky.almost-flat.min.css | 2 +- media/uikit-v2/css/components/sticky.css | 2 +- .../css/components/sticky.gradient.css | 2 +- .../css/components/sticky.gradient.min.css | 2 +- media/uikit-v2/css/components/sticky.min.css | 2 +- .../css/components/tooltip.almost-flat.css | 2 +- .../components/tooltip.almost-flat.min.css | 2 +- media/uikit-v2/css/components/tooltip.css | 2 +- .../css/components/tooltip.gradient.css | 2 +- .../css/components/tooltip.gradient.min.css | 2 +- media/uikit-v2/css/components/tooltip.min.css | 2 +- .../css/components/upload.almost-flat.css | 2 +- .../css/components/upload.almost-flat.min.css | 2 +- media/uikit-v2/css/components/upload.css | 2 +- .../css/components/upload.gradient.css | 2 +- .../css/components/upload.gradient.min.css | 2 +- media/uikit-v2/css/components/upload.min.css | 2 +- media/uikit-v2/css/uikit.almost-flat.css | 2 +- media/uikit-v2/css/uikit.almost-flat.min.css | 2 +- media/uikit-v2/css/uikit.css | 2 +- media/uikit-v2/css/uikit.gradient.css | 2 +- media/uikit-v2/css/uikit.gradient.min.css | 2 +- media/uikit-v2/css/uikit.min.css | 2 +- media/uikit-v2/js/components/accordion.js | 2 +- media/uikit-v2/js/components/accordion.min.js | 2 +- media/uikit-v2/js/components/autocomplete.js | 2 +- .../js/components/autocomplete.min.js | 2 +- media/uikit-v2/js/components/datepicker.js | 2 +- .../uikit-v2/js/components/datepicker.min.js | 2 +- media/uikit-v2/js/components/form-password.js | 2 +- .../js/components/form-password.min.js | 2 +- media/uikit-v2/js/components/form-select.js | 2 +- .../uikit-v2/js/components/form-select.min.js | 2 +- media/uikit-v2/js/components/grid-parallax.js | 2 +- .../js/components/grid-parallax.min.js | 2 +- media/uikit-v2/js/components/grid.js | 239 +----------------- media/uikit-v2/js/components/grid.min.js | 4 +- media/uikit-v2/js/components/htmleditor.js | 2 +- .../uikit-v2/js/components/htmleditor.min.js | 2 +- media/uikit-v2/js/components/lightbox.js | 2 +- media/uikit-v2/js/components/lightbox.min.js | 2 +- media/uikit-v2/js/components/nestable.js | 16 +- media/uikit-v2/js/components/nestable.min.js | 4 +- media/uikit-v2/js/components/notify.js | 2 +- media/uikit-v2/js/components/notify.min.js | 2 +- media/uikit-v2/js/components/pagination.js | 2 +- .../uikit-v2/js/components/pagination.min.js | 2 +- media/uikit-v2/js/components/parallax.js | 2 +- media/uikit-v2/js/components/parallax.min.js | 2 +- media/uikit-v2/js/components/search.js | 2 +- media/uikit-v2/js/components/search.min.js | 2 +- media/uikit-v2/js/components/slider.js | 2 +- media/uikit-v2/js/components/slider.min.js | 2 +- media/uikit-v2/js/components/slideset.js | 2 +- media/uikit-v2/js/components/slideset.min.js | 2 +- media/uikit-v2/js/components/slideshow-fx.js | 2 +- .../js/components/slideshow-fx.min.js | 2 +- media/uikit-v2/js/components/slideshow.js | 2 +- media/uikit-v2/js/components/slideshow.min.js | 2 +- media/uikit-v2/js/components/sortable.js | 24 +- media/uikit-v2/js/components/sortable.min.js | 4 +- media/uikit-v2/js/components/sticky.js | 2 +- media/uikit-v2/js/components/sticky.min.js | 2 +- media/uikit-v2/js/components/timepicker.js | 2 +- .../uikit-v2/js/components/timepicker.min.js | 2 +- media/uikit-v2/js/components/tooltip.js | 2 +- media/uikit-v2/js/components/tooltip.min.js | 2 +- media/uikit-v2/js/components/upload.js | 2 +- media/uikit-v2/js/components/upload.min.js | 2 +- media/uikit-v2/js/core/alert.js | 2 +- media/uikit-v2/js/core/alert.min.js | 2 +- media/uikit-v2/js/core/button.js | 2 +- media/uikit-v2/js/core/button.min.js | 2 +- media/uikit-v2/js/core/core.js | 4 +- media/uikit-v2/js/core/core.min.js | 4 +- media/uikit-v2/js/core/cover.js | 2 +- media/uikit-v2/js/core/cover.min.js | 2 +- media/uikit-v2/js/core/dropdown.js | 2 +- media/uikit-v2/js/core/dropdown.min.js | 2 +- media/uikit-v2/js/core/grid.js | 2 +- media/uikit-v2/js/core/grid.min.js | 2 +- media/uikit-v2/js/core/modal.js | 8 +- media/uikit-v2/js/core/modal.min.js | 4 +- media/uikit-v2/js/core/nav.js | 2 +- media/uikit-v2/js/core/nav.min.js | 2 +- media/uikit-v2/js/core/offcanvas.js | 6 +- media/uikit-v2/js/core/offcanvas.min.js | 4 +- media/uikit-v2/js/core/scrollspy.js | 2 +- media/uikit-v2/js/core/scrollspy.min.js | 2 +- media/uikit-v2/js/core/smooth-scroll.js | 2 +- media/uikit-v2/js/core/smooth-scroll.min.js | 2 +- media/uikit-v2/js/core/switcher.js | 2 +- media/uikit-v2/js/core/switcher.min.js | 2 +- media/uikit-v2/js/core/tab.js | 2 +- media/uikit-v2/js/core/tab.min.js | 2 +- media/uikit-v2/js/core/toggle.js | 2 +- media/uikit-v2/js/core/toggle.min.js | 2 +- media/uikit-v2/js/core/touch.js | 2 +- media/uikit-v2/js/core/touch.min.js | 2 +- media/uikit-v2/js/core/utility.js | 2 +- media/uikit-v2/js/core/utility.min.js | 2 +- media/uikit-v2/js/uikit.js | 14 +- media/uikit-v2/js/uikit.min.js | 6 +- script.php | 4 +- site/assets/css/combinedresults.css | 2 +- site/assets/css/company.css | 2 +- site/assets/css/companyresults.css | 2 +- site/assets/css/cpanel.css | 2 +- site/assets/css/createaccount.css | 2 +- site/assets/css/intervention.css | 2 +- site/assets/css/publicresults.css | 2 +- site/assets/css/scaling_factor.css | 2 +- site/assets/css/site.css | 2 +- site/assets/js/site.js | 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/category.php | 2 +- site/helpers/costbenefitprojection.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/layouts/appnotice.php | 2 +- .../age_groups_percentages_fullwidth.php | 2 +- .../company/age_groups_percentages_left.php | 2 +- .../company/age_groups_percentages_right.php | 2 +- .../company/causerisk_selection_fullwidth.php | 2 +- site/layouts/company/details_above.php | 2 +- site/layouts/company/details_left.php | 2 +- site/layouts/company/details_right.php | 2 +- site/layouts/company/details_under.php | 2 +- .../company/interventions_fullwidth.php | 2 +- site/layouts/company/publishing.php | 2 +- site/layouts/company/publlshing.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- site/layouts/companydetails.php | 2 +- site/layouts/databreakdownmalefemale.php | 2 +- site/layouts/intervention/details_above.php | 2 +- .../intervention/details_fullwidth.php | 2 +- site/layouts/intervention/details_under.php | 2 +- site/layouts/intervention/publishing.php | 2 +- site/layouts/intervention/publlshing.php | 2 +- .../intervention/settings_fullwidth.php | 2 +- site/layouts/intervention/settings_left.php | 2 +- site/layouts/scaling_factor/details_above.php | 2 +- site/layouts/scaling_factor/details_left.php | 2 +- site/layouts/scaling_factor/details_right.php | 2 +- site/layouts/scaling_factor/publishing.php | 2 +- site/layouts/scaling_factor/publlshing.php | 2 +- site/models/ajax.php | 2 +- site/models/combinedresults.php | 38 +-- 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/company.xml | 6 +- site/models/forms/intervention.js | 2 +- site/models/forms/intervention.xml | 4 - 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 | 3 +- 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 | 3 +- 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 | 3 +- site/views/scaling_factor/view.html.php | 2 +- 649 files changed, 917 insertions(+), 1003 deletions(-) diff --git a/README.md b/README.md index 0600563a..9a4bc6db 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ max_input_vars = 5000 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Cost Benefit Projection](https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 -+ *Last Build*: 4th April, 2019 ++ *Last Build*: 12th June, 2019 + *Version*: 3.4.x + *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*: **82804** ++ *Line count*: **82923** + *File count*: **585** + *Folder count*: **103** diff --git a/admin/README.txt b/admin/README.txt index 0600563a..9a4bc6db 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -22,11 +22,11 @@ max_input_vars = 5000 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Cost Benefit Projection](https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 -+ *Last Build*: 4th April, 2019 ++ *Last Build*: 12th June, 2019 + *Version*: 3.4.x + *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*: **82804** ++ *Line count*: **82923** + *File count*: **585** + *Folder count*: **103** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 9e0b7800..eba5c966 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 8443c5e8..7974f572 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 4b47250d..f9f7a69f 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 74c7821d..0387da54 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 14ef8154..838356a6 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 7b03c2c9..a60ef11e 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 3e3d2e4d..f2b70027 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 b8bfbadf..40c34a28 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 e25c8576..e9945ac2 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 200e86bd..ac85ce95 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 bc673453..4a8ad05d 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 81a2533f..8e0cfb53 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 504c7627..06847842 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 1c1336ad..00c3628b 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 69b766f8..fcf2e1b6 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 a87a7a5e..88af9c0d 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 2d4936c4..fab44751 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 e98e9b5c..4caa1ecb 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 9aa56ffa..bc402654 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 c4684310..8b22e316 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 332cda7c..7af32aed 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 f9c24a2e..7d07f5c6 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 74e4dd40..849df40b 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.js diff --git a/admin/config.xml b/admin/config.xml index 38b90b7e..71f28e61 100644 --- a/admin/config.xml +++ b/admin/config.xml @@ -100,7 +100,7 @@ label="COM_COSTBENEFITPROJECTION_CONFIG_CONTRIBUTOR_LINK_LABEL" description="COM_COSTBENEFITPROJECTION_CONFIG_CONTRIBUTOR_LINK_DESC" size="60" - default="http://www.swisstph.ch/about-us/staff/detailview.html?tx_x4epersdb_pi1[showUid]=2267&cHash=1b1c5db0808e04d3f1afe0f3a3f67998" + default="https://www.swisstph.ch/en/staff/profile/people/patrick-hanlon/" /> getQuery(true); + // Get from #__costbenefitprojection_company as a + $query->select($db->quoteName( + array('a.id','a.name','a.user','a.department','a.per','a.country','a.service_provider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'), + array('id','name','user','department','per','country','service_provider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access'))); + $query->from($db->quoteName('#__costbenefitprojection_company', 'a')); + + // Get from #__costbenefitprojection_country as e + $query->select($db->quoteName( + array('e.id','e.name','e.alias','e.user','e.currency','e.datayear','e.worldzone','e.codethree','e.codetwo','e.working_days','e.presenteeism','e.medical_turnovers','e.sick_leave','e.healthcare','e.productivity_losses','e.publicname','e.publicemail','e.publicnumber','e.publicaddress','e.percentmale','e.percentfemale','e.causesrisks','e.maledeath','e.femaledeath','e.maleyld','e.femaleyld','e.access'), + array('country_id','country_name','country_alias','country_user','country_currency','country_datayear','country_worldzone','country_codethree','country_codetwo','country_working_days','country_presenteeism','country_medical_turnovers','country_sick_leave','country_healthcare','country_productivity_losses','country_publicname','country_publicemail','country_publicnumber','country_publicaddress','country_percentmale','country_percentfemale','country_causesrisks','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld','country_access'))); + $query->join('LEFT', ($db->quoteName('#__costbenefitprojection_country', 'e')) . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('e.id') . ')'); + + // Get from #__costbenefitprojection_currency as f + $query->select($db->quoteName( + array('f.id','f.name','f.alias','f.codethree','f.numericcode','f.symbol','f.thousands','f.decimalplace','f.decimalsymbol','f.positivestyle','f.negativestyle','f.published','f.access','f.ordering'), + array('currency_id','currency_name','currency_alias','currency_codethree','currency_numericcode','currency_symbol','currency_thousands','currency_decimalplace','currency_decimalsymbol','currency_positivestyle','currency_negativestyle','currency_published','currency_access','currency_ordering'))); + $query->join('LEFT', ($db->quoteName('#__costbenefitprojection_currency', 'f')) . ' ON (' . $db->quoteName('e.currency') . ' = ' . $db->quoteName('f.codethree') . ')'); + // Filtering. $ids = (array) array_map('intval',explode('_', $this->input->get('cid', null, 'CMD'))); @@ -95,24 +113,6 @@ class CostbenefitprojectionModelCombinedresults extends JModelList JFactory::getApplication()->redirect('index.php?option=com_costbenefitprojection&view=cpanel'); } } - - // Get from #__costbenefitprojection_company as a - $query->select($db->quoteName( - array('a.id','a.name','a.user','a.department','a.per','a.country','a.service_provider','a.datayear','a.working_days','a.total_salary','a.total_healthcare','a.productivity_losses','a.males','a.females','a.medical_turnovers_males','a.medical_turnovers_females','a.sick_leave_males','a.sick_leave_females','a.percentmale','a.percentfemale','a.causesrisks','a.published','a.access'), - array('id','name','user','department','per','country','service_provider','datayear','working_days','total_salary','total_healthcare','productivity_losses','males','females','medical_turnovers_males','medical_turnovers_females','sick_leave_males','sick_leave_females','percentmale','percentfemale','causesrisks','published','access'))); - $query->from($db->quoteName('#__costbenefitprojection_company', 'a')); - - // Get from #__costbenefitprojection_country as e - $query->select($db->quoteName( - array('e.id','e.name','e.alias','e.user','e.currency','e.datayear','e.worldzone','e.codethree','e.codetwo','e.working_days','e.presenteeism','e.medical_turnovers','e.sick_leave','e.healthcare','e.productivity_losses','e.publicname','e.publicemail','e.publicnumber','e.publicaddress','e.percentmale','e.percentfemale','e.causesrisks','e.maledeath','e.femaledeath','e.maleyld','e.femaleyld','e.access'), - array('country_id','country_name','country_alias','country_user','country_currency','country_datayear','country_worldzone','country_codethree','country_codetwo','country_working_days','country_presenteeism','country_medical_turnovers','country_sick_leave','country_healthcare','country_productivity_losses','country_publicname','country_publicemail','country_publicnumber','country_publicaddress','country_percentmale','country_percentfemale','country_causesrisks','country_maledeath','country_femaledeath','country_maleyld','country_femaleyld','country_access'))); - $query->join('LEFT', ($db->quoteName('#__costbenefitprojection_country', 'e')) . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('e.id') . ')'); - - // Get from #__costbenefitprojection_currency as f - $query->select($db->quoteName( - array('f.id','f.name','f.alias','f.codethree','f.numericcode','f.symbol','f.thousands','f.decimalplace','f.decimalsymbol','f.positivestyle','f.negativestyle','f.published','f.access','f.ordering'), - array('currency_id','currency_name','currency_alias','currency_codethree','currency_numericcode','currency_symbol','currency_thousands','currency_decimalplace','currency_decimalsymbol','currency_positivestyle','currency_negativestyle','currency_published','currency_access','currency_ordering'))); - $query->join('LEFT', ($db->quoteName('#__costbenefitprojection_currency', 'f')) . ' ON (' . $db->quoteName('e.currency') . ' = ' . $db->quoteName('f.codethree') . ')'); // Check if $ids is an array with values. $array = $ids; if (isset($array) && CostbenefitprojectionHelper::checkArray($array)) diff --git a/admin/models/companies.php b/admin/models/companies.php index 96182349..150352b6 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/models/company.php b/admin/models/company.php index 934cfd5b..05b4b8a1 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index fb8d20b7..801557ce 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index f1374e29..72a6dc63 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/models/countries.php b/admin/models/countries.php index 6a8fd9df..a27e3cfa 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/country.php b/admin/models/country.php index 98189edc..aaf127c2 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/models/currencies.php b/admin/models/currencies.php index cff0db6b..1367e0bc 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/models/currency.php b/admin/models/currency.php index 55c21794..be481738 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index e677b702..4d17505b 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index b71e991a..04dfdaa3 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 b44a735d..76cc5830 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 622a4f3d..aa3b0f51 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 bbacb334..699ea51b 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/fields/companycheck.php b/admin/models/fields/companycheck.php index 7eec6557..787607d3 100644 --- a/admin/models/fields/companycheck.php +++ b/admin/models/fields/companycheck.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companycheck.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index 1eb7889c..77bec5ab 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 6b8395f8..c1b2363e 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 fffa45c9..708d6f0a 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 5e6780ea..2574c90b 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 ac100391..50a78bcd 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 9de55eee..092803f7 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 5801691f..769ce070 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 ca0d84a2..0df43910 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovideruser.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index a1f6db56..b6b11293 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -4,7 +4,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage siteviewfolderlist.php diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index 382a5bcd..d8fa24f0 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @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 e76f1371..e1d2d8a9 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -3,7 +3,7 @@ /-------------------------------------------------------------------------------------------------------/ @version 3.4.x - @build 4th April, 2019 + @build 12th June, 2019 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/admin/models/forms/company.xml b/admin/models/forms/company.xml index c721f1c7..58efc3ac 100644 --- a/admin/models/forms/company.xml +++ b/admin/models/forms/company.xml @@ -310,7 +310,6 @@ class="list_class" multiple="false" filter="CMD" - required="false" default="">