diff --git a/README.md b/README.md index d4a71adc..512d4f46 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Cost Benefit Projection (3.3.11) +# Cost Benefit Projection (3.3.12) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -22,12 +22,12 @@ max_input_vars = 5000 + *Author*: [Llewellyn van der Merwe] (mailto:llewellyn@vdm.io) + *Name*: [Cost Benefit Projection] (https://www.staffhealthcbp.com/) + *First Build*: 15th June, 2012 -+ *Last Build*: 5th May, 2016 -+ *Version*: 3.3.11 ++ *Last Build*: 10th May, 2016 ++ *Version*: 3.3.12 + *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*: **85312** -+ *File count*: **565** ++ *Line count*: **85860** ++ *File count*: **566** + *Folder count*: **103** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index b583c8fe..72d2fc24 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage admin.css diff --git a/admin/assets/css/causerisk.css b/admin/assets/css/causerisk.css index 633186cf..eba1e243 100644 --- a/admin/assets/css/causerisk.css +++ b/admin/assets/css/causerisk.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.css diff --git a/admin/assets/css/causesrisks.css b/admin/assets/css/causesrisks.css index 04646f68..36f64be0 100644 --- a/admin/assets/css/causesrisks.css +++ b/admin/assets/css/causesrisks.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.css diff --git a/admin/assets/css/combinedresults.css b/admin/assets/css/combinedresults.css index 8ad4aea9..ddad8ce2 100644 --- a/admin/assets/css/combinedresults.css +++ b/admin/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/admin/assets/css/companies.css b/admin/assets/css/companies.css index af6fe803..ba4fc177 100644 --- a/admin/assets/css/companies.css +++ b/admin/assets/css/companies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.css diff --git a/admin/assets/css/company.css b/admin/assets/css/company.css index 354c6b4f..1f8187e7 100644 --- a/admin/assets/css/company.css +++ b/admin/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/admin/assets/css/companyresults.css b/admin/assets/css/companyresults.css index d4fe2d36..3cd37878 100644 --- a/admin/assets/css/companyresults.css +++ b/admin/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 8981ad28..f2dd701b 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.css diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index b4ff85fd..b839abae 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.css diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index ca649e04..56c65960 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.css diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 7e01edaf..8be2fb1b 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 009733a9..1f1b4b13 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage dashboard.css diff --git a/admin/assets/css/health_data.css b/admin/assets/css/health_data.css index 3692581e..c9af0815 100644 --- a/admin/assets/css/health_data.css +++ b/admin/assets/css/health_data.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.css diff --git a/admin/assets/css/health_data_sets.css b/admin/assets/css/health_data_sets.css index d54218c4..22e2f1db 100644 --- a/admin/assets/css/health_data_sets.css +++ b/admin/assets/css/health_data_sets.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_sets.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 6cf703a3..febc591e 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 783a2ee1..7a45aeec 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.css diff --git a/admin/assets/css/intervention.css b/admin/assets/css/intervention.css index 66597f4d..0e8cfd39 100644 --- a/admin/assets/css/intervention.css +++ b/admin/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/admin/assets/css/interventions.css b/admin/assets/css/interventions.css index 7c313d97..60c47c03 100644 --- a/admin/assets/css/interventions.css +++ b/admin/assets/css/interventions.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.css diff --git a/admin/assets/css/scaling_factor.css b/admin/assets/css/scaling_factor.css index 6949bcd7..7155f41a 100644 --- a/admin/assets/css/scaling_factor.css +++ b/admin/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/admin/assets/css/scaling_factors.css b/admin/assets/css/scaling_factors.css index 229dc08d..b9652902 100644 --- a/admin/assets/css/scaling_factors.css +++ b/admin/assets/css/scaling_factors.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.css diff --git a/admin/assets/css/service_provider.css b/admin/assets/css/service_provider.css index e4fede76..f49d4a65 100644 --- a/admin/assets/css/service_provider.css +++ b/admin/assets/css/service_provider.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.css diff --git a/admin/assets/css/service_providers.css b/admin/assets/css/service_providers.css index 31eb420e..9faecda3 100644 --- a/admin/assets/css/service_providers.css +++ b/admin/assets/css/service_providers.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.css diff --git a/admin/controller.php b/admin/controller.php index 108fd8aa..fe764645 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 573adc3c..e8ef9f1f 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php diff --git a/admin/controllers/causerisk.php b/admin/controllers/causerisk.php index 217b80c8..91707770 100644 --- a/admin/controllers/causerisk.php +++ b/admin/controllers/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/controllers/causesrisks.php b/admin/controllers/causesrisks.php index caf4f2d5..0ed848b0 100644 --- a/admin/controllers/causesrisks.php +++ b/admin/controllers/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/controllers/combinedresults.php b/admin/controllers/combinedresults.php index 20835d3a..ed09ca89 100644 --- a/admin/controllers/combinedresults.php +++ b/admin/controllers/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/controllers/companies.php b/admin/controllers/companies.php index bfc40653..57d0bfd8 100644 --- a/admin/controllers/companies.php +++ b/admin/controllers/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/controllers/company.php b/admin/controllers/company.php index ed021ecd..e502f107 100644 --- a/admin/controllers/company.php +++ b/admin/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/controllers/companyresults.php b/admin/controllers/companyresults.php index 6ff9c811..6914b013 100644 --- a/admin/controllers/companyresults.php +++ b/admin/controllers/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/controllers/costbenefitprojection.php b/admin/controllers/costbenefitprojection.php index b7fac3f9..153761ef 100644 --- a/admin/controllers/costbenefitprojection.php +++ b/admin/controllers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 53b900df..85efff35 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/controllers/country.php b/admin/controllers/country.php index 7fbd7811..498cde00 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index e5971d7e..85b91743 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 0915712d..8c7e58ee 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/controllers/health_data.php b/admin/controllers/health_data.php index e4d5c0af..933fe2dc 100644 --- a/admin/controllers/health_data.php +++ b/admin/controllers/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/controllers/health_data_sets.php b/admin/controllers/health_data_sets.php index 0aca959e..6e16dec9 100644 --- a/admin/controllers/health_data_sets.php +++ b/admin/controllers/health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 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 aaf96f81..299284c0 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index d0fe1b56..c6c9fee2 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index ba2d0dd7..fba6fce4 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 0d5334b9..9fd904a6 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import.php diff --git a/admin/controllers/import_health_data_sets.php b/admin/controllers/import_health_data_sets.php index 0ed6b166..4529e0c1 100644 --- a/admin/controllers/import_health_data_sets.php +++ b/admin/controllers/import_health_data_sets.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage import_health_data_sets.php diff --git a/admin/controllers/intervention.php b/admin/controllers/intervention.php index a06f37aa..5b311096 100644 --- a/admin/controllers/intervention.php +++ b/admin/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/controllers/interventions.php b/admin/controllers/interventions.php index 0af470a5..9223d514 100644 --- a/admin/controllers/interventions.php +++ b/admin/controllers/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php diff --git a/admin/controllers/scaling_factor.php b/admin/controllers/scaling_factor.php index 7cd039fb..b820b87b 100644 --- a/admin/controllers/scaling_factor.php +++ b/admin/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/controllers/scaling_factors.php b/admin/controllers/scaling_factors.php index 97063ce8..3f7411b2 100644 --- a/admin/controllers/scaling_factors.php +++ b/admin/controllers/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/controllers/service_provider.php b/admin/controllers/service_provider.php index c14f9bc4..297f7383 100644 --- a/admin/controllers/service_provider.php +++ b/admin/controllers/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/controllers/service_providers.php b/admin/controllers/service_providers.php index a3b06983..ee62b6e1 100644 --- a/admin/controllers/service_providers.php +++ b/admin/controllers/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/costbenefitprojection.php b/admin/costbenefitprojection.php index dc30da57..078d7140 100644 --- a/admin/costbenefitprojection.php +++ b/admin/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index 6091e382..6fba9ada 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -1337,31 +1337,33 @@ abstract class CostbenefitprojectionHelper return false; } - public static function jsonToString($value, $sperator = ", ") + public static function jsonToString($value, $sperator = ", ", $table = null) { // check if string is JSON $result = json_decode($value, true); - if (json_last_error() === JSON_ERROR_NONE) { - // is JSON + if (json_last_error() === JSON_ERROR_NONE) + { + // is JSON if (self::checkArray($result)) { - $value = ''; - $counter = 0; - foreach ($result as $string) + if (self::checkString($table)) { - if ($counter) + $names = array(); + foreach ($result as $val) { - $value .= $sperator.$string; + if ($name = self::getVar($table, $val, 'id', 'name')) + { + $names[] = $name; + } } - else + if (self::checkArray($names)) { - $value .= $string; - } - $counter++; + return (string) implode($sperator,$names); + } } - return $value; + return (string) implode($sperator,$result); } - return json_decode($value); + return (string) json_decode($value); } return $value; } diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 5651df16..f575604b 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batch_.php diff --git a/admin/helpers/sum.php b/admin/helpers/sum.php index ec2887be..cbd5fc0d 100644 --- a/admin/helpers/sum.php +++ b/admin/helpers/sum.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sum.php @@ -1389,7 +1389,13 @@ class Sum // now set the result set if(CostbenefitprojectionHelper::checkArray($this->company->causesrisks) && isset($this->company->interventions) && CostbenefitprojectionHelper::checkArray($this->company->interventions)){ $i = 0; - foreach ($this->company->interventions as $mainkey => $item){ + foreach ($this->company->interventions as $mainkey => $item) + { + // make sure duration is set + if (!isset($item->duration) || !is_numeric($item->duration) || 1 > $item->duration) + { + $item->duration = 1; + } $this->interventions[$i]["id"] = $item->id; $this->interventions[$i]["name"] = $item->name; $this->interventions[$i]["description"] = $item->description; @@ -1399,24 +1405,24 @@ class Sum $this->interventions[$i]['found'] = array(); $this->interventions[$i]['not_found'] = array(); // set totals - $this->interventions[$i]['totals']['annual_cost_per_employee'] = 0; - $this->interventions[$i]['totals']['annual_costmoney_per_employee'] = 0; - $this->interventions[$i]['totals']['cost_of_problem_scaled'] = 0; - $this->interventions[$i]['totals']['cost_of_problem_unscaled'] = 0; - $this->interventions[$i]['totals']['costmoney_of_problem_scaled'] = 0; - $this->interventions[$i]['totals']['costmoney_of_problem_unscaled'] = 0; - $this->interventions[$i]['totals']['contribution_to_cost_scaled'] = 0; - $this->interventions[$i]['totals']['contribution_to_cost_unscaled'] = 0; - $this->interventions[$i]['totals']['annual_cost'] = 0; - $this->interventions[$i]['totals']['annual_costmoney'] = 0; - $this->interventions[$i]['totals']['annual_benefit_scaled'] = 0; - $this->interventions[$i]['totals']['annual_benefit_unscaled'] = 0; - $this->interventions[$i]['totals']['annualmoney_benefit_scaled'] = 0; - $this->interventions[$i]['totals']['annualmoney_benefit_unscaled'] = 0; - $this->interventions[$i]['totals']['net_benefit_scaled'] = 0; - $this->interventions[$i]['totals']['net_benefit_unscaled'] = 0; - $this->interventions[$i]['totals']['netmoney_benefit_scaled'] = 0; - $this->interventions[$i]['totals']['netmoney_benefit_unscaled'] = 0; + $this->interventions[$i]['totals']['cost_per_employee'] = 0; + $this->interventions[$i]['totals']['costmoney_per_employee'] = 0; + $this->interventions[$i]['totals']['cost_of_problem_scaled'] = 0; + $this->interventions[$i]['totals']['cost_of_problem_unscaled'] = 0; + $this->interventions[$i]['totals']['costmoney_of_problem_scaled'] = 0; + $this->interventions[$i]['totals']['costmoney_of_problem_unscaled'] = 0; + $this->interventions[$i]['totals']['contribution_to_cost_scaled'] = 0; + $this->interventions[$i]['totals']['contribution_to_cost_unscaled'] = 0; + $this->interventions[$i]['totals']['cost'] = 0; + $this->interventions[$i]['totals']['costmoney'] = 0; + $this->interventions[$i]['totals']['benefit_scaled'] = 0; + $this->interventions[$i]['totals']['benefit_unscaled'] = 0; + $this->interventions[$i]['totals']['benefitmoney_scaled'] = 0; + $this->interventions[$i]['totals']['benefitmoney_unscaled'] = 0; + $this->interventions[$i]['totals']['net_benefit_scaled'] = 0; + $this->interventions[$i]['totals']['net_benefit_unscaled'] = 0; + $this->interventions[$i]['totals']['net_benefitmoney_scaled'] = 0; + $this->interventions[$i]['totals']['net_benefitmoney_unscaled'] = 0; // now load the cause/risk that are linked to this user $a = 0; // set values @@ -1432,51 +1438,54 @@ class Sum $this->interventions[$i]['items'][$a]['costmoney_of_problem_unscaled'] = $this->items[$value['id']]->subtotal_costmoney_unscaled; $this->interventions[$i]['items'][$a]['costmoney_of_problem_scaled'] = $this->items[$value['id']]->subtotal_costmoney_scaled; - $this->interventions[$i]['items'][$a]['annual_cost'] = ($this->interventions[$i]["coverage"] /100) * $value['cpe'] - * ($this->company->males + $this->company->females); + $this->interventions[$i]['items'][$a]['cost'] = ($this->interventions[$i]["coverage"] /100) + * $value['cpe'] * ($this->company->males + $this->company->females) + * $item->duration; // turn into money - $this->interventions[$i]['items'][$a]['annual_costmoney'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['annual_cost']); + $this->interventions[$i]['items'][$a]['costmoney'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['cost']); - $this->interventions[$i]['items'][$a]['annual_benefit_unscaled'] = ($this->interventions[$i]["coverage"] /100) * ($value['mbr'] /100) - * ($this->items[$value['id']]->subtotal_cost_morbidity_unscaled - + $this->items[$value['id']]->subtotal_cost_presenteeism_unscaled) - + ($value['mtr']/100) * $this->items[$value['id']]->subtotal_cost_mortality_unscaled; + $this->interventions[$i]['items'][$a]['benefit_unscaled'] = ($this->interventions[$i]["coverage"] /100) * ($value['mbr'] /100) + * ($this->items[$value['id']]->subtotal_cost_morbidity_unscaled + + $this->items[$value['id']]->subtotal_cost_presenteeism_unscaled) + + ($value['mtr']/100) * $this->items[$value['id']]->subtotal_cost_mortality_unscaled + * $item->duration; - $this->interventions[$i]['items'][$a]['annual_benefit_scaled'] = ($this->interventions[$i]["coverage"] /100) * ($value['mbr'] /100) + $this->interventions[$i]['items'][$a]['benefit_scaled'] = ($this->interventions[$i]["coverage"] /100) * ($value['mbr'] /100) * ($this->items[$value['id']]->subtotal_cost_morbidity_scaled + $this->items[$value['id']]->subtotal_cost_presenteeism_scaled) - + ($value['mtr']/100) * $this->items[$value['id']]->subtotal_cost_mortality_scaled; + + ($value['mtr']/100) * $this->items[$value['id']]->subtotal_cost_mortality_scaled + * $item->duration; // turn into money - $this->interventions[$i]['items'][$a]['annualmoney_benefit_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['annual_benefit_unscaled']); - $this->interventions[$i]['items'][$a]['annualmoney_benefit_scaled'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['annual_benefit_scaled']); + $this->interventions[$i]['items'][$a]['benefitmoney_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['benefit_unscaled']); + $this->interventions[$i]['items'][$a]['benefitmoney_scaled'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['benefit_scaled']); - $this->interventions[$i]['items'][$a]['net_benefit_unscaled'] = $this->interventions[$i]['items'][$a]['annual_benefit_unscaled'] - - $this->interventions[$i]['items'][$a]['annual_cost']; - $this->interventions[$i]['items'][$a]['net_benefit_scaled'] = $this->interventions[$i]['items'][$a]['annual_benefit_scaled'] - - $this->interventions[$i]['items'][$a]['annual_cost']; + $this->interventions[$i]['items'][$a]['net_benefit_unscaled'] = $this->interventions[$i]['items'][$a]['benefit_unscaled'] + - $this->interventions[$i]['items'][$a]['cost']; + $this->interventions[$i]['items'][$a]['net_benefit_scaled'] = $this->interventions[$i]['items'][$a]['benefit_scaled'] + - $this->interventions[$i]['items'][$a]['cost']; // turn into money - $this->interventions[$i]['items'][$a]['netmoney_benefit_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['net_benefit_unscaled']); - $this->interventions[$i]['items'][$a]['netmoney_benefit_scaled'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['net_benefit_scaled']); + $this->interventions[$i]['items'][$a]['net_benefitmoney_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['net_benefit_unscaled']); + $this->interventions[$i]['items'][$a]['net_benefitmoney_scaled'] = $this->makeMoney((float)$this->interventions[$i]['items'][$a]['net_benefit_scaled']); // set ratio - $this->interventions[$i]['items'][$a]['benefit_ratio_unscaled'] = $this->interventions[$i]['items'][$a]['annual_benefit_unscaled'] - / $this->interventions[$i]['items'][$a]['annual_cost']; - $this->interventions[$i]['items'][$a]['benefit_ratio_scaled'] = $this->interventions[$i]['items'][$a]['annual_benefit_scaled'] - / $this->interventions[$i]['items'][$a]['annual_cost']; + $this->interventions[$i]['items'][$a]['benefit_ratio_unscaled'] = $this->interventions[$i]['items'][$a]['benefit_unscaled'] + / $this->interventions[$i]['items'][$a]['cost']; + $this->interventions[$i]['items'][$a]['benefit_ratio_scaled'] = $this->interventions[$i]['items'][$a]['benefit_scaled'] + / $this->interventions[$i]['items'][$a]['cost']; - $this->interventions[$i]['items'][$a]['annual_costmoney_per_employee'] = $this->makeMoney((float)$value['cpe']); + $this->interventions[$i]['items'][$a]['costmoney_per_employee'] = $this->makeMoney((float)$value['cpe']); // set totals - $this->interventions[$i]['totals']['annual_cost'] = $this->interventions[$i]['totals']['annual_cost'] - + $this->interventions[$i]['items'][$a]['annual_cost']; - $this->interventions[$i]['totals']['annual_benefit_scaled'] = $this->interventions[$i]['totals']['annual_benefit_scaled'] - + $this->interventions[$i]['items'][$a]['annual_benefit_scaled']; - $this->interventions[$i]['totals']['annual_benefit_unscaled'] = $this->interventions[$i]['totals']['annual_benefit_unscaled'] - + $this->interventions[$i]['items'][$a]['annual_benefit_unscaled']; + $this->interventions[$i]['totals']['cost'] = $this->interventions[$i]['totals']['cost'] + + $this->interventions[$i]['items'][$a]['cost']; + $this->interventions[$i]['totals']['benefit_scaled'] = $this->interventions[$i]['totals']['benefit_scaled'] + + $this->interventions[$i]['items'][$a]['benefit_scaled']; + $this->interventions[$i]['totals']['benefit_unscaled'] = $this->interventions[$i]['totals']['benefit_unscaled'] + + $this->interventions[$i]['items'][$a]['benefit_unscaled']; $this->interventions[$i]['totals']['net_benefit_scaled'] = $this->interventions[$i]['totals']['net_benefit_scaled'] + $this->interventions[$i]['items'][$a]['net_benefit_scaled']; $this->interventions[$i]['totals']['net_benefit_unscaled'] = $this->interventions[$i]['totals']['net_benefit_unscaled'] + $this->interventions[$i]['items'][$a]['net_benefit_unscaled']; - $this->interventions[$i]['totals']['annual_cost_per_employee'] = $this->interventions[$i]['totals']['annual_cost_per_employee'] + $value['cpe']; + $this->interventions[$i]['totals']['cost_per_employee'] = $this->interventions[$i]['totals']['cost_per_employee'] + $value['cpe']; $this->interventions[$i]['totals']['cost_of_problem_scaled'] = $this->interventions[$i]['totals']['cost_of_problem_scaled'] + $this->items[$value['id']]->subtotal_cost_scaled; @@ -1505,14 +1514,14 @@ class Sum $a++; } // set total money - $this->interventions[$i]['totals']['annual_costmoney_per_employee'] = $this->makeMoney((float)$this->interventions[$i]['totals']['annual_cost_per_employee']); + $this->interventions[$i]['totals']['costmoney_per_employee'] = $this->makeMoney((float)$this->interventions[$i]['totals']['cost_per_employee']); $this->interventions[$i]['totals']['costmoney_of_problem_scaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['cost_of_problem_scaled']); $this->interventions[$i]['totals']['costmoney_of_problem_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['cost_of_problem_unscaled']); - $this->interventions[$i]['totals']['annual_costmoney'] = $this->makeMoney((float)$this->interventions[$i]['totals']['annual_cost']); - $this->interventions[$i]['totals']['annualmoney_benefit_scaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['annual_benefit_scaled']); - $this->interventions[$i]['totals']['annualmoney_benefit_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['annual_benefit_unscaled']); - $this->interventions[$i]['totals']['netmoney_benefit_scaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['net_benefit_scaled']); - $this->interventions[$i]['totals']['netmoney_benefit_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['net_benefit_unscaled']); + $this->interventions[$i]['totals']['costmoney'] = $this->makeMoney((float)$this->interventions[$i]['totals']['cost']); + $this->interventions[$i]['totals']['benefitmoney_scaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['benefit_scaled']); + $this->interventions[$i]['totals']['benefitmoney_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['benefit_unscaled']); + $this->interventions[$i]['totals']['net_benefitmoney_scaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['net_benefit_scaled']); + $this->interventions[$i]['totals']['net_benefitmoney_unscaled'] = $this->makeMoney((float)$this->interventions[$i]['totals']['net_benefit_unscaled']); if (isset($this->interventions[$i]['items'])) { $this->interventions[$i]['nr_found'] = sizeof($this->interventions[$i]['items']); diff --git a/admin/helpers/sumcombine.php b/admin/helpers/sumcombine.php index ba4a39f8..a13a679c 100644 --- a/admin/helpers/sumcombine.php +++ b/admin/helpers/sumcombine.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage sumcombine.php diff --git a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini index 13d15d7f..9f6d0b0d 100644 --- a/admin/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/admin/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -3,16 +3,15 @@ COM_COSTBENEFITPROJECTION_ACCESS_TO_COMBINEDRESULTS_FAILED="Access to combinedre COM_COSTBENEFITPROJECTION_ADDING_CONTROL_STRUCTURE="Adding control structure" COM_COSTBENEFITPROJECTION_ADVANCED_METHOD="Advanced Method" COM_COSTBENEFITPROJECTION_ALL_NUMBERS_IN_BRACKETS_ARE_THE_RELATED_EMPLOYEES="All numbers in brackets are the related employees." -COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT="Annual Benefit" -COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION="Annual Cost of Intervention" -COM_COSTBENEFITPROJECTION_ANNUAL_COST_PER_EMPLOYEE="Annual Cost per Employee" COM_COSTBENEFITPROJECTION_AUTHOR="Author" COM_COSTBENEFITPROJECTION_BACK="Back" COM_COSTBENEFITPROJECTION_BASIC_METHOD="Basic Method" +COM_COSTBENEFITPROJECTION_BENEFIT="Benefit" COM_COSTBENEFITPROJECTION_CALCULATED_COSTS_IN_DETAIL="Calculated Costs in Detail" COM_COSTBENEFITPROJECTION_CAUSERISK="Cause/Risk" COM_COSTBENEFITPROJECTION_CAUSERISK_ALIAS="Alias" COM_COSTBENEFITPROJECTION_CAUSERISK_ALIAS_HINT="Auto-generated from name" +COM_COSTBENEFITPROJECTION_CAUSERISK_ALIAS_LABEL="Alias" COM_COSTBENEFITPROJECTION_CAUSERISK_CREATED_BY_DESC="The user that created the Cause/Risk." COM_COSTBENEFITPROJECTION_CAUSERISK_CREATED_BY_LABEL="Created by" COM_COSTBENEFITPROJECTION_CAUSERISK_CREATED_DATE_DESC="The date Cause/Risk was created." @@ -418,9 +417,10 @@ COM_COSTBENEFITPROJECTION_COST_BENEFIT_RATIO="Cost / Benefit Ratio" COM_COSTBENEFITPROJECTION_COST_IN_S="Cost in %s" COM_COSTBENEFITPROJECTION_COST_MORBIDITY="Cost Morbidity" COM_COSTBENEFITPROJECTION_COST_MORTALITY="Cost Mortality" +COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION="Cost of Intervention" COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM="Cost of Problem" COM_COSTBENEFITPROJECTION_COST_PERCENT="Cost Percent" -COM_COSTBENEFITPROJECTION_COST_PER_EMPLOYEE="Cost Per Employee" +COM_COSTBENEFITPROJECTION_COST_PER_EMPLOYEE="Cost per Employee" COM_COSTBENEFITPROJECTION_COST_PRESENTEEISM_DUE_TO_MORBIDITY="Cost Presenteeism (due to morbidity)" COM_COSTBENEFITPROJECTION_COST_SUMMARY="Cost Summary" COM_COSTBENEFITPROJECTION_COUNTRIES="Countries" @@ -472,6 +472,7 @@ COM_COSTBENEFITPROJECTION_COUNTRY_AGE_GROUPS_PERCENTAGES="Age Groups Percentages COM_COSTBENEFITPROJECTION_COUNTRY_AGE_LABEL="Age Group" COM_COSTBENEFITPROJECTION_COUNTRY_ALIAS="Alias" COM_COSTBENEFITPROJECTION_COUNTRY_ALIAS_HINT="Auto-generated from name" +COM_COSTBENEFITPROJECTION_COUNTRY_ALIAS_LABEL="Alias" COM_COSTBENEFITPROJECTION_COUNTRY_CAUSERISK_SELECTION="Cause/Risk Selection" COM_COSTBENEFITPROJECTION_COUNTRY_CAUSESRISKS="Causesrisks" COM_COSTBENEFITPROJECTION_COUNTRY_CAUSESRISKS_LABEL="Causes/Risks" @@ -612,6 +613,7 @@ COM_COSTBENEFITPROJECTION_CPANEL_ACCESS_SITE="cPanel (Site) Access" COM_COSTBENEFITPROJECTION_CPANEL_ACCESS_SITE_DESC=" Allows the users in this group to access site cpanel." COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE="Create Account (giz) (Site) Access" COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE_DESC=" Allows the users in this group to access site create account giz." +COM_COSTBENEFITPROJECTION_CREATE_NEW_S="Create New %s" COM_COSTBENEFITPROJECTION_CURRENCIES="Currencies" COM_COSTBENEFITPROJECTION_CURRENCIES_ACCESS="Currencies Access" COM_COSTBENEFITPROJECTION_CURRENCIES_ACCESS_DESC="Allows the users in this group to access access currencies" @@ -659,6 +661,7 @@ COM_COSTBENEFITPROJECTION_CURRENCIES_SUBMENU_DESC="Allows the users in this grou COM_COSTBENEFITPROJECTION_CURRENCY="Currency" COM_COSTBENEFITPROJECTION_CURRENCY_ALIAS="Alias" COM_COSTBENEFITPROJECTION_CURRENCY_ALIAS_HINT="Auto-generated from name" +COM_COSTBENEFITPROJECTION_CURRENCY_ALIAS_LABEL="Alias" COM_COSTBENEFITPROJECTION_CURRENCY_CODETHREE="Codethree" COM_COSTBENEFITPROJECTION_CURRENCY_CODETHREE_DESCRIPTION="The following is a list of active codes of official ISO 4217 currency names." COM_COSTBENEFITPROJECTION_CURRENCY_CODETHREE_HINT="NAD" @@ -742,6 +745,7 @@ COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY="Edit Created By" COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by." COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE="Edit Created Date" COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date." +COM_COSTBENEFITPROJECTION_EDIT_S="Edit %s" COM_COSTBENEFITPROJECTION_EDIT_VERSIONS="Edit Version" COM_COSTBENEFITPROJECTION_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions." COM_COSTBENEFITPROJECTION_EXPORT_DATA="Export Data" @@ -922,6 +926,7 @@ COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN_VIEW_LABEL="Admin Views" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALIAS="Alias" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALIAS_HINT="Auto-generated from name" +COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALIAS_LABEL="Alias" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALL="All" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ARTICLE="Article" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ARTICLE_LABEL="Article" @@ -1091,6 +1096,8 @@ 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="Set in number of years" +COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL="Duration (years)" 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 5c117725..09fe3e80 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage batchselection.php diff --git a/admin/layouts/causerisk/details_above.php b/admin/layouts/causerisk/details_above.php index b334ee15..0cf524b7 100644 --- a/admin/layouts/causerisk/details_above.php +++ b/admin/layouts/causerisk/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/causerisk/details_left.php b/admin/layouts/causerisk/details_left.php index 2dd5a68d..39ce380e 100644 --- a/admin/layouts/causerisk/details_left.php +++ b/admin/layouts/causerisk/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/causerisk/publishing.php b/admin/layouts/causerisk/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/causerisk/publishing.php +++ b/admin/layouts/causerisk/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/causerisk/publlshing.php b/admin/layouts/causerisk/publlshing.php index fc32ca84..430ab0b5 100644 --- a/admin/layouts/causerisk/publlshing.php +++ b/admin/layouts/causerisk/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/age_groups_percentages_fullwidth.php b/admin/layouts/company/age_groups_percentages_fullwidth.php index 6b7179d6..ae8aa79d 100644 --- a/admin/layouts/company/age_groups_percentages_fullwidth.php +++ b/admin/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/admin/layouts/company/age_groups_percentages_left.php b/admin/layouts/company/age_groups_percentages_left.php index 2a2eec3b..af0473a6 100644 --- a/admin/layouts/company/age_groups_percentages_left.php +++ b/admin/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/company/age_groups_percentages_right.php b/admin/layouts/company/age_groups_percentages_right.php index 5412af6b..8225dd4d 100644 --- a/admin/layouts/company/age_groups_percentages_right.php +++ b/admin/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/company/causerisk_selection_fullwidth.php b/admin/layouts/company/causerisk_selection_fullwidth.php index 4cd4ca6b..46438228 100644 --- a/admin/layouts/company/causerisk_selection_fullwidth.php +++ b/admin/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/company/details_above.php b/admin/layouts/company/details_above.php index d7867017..d9a01104 100644 --- a/admin/layouts/company/details_above.php +++ b/admin/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/company/details_left.php b/admin/layouts/company/details_left.php index 46355b66..debb754f 100644 --- a/admin/layouts/company/details_left.php +++ b/admin/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/company/details_right.php b/admin/layouts/company/details_right.php index d00caec7..673f65db 100644 --- a/admin/layouts/company/details_right.php +++ b/admin/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/company/details_under.php b/admin/layouts/company/details_under.php index 03e4427c..9f3c0b31 100644 --- a/admin/layouts/company/details_under.php +++ b/admin/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index 398ba66a..1e7700ab 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -54,6 +54,9 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); + + + @@ -92,6 +95,9 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); escape($item->description); ?> + + escape($item->duration); ?> + published == 1):?> @@ -125,7 +131,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - + diff --git a/admin/layouts/company/publishing.php b/admin/layouts/company/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/company/publishing.php +++ b/admin/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/company/publlshing.php b/admin/layouts/company/publlshing.php index fc32ca84..430ab0b5 100644 --- a/admin/layouts/company/publlshing.php +++ b/admin/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index 014e8029..9d26e531 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php diff --git a/admin/layouts/country/age_groups_percentages_left.php b/admin/layouts/country/age_groups_percentages_left.php index 2a2eec3b..af0473a6 100644 --- a/admin/layouts/country/age_groups_percentages_left.php +++ b/admin/layouts/country/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/admin/layouts/country/age_groups_percentages_right.php b/admin/layouts/country/age_groups_percentages_right.php index 5412af6b..8225dd4d 100644 --- a/admin/layouts/country/age_groups_percentages_right.php +++ b/admin/layouts/country/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/admin/layouts/country/causerisk_selection_fullwidth.php b/admin/layouts/country/causerisk_selection_fullwidth.php index f1422c43..3160bec1 100644 --- a/admin/layouts/country/causerisk_selection_fullwidth.php +++ b/admin/layouts/country/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index e327535d..db6a7baf 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php diff --git a/admin/layouts/country/details_above.php b/admin/layouts/country/details_above.php index 1e1e4201..dd9106ec 100644 --- a/admin/layouts/country/details_above.php +++ b/admin/layouts/country/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/country/details_left.php b/admin/layouts/country/details_left.php index 0fff441f..ce0be040 100644 --- a/admin/layouts/country/details_left.php +++ b/admin/layouts/country/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/country/details_right.php b/admin/layouts/country/details_right.php index 131bf4c8..ded1d6f5 100644 --- a/admin/layouts/country/details_right.php +++ b/admin/layouts/country/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/country/health_data_totals_left.php b/admin/layouts/country/health_data_totals_left.php index 79da3fad..ad7d9050 100644 --- a/admin/layouts/country/health_data_totals_left.php +++ b/admin/layouts/country/health_data_totals_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_left.php diff --git a/admin/layouts/country/health_data_totals_right.php b/admin/layouts/country/health_data_totals_right.php index 84ba0fce..fbcf25af 100644 --- a/admin/layouts/country/health_data_totals_right.php +++ b/admin/layouts/country/health_data_totals_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data_totals_right.php diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index a8cf4060..e008fd31 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -54,6 +54,9 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); + + + @@ -96,6 +99,9 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); escape($item->description); ?> + + escape($item->duration); ?> + published == 1):?> @@ -129,7 +135,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - + diff --git a/admin/layouts/country/public_details_fullwidth.php b/admin/layouts/country/public_details_fullwidth.php index 0daca4f7..f31802e5 100644 --- a/admin/layouts/country/public_details_fullwidth.php +++ b/admin/layouts/country/public_details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage public_details_fullwidth.php diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/country/publlshing.php b/admin/layouts/country/publlshing.php index fc32ca84..430ab0b5 100644 --- a/admin/layouts/country/publlshing.php +++ b/admin/layouts/country/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index e09ffa0a..394fd088 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers_fullwidth.php diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index ea2736f9..e8ea1ba7 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index a074fc6b..7f4638a7 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index bf953f68..99c9c557 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/currency/publlshing.php b/admin/layouts/currency/publlshing.php index fc32ca84..430ab0b5 100644 --- a/admin/layouts/currency/publlshing.php +++ b/admin/layouts/currency/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/databreakdownmalefemale.php b/admin/layouts/databreakdownmalefemale.php index de43f7bd..4a0a9e80 100644 --- a/admin/layouts/databreakdownmalefemale.php +++ b/admin/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/admin/layouts/health_data/details_above.php b/admin/layouts/health_data/details_above.php index c9c71b00..e2b93ad6 100644 --- a/admin/layouts/health_data/details_above.php +++ b/admin/layouts/health_data/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/health_data/details_left.php b/admin/layouts/health_data/details_left.php index 73cb92c2..739cc846 100644 --- a/admin/layouts/health_data/details_left.php +++ b/admin/layouts/health_data/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/health_data/details_right.php b/admin/layouts/health_data/details_right.php index 074478f8..556df5f0 100644 --- a/admin/layouts/health_data/details_right.php +++ b/admin/layouts/health_data/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/health_data/details_rightside.php b/admin/layouts/health_data/details_rightside.php index 201e0bc8..6a7e44cd 100644 --- a/admin/layouts/health_data/details_rightside.php +++ b/admin/layouts/health_data/details_rightside.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_rightside.php diff --git a/admin/layouts/health_data/publishing.php b/admin/layouts/health_data/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/health_data/publishing.php +++ b/admin/layouts/health_data/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/health_data/publlshing.php b/admin/layouts/health_data/publlshing.php index fc32ca84..430ab0b5 100644 --- a/admin/layouts/health_data/publlshing.php +++ b/admin/layouts/health_data/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 31df9fa2..3ae36fca 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index e31a1ab2..f366e206 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 111e87f0..2513685b 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index 84f9d428..83ada468 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index 03e4427c..9f3c0b31 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 731265dd..a383c21d 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/details_above.php b/admin/layouts/intervention/details_above.php index d8016da9..97a10fc5 100644 --- a/admin/layouts/intervention/details_above.php +++ b/admin/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/intervention/details_fullwidth.php b/admin/layouts/intervention/details_fullwidth.php index 44ba1398..c28a9bec 100644 --- a/admin/layouts/intervention/details_fullwidth.php +++ b/admin/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/admin/layouts/intervention/details_under.php b/admin/layouts/intervention/details_under.php index 03e4427c..9f3c0b31 100644 --- a/admin/layouts/intervention/details_under.php +++ b/admin/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/admin/layouts/intervention/publishing.php b/admin/layouts/intervention/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/intervention/publishing.php +++ b/admin/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/intervention/publlshing.php b/admin/layouts/intervention/publlshing.php index 731265dd..a383c21d 100644 --- a/admin/layouts/intervention/publlshing.php +++ b/admin/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/intervention/settings_fullwidth.php b/admin/layouts/intervention/settings_fullwidth.php index 46dd82b8..bc8dc792 100644 --- a/admin/layouts/intervention/settings_fullwidth.php +++ b/admin/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/admin/layouts/intervention/settings_left.php b/admin/layouts/intervention/settings_left.php index c804f53c..45dd2588 100644 --- a/admin/layouts/intervention/settings_left.php +++ b/admin/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/admin/layouts/scaling_factor/details_above.php b/admin/layouts/scaling_factor/details_above.php index bc657a11..819c76f1 100644 --- a/admin/layouts/scaling_factor/details_above.php +++ b/admin/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/scaling_factor/details_left.php b/admin/layouts/scaling_factor/details_left.php index 14a2b343..5a35e751 100644 --- a/admin/layouts/scaling_factor/details_left.php +++ b/admin/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/scaling_factor/details_right.php b/admin/layouts/scaling_factor/details_right.php index d465bcce..67af40e8 100644 --- a/admin/layouts/scaling_factor/details_right.php +++ b/admin/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/scaling_factor/publishing.php b/admin/layouts/scaling_factor/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/scaling_factor/publishing.php +++ b/admin/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/scaling_factor/publlshing.php b/admin/layouts/scaling_factor/publlshing.php index 731265dd..a383c21d 100644 --- a/admin/layouts/scaling_factor/publlshing.php +++ b/admin/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index ddfbe436..f89ae0f0 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies_fullwidth.php diff --git a/admin/layouts/service_provider/details_above.php b/admin/layouts/service_provider/details_above.php index 2caf4f2d..261a2c71 100644 --- a/admin/layouts/service_provider/details_above.php +++ b/admin/layouts/service_provider/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/admin/layouts/service_provider/details_left.php b/admin/layouts/service_provider/details_left.php index 8166baec..c8ebd9ed 100644 --- a/admin/layouts/service_provider/details_left.php +++ b/admin/layouts/service_provider/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/admin/layouts/service_provider/details_right.php b/admin/layouts/service_provider/details_right.php index 7598e6b4..0048b949 100644 --- a/admin/layouts/service_provider/details_right.php +++ b/admin/layouts/service_provider/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/admin/layouts/service_provider/publishing.php b/admin/layouts/service_provider/publishing.php index c26f6c72..47caf08e 100644 --- a/admin/layouts/service_provider/publishing.php +++ b/admin/layouts/service_provider/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/admin/layouts/service_provider/publlshing.php b/admin/layouts/service_provider/publlshing.php index 731265dd..a383c21d 100644 --- a/admin/layouts/service_provider/publlshing.php +++ b/admin/layouts/service_provider/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 5cc978cb..44ac07b8 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/admin/models/causerisk.php b/admin/models/causerisk.php index 97ca8e69..4921767b 100644 --- a/admin/models/causerisk.php +++ b/admin/models/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/models/causesrisks.php b/admin/models/causesrisks.php index f9ae9c3c..875a6fe6 100644 --- a/admin/models/causesrisks.php +++ b/admin/models/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php diff --git a/admin/models/combinedresults.php b/admin/models/combinedresults.php index d89a63d8..3835852b 100644 --- a/admin/models/combinedresults.php +++ b/admin/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/admin/models/companies.php b/admin/models/companies.php index 1e5ccbad..a30b8a8a 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companies.php diff --git a/admin/models/company.php b/admin/models/company.php index fa5fe0c9..f22f0908 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/models/companyresults.php b/admin/models/companyresults.php index 660bac46..90b72ae8 100644 --- a/admin/models/companyresults.php +++ b/admin/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/admin/models/costbenefitprojection.php b/admin/models/costbenefitprojection.php index 4df90dc9..07156679 100644 --- a/admin/models/costbenefitprojection.php +++ b/admin/models/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/admin/models/countries.php b/admin/models/countries.php index 091cc598..6d63d62e 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php diff --git a/admin/models/country.php b/admin/models/country.php index e2d12166..ac0b98c4 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/models/currencies.php b/admin/models/currencies.php index 2159f093..a85c73cb 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currencies.php diff --git a/admin/models/currency.php b/admin/models/currency.php index b8d9e61b..c39bf6f6 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index d872074f..6cd32888 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage articles.php @@ -51,30 +51,80 @@ class JFormFieldArticles extends JFormFieldList // if true set button if ($setButton === 'true') { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } $user = JFactory::getUser(); // only add if user allowed to create article if ($user->authorise('core.create', 'com_costbenefitprojection')) { - // get the input from url - $jinput = JFactory::getApplication()->input; - // get the view name & id - $values = $jinput->getArray(array( - 'id' => 'int', - 'view' => 'word' - )); - // check if new item - $ref = ''; - if (!is_null($values['id']) && strlen($values['view'])) - { - // only load referal if not new item. - $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; - } - // build the button - $button = ' - ' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . ''; - // return the button attached to input field - return $html . $button; + '; + } + // only add if user allowed to edit article + if (($buttonName == 'article' || $buttonName == 'articles') && $user->authorise('core.edit', 'com_costbenefitprojection')) + { + // build edit button + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_costbenefitprojection&view=articles&task=article.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for article field. + if (CostbenefitprojectionHelper::checkArray($button)) + { + // Add some final script + $script[] = " + jQuery(document).ready(function() { + jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); + });"; + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return $html . implode('',$button); } } return $html; diff --git a/admin/models/fields/causesrisks.php b/admin/models/fields/causesrisks.php index e2bad296..1fa49b9a 100644 --- a/admin/models/fields/causesrisks.php +++ b/admin/models/fields/causesrisks.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesrisks.php @@ -51,30 +51,80 @@ class JFormFieldCausesrisks extends JFormFieldList // if true set button if ($setButton === 'true') { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } $user = JFactory::getUser(); // only add if user allowed to create causerisk if ($user->authorise('causerisk.create', 'com_costbenefitprojection')) { - // get the input from url - $jinput = JFactory::getApplication()->input; - // get the view name & id - $values = $jinput->getArray(array( - 'id' => 'int', - 'view' => 'word' - )); - // check if new item - $ref = ''; - if (!is_null($values['id']) && strlen($values['view'])) - { - // only load referal if not new item. - $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; - } - // build the button - $button = ' - ' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . ''; - // return the button attached to input field - return $html . $button; + '; + } + // only add if user allowed to edit causerisk + if (($buttonName == 'causerisk' || $buttonName == 'causesrisks') && $user->authorise('causerisk.edit', 'com_costbenefitprojection')) + { + // build edit button + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_costbenefitprojection&view=causesrisks&task=causerisk.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for causerisk field. + if (CostbenefitprojectionHelper::checkArray($button)) + { + // Add some final script + $script[] = " + jQuery(document).ready(function() { + jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); + });"; + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return $html . implode('',$button); } } return $html; diff --git a/admin/models/fields/causesriskscheck.php b/admin/models/fields/causesriskscheck.php index d03bef27..b89a5deb 100644 --- a/admin/models/fields/causesriskscheck.php +++ b/admin/models/fields/causesriskscheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causesriskscheck.php diff --git a/admin/models/fields/company.php b/admin/models/fields/company.php index 16089aef..8d85829e 100644 --- a/admin/models/fields/company.php +++ b/admin/models/fields/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php @@ -51,30 +51,80 @@ class JFormFieldCompany extends JFormFieldList // if true set button if ($setButton === 'true') { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } $user = JFactory::getUser(); // only add if user allowed to create company if ($user->authorise('company.create', 'com_costbenefitprojection')) { - // get the input from url - $jinput = JFactory::getApplication()->input; - // get the view name & id - $values = $jinput->getArray(array( - 'id' => 'int', - 'view' => 'word' - )); - // check if new item - $ref = ''; - if (!is_null($values['id']) && strlen($values['view'])) - { - // only load referal if not new item. - $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; - } - // build the button - $button = ' - ' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . ''; - // return the button attached to input field - return $html . $button; + '; + } + // only add if user allowed to edit company + if (($buttonName == 'company' || $buttonName == 'companies') && $user->authorise('company.edit', 'com_costbenefitprojection')) + { + // build edit button + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_costbenefitprojection&view=companies&task=company.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for company field. + if (CostbenefitprojectionHelper::checkArray($button)) + { + // Add some final script + $script[] = " + jQuery(document).ready(function() { + jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); + });"; + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return $html . implode('',$button); } } return $html; diff --git a/admin/models/fields/companycheck.php b/admin/models/fields/companycheck.php index f2da4e99..c03d739b 100644 --- a/admin/models/fields/companycheck.php +++ b/admin/models/fields/companycheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companycheck.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index ee360a05..8577b45f 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countries.php @@ -51,30 +51,80 @@ class JFormFieldCountries extends JFormFieldList // if true set button if ($setButton === 'true') { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } $user = JFactory::getUser(); // only add if user allowed to create country if ($user->authorise('country.create', 'com_costbenefitprojection')) { - // get the input from url - $jinput = JFactory::getApplication()->input; - // get the view name & id - $values = $jinput->getArray(array( - 'id' => 'int', - 'view' => 'word' - )); - // check if new item - $ref = ''; - if (!is_null($values['id']) && strlen($values['view'])) - { - // only load referal if not new item. - $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; - } - // build the button - $button = ' - ' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . ''; - // return the button attached to input field - return $html . $button; + '; + } + // only add if user allowed to edit country + if (($buttonName == 'country' || $buttonName == 'countries') && $user->authorise('country.edit', 'com_costbenefitprojection')) + { + // build edit button + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_costbenefitprojection&view=countries&task=country.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for country field. + if (CostbenefitprojectionHelper::checkArray($button)) + { + // Add some final script + $script[] = " + jQuery(document).ready(function() { + jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); + });"; + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return $html . implode('',$button); } } return $html; diff --git a/admin/models/fields/countryuser.php b/admin/models/fields/countryuser.php index 4b678a3b..be1f1f70 100644 --- a/admin/models/fields/countryuser.php +++ b/admin/models/fields/countryuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage countryuser.php diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index cc7e3a2c..39d601ea 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php @@ -51,30 +51,80 @@ class JFormFieldCurrency extends JFormFieldList // if true set button if ($setButton === 'true') { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } $user = JFactory::getUser(); // only add if user allowed to create currency if ($user->authorise('currency.create', 'com_costbenefitprojection')) { - // get the input from url - $jinput = JFactory::getApplication()->input; - // get the view name & id - $values = $jinput->getArray(array( - 'id' => 'int', - 'view' => 'word' - )); - // check if new item - $ref = ''; - if (!is_null($values['id']) && strlen($values['view'])) - { - // only load referal if not new item. - $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; - } - // build the button - $button = ' - ' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . ''; - // return the button attached to input field - return $html . $button; + '; + } + // only add if user allowed to edit currency + if (($buttonName == 'currency' || $buttonName == 'currencies') && $user->authorise('currency.edit', 'com_costbenefitprojection')) + { + // build edit button + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_costbenefitprojection&view=currencies&task=currency.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for currency field. + if (CostbenefitprojectionHelper::checkArray($button)) + { + // Add some final script + $script[] = " + jQuery(document).ready(function() { + jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); + });"; + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return $html . implode('',$button); } } return $html; diff --git a/admin/models/fields/datayear.php b/admin/models/fields/datayear.php index d21e52a2..702c0d93 100644 --- a/admin/models/fields/datayear.php +++ b/admin/models/fields/datayear.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage datayear.php @@ -51,30 +51,80 @@ class JFormFieldDatayear extends JFormFieldList // if true set button if ($setButton === 'true') { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } $user = JFactory::getUser(); // only add if user allowed to create health_data if ($user->authorise('health_data.create', 'com_costbenefitprojection')) { - // get the input from url - $jinput = JFactory::getApplication()->input; - // get the view name & id - $values = $jinput->getArray(array( - 'id' => 'int', - 'view' => 'word' - )); - // check if new item - $ref = ''; - if (!is_null($values['id']) && strlen($values['view'])) - { - // only load referal if not new item. - $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; - } - // build the button - $button = ' - ' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . ''; - // return the button attached to input field - return $html . $button; + '; + } + // only add if user allowed to edit health_data + if (($buttonName == 'health_data' || $buttonName == 'health_data_sets') && $user->authorise('health_data.edit', 'com_costbenefitprojection')) + { + // build edit button + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_costbenefitprojection&view=health_data_sets&task=health_data.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for health_data field. + if (CostbenefitprojectionHelper::checkArray($button)) + { + // Add some final script + $script[] = " + jQuery(document).ready(function() { + jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); + });"; + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return $html . implode('',$button); } } return $html; diff --git a/admin/models/fields/interventions.php b/admin/models/fields/interventions.php index 92ec28cb..a0f96b17 100644 --- a/admin/models/fields/interventions.php +++ b/admin/models/fields/interventions.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions.php @@ -51,30 +51,80 @@ class JFormFieldInterventions extends JFormFieldList // if true set button if ($setButton === 'true') { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } $user = JFactory::getUser(); // only add if user allowed to create intervention if ($user->authorise('intervention.create', 'com_costbenefitprojection')) { - // get the input from url - $jinput = JFactory::getApplication()->input; - // get the view name & id - $values = $jinput->getArray(array( - 'id' => 'int', - 'view' => 'word' - )); - // check if new item - $ref = ''; - if (!is_null($values['id']) && strlen($values['view'])) - { - // only load referal if not new item. - $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; - } - // build the button - $button = ' - ' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . ''; - // return the button attached to input field - return $html . $button; + '; + } + // only add if user allowed to edit intervention + if (($buttonName == 'intervention' || $buttonName == 'interventions') && $user->authorise('intervention.edit', 'com_costbenefitprojection')) + { + // build edit button + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for intervention field. + if (CostbenefitprojectionHelper::checkArray($button)) + { + // Add some final script + $script[] = " + jQuery(document).ready(function() { + jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); + });"; + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return $html . implode('',$button); } } return $html; diff --git a/admin/models/fields/memberuser.php b/admin/models/fields/memberuser.php index 7e904185..e01183b6 100644 --- a/admin/models/fields/memberuser.php +++ b/admin/models/fields/memberuser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage memberuser.php diff --git a/admin/models/fields/serviceprovider.php b/admin/models/fields/serviceprovider.php index b6f95bb0..6597419e 100644 --- a/admin/models/fields/serviceprovider.php +++ b/admin/models/fields/serviceprovider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovider.php @@ -51,30 +51,80 @@ class JFormFieldServiceprovider extends JFormFieldList // if true set button if ($setButton === 'true') { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } $user = JFactory::getUser(); // only add if user allowed to create service_provider if ($user->authorise('service_provider.create', 'com_costbenefitprojection')) { - // get the input from url - $jinput = JFactory::getApplication()->input; - // get the view name & id - $values = $jinput->getArray(array( - 'id' => 'int', - 'view' => 'word' - )); - // check if new item - $ref = ''; - if (!is_null($values['id']) && strlen($values['view'])) - { - // only load referal if not new item. - $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; - } - // build the button - $button = ' - ' . JText::_('COM_COSTBENEFITPROJECTION_NEW') . ''; - // return the button attached to input field - return $html . $button; + '; + } + // only add if user allowed to edit service_provider + if (($buttonName == 'service_provider' || $buttonName == 'service_providers') && $user->authorise('service_provider.edit', 'com_costbenefitprojection')) + { + // build edit button + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for service_provider field. + if (CostbenefitprojectionHelper::checkArray($button)) + { + // Add some final script + $script[] = " + jQuery(document).ready(function() { + jQuery('#jform_".$buttonName."').closest('.control-group').addClass('input-append'); + });"; + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return $html . implode('',$button); } } return $html; diff --git a/admin/models/fields/serviceprovideruser.php b/admin/models/fields/serviceprovideruser.php index 365c1f1f..aaf46c0f 100644 --- a/admin/models/fields/serviceprovideruser.php +++ b/admin/models/fields/serviceprovideruser.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage serviceprovideruser.php diff --git a/admin/models/forms/causerisk.js b/admin/models/forms/causerisk.js index a2547636..e0c79787 100644 --- a/admin/models/forms/causerisk.js +++ b/admin/models/forms/causerisk.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.js diff --git a/admin/models/forms/causerisk.xml b/admin/models/forms/causerisk.xml index 074ac829..06e25a4e 100644 --- a/admin/models/forms/causerisk.xml +++ b/admin/models/forms/causerisk.xml @@ -148,7 +148,7 @@ - + + + + + + + + - - - - - - - - + setState('filter.coverage', $coverage); $description = $this->getUserStateFromRequest($this->context . '.filter.description', 'filter_description'); - $this->setState('filter.description', $description); + $this->setState('filter.description', $description); + + $duration = $this->getUserStateFromRequest($this->context . '.filter.duration', 'filter_duration'); + $this->setState('filter.duration', $duration); $sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int'); $this->setState('filter.sorting', $sorting); @@ -242,7 +246,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.description LIKE '.$search.' OR a.reference LIKE '.$search.' OR a.duration 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.duration LIKE '.$search.' OR a.reference LIKE '.$search.')'); } } @@ -261,6 +265,11 @@ 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'); @@ -414,7 +423,8 @@ class CostbenefitprojectionModelInterventions extends JModelList $id .= ':' . $this->getState('filter.company'); $id .= ':' . $this->getState('filter.type'); $id .= ':' . $this->getState('filter.coverage'); - $id .= ':' . $this->getState('filter.description'); + $id .= ':' . $this->getState('filter.description'); + $id .= ':' . $this->getState('filter.duration'); return parent::getStoreId($id); } diff --git a/admin/models/scaling_factor.php b/admin/models/scaling_factor.php index 10cfa894..b93b4a4b 100644 --- a/admin/models/scaling_factor.php +++ b/admin/models/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/models/scaling_factors.php b/admin/models/scaling_factors.php index 3dba7e44..4b35e4ea 100644 --- a/admin/models/scaling_factors.php +++ b/admin/models/scaling_factors.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors.php diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 66ef28e5..aab41845 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/models/service_providers.php b/admin/models/service_providers.php index 3a0cfd7f..a8b3c5e4 100644 --- a/admin/models/service_providers.php +++ b/admin/models/service_providers.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_providers.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 11d5cfda..506df94f 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -276,8 +276,9 @@ CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_intervention` ( KEY `idx_company` (`company`), KEY `idx_type` (`type`), KEY `idx_coverage` (`coverage`), - KEY `idx_country` (`country`), - KEY `idx_share` (`share`) + KEY `idx_duration` (`duration`), + KEY `idx_share` (`share`), + KEY `idx_country` (`country`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__costbenefitprojection_currency` ( diff --git a/admin/sql/updates/mysql/3.3.11.sql b/admin/sql/updates/mysql/3.3.11.sql new file mode 100644 index 00000000..d3f5a12f --- /dev/null +++ b/admin/sql/updates/mysql/3.3.11.sql @@ -0,0 +1 @@ + diff --git a/admin/tables/causerisk.php b/admin/tables/causerisk.php index 24ac75c8..fc9cc694 100644 --- a/admin/tables/causerisk.php +++ b/admin/tables/causerisk.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk.php diff --git a/admin/tables/company.php b/admin/tables/company.php index c82600dd..26c77b16 100644 --- a/admin/tables/company.php +++ b/admin/tables/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/admin/tables/country.php b/admin/tables/country.php index 04db0a5b..81744878 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage country.php diff --git a/admin/tables/currency.php b/admin/tables/currency.php index b90c4f1f..92976a8e 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage currency.php diff --git a/admin/tables/health_data.php b/admin/tables/health_data.php index c2d5c053..00d2a0e2 100644 --- a/admin/tables/health_data.php +++ b/admin/tables/health_data.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage health_data.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 1b06a3c8..72a80e2b 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help_document.php diff --git a/admin/tables/intervention.php b/admin/tables/intervention.php index 0b7135e7..24a6e499 100644 --- a/admin/tables/intervention.php +++ b/admin/tables/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/admin/tables/scaling_factor.php b/admin/tables/scaling_factor.php index f31edf5a..8e24fa25 100644 --- a/admin/tables/scaling_factor.php +++ b/admin/tables/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/admin/tables/service_provider.php b/admin/tables/service_provider.php index 3bf651c7..7b18821e 100644 --- a/admin/tables/service_provider.php +++ b/admin/tables/service_provider.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage service_provider.php diff --git a/admin/vdm.php b/admin/vdm.php index 38bb5708..057032ed 100644 --- a/admin/vdm.php +++ b/admin/vdm.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage vdm.php diff --git a/admin/views/causerisk/submitbutton.js b/admin/views/causerisk/submitbutton.js index 2b2d83ab..a2ab4c46 100644 --- a/admin/views/causerisk/submitbutton.js +++ b/admin/views/causerisk/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/causerisk/tmpl/edit.php b/admin/views/causerisk/tmpl/edit.php index fe82b239..ad0994cb 100644 --- a/admin/views/causerisk/tmpl/edit.php +++ b/admin/views/causerisk/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/causerisk/view.html.php b/admin/views/causerisk/view.html.php index 10130bcd..cfdc3c95 100644 --- a/admin/views/causerisk/view.html.php +++ b/admin/views/causerisk/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/causesrisks/tmpl/default.php b/admin/views/causesrisks/tmpl/default.php index a6430c78..55604d7c 100644 --- a/admin/views/causesrisks/tmpl/default.php +++ b/admin/views/causesrisks/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/causesrisks/tmpl/default_batch_body.php b/admin/views/causesrisks/tmpl/default_batch_body.php index 36f8c57e..ebe025b4 100644 --- a/admin/views/causesrisks/tmpl/default_batch_body.php +++ b/admin/views/causesrisks/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/causesrisks/tmpl/default_batch_footer.php b/admin/views/causesrisks/tmpl/default_batch_footer.php index 0c396525..21ac3378 100644 --- a/admin/views/causesrisks/tmpl/default_batch_footer.php +++ b/admin/views/causesrisks/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/causesrisks/tmpl/default_body.php b/admin/views/causesrisks/tmpl/default_body.php index 779a8818..178e111d 100644 --- a/admin/views/causesrisks/tmpl/default_body.php +++ b/admin/views/causesrisks/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/causesrisks/tmpl/default_foot.php b/admin/views/causesrisks/tmpl/default_foot.php index 3bec62a4..8cd6e014 100644 --- a/admin/views/causesrisks/tmpl/default_foot.php +++ b/admin/views/causesrisks/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/causesrisks/tmpl/default_head.php b/admin/views/causesrisks/tmpl/default_head.php index d2c13067..06a72273 100644 --- a/admin/views/causesrisks/tmpl/default_head.php +++ b/admin/views/causesrisks/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/causesrisks/tmpl/default_toolbar.php b/admin/views/causesrisks/tmpl/default_toolbar.php index a6179d52..f07bdc9b 100644 --- a/admin/views/causesrisks/tmpl/default_toolbar.php +++ b/admin/views/causesrisks/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/causesrisks/view.html.php b/admin/views/causesrisks/view.html.php index ac1fe278..c1e65246 100644 --- a/admin/views/causesrisks/view.html.php +++ b/admin/views/causesrisks/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/combinedresults/tmpl/default.php b/admin/views/combinedresults/tmpl/default.php index f5dffbb5..aed8a9bd 100644 --- a/admin/views/combinedresults/tmpl/default.php +++ b/admin/views/combinedresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost.php b/admin/views/combinedresults/tmpl/default_chart_cost.php index e0c86a77..b1353947 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php index 6ff75f16..1f4be6e5 100644 --- a/admin/views/combinedresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php index ebe8916b..2ebcc968 100644 --- a/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/combinedresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php @@ -38,9 +38,9 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr $rowArray[] = array('c' => array( array('v' => $item->name), array('v' => round($item->{'cost_of_problem_'.$scale}), 'f' => $item->{'costmoney_of_problem_'.$scale}), - array('v' => $item->annual_cost, 'f' => $item->annual_costmoney), - array('v' => $item->{'annual_benefit_'.$scale}, 'f' => $item->{'annualmoney_benefit_'.$scale}), - array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'netmoney_benefit_'.$scale}) + array('v' => $item->cost, 'f' => $item->costmoney), + array('v' => $item->{'benefit_'.$scale}, 'f' => $item->{'benefitmoney_'.$scale}), + array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'net_benefitmoney_'.$scale}) )); $i++; } @@ -53,8 +53,8 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr 'cols' => array( array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_CAUSERISK_FACTOR'), 'type' => 'string'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_BENEFIT'), 'type' => 'number'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_NET_BENEFIT'), 'type' => 'number') ), 'rows' => $rowArray 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 d8cef665..267f1209 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index acd08cf0..b3f28a17 100644 --- a/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/combinedresults/tmpl/default_main.php b/admin/views/combinedresults/tmpl/default_main.php index b02bd338..2167e18a 100644 --- a/admin/views/combinedresults/tmpl/default_main.php +++ b/admin/views/combinedresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index cb323e36..1ec07652 100644 --- a/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/combinedresults/tmpl/default_table_cost_summary.php b/admin/views/combinedresults/tmpl/default_table_cost_summary.php index 5f2afbf4..fee45c0e 100644 --- a/admin/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index bdf0e9e4..f5fa5829 100644 --- a/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php @@ -47,12 +47,12 @@ $scaled = array('unscaled','scaled'); - + - - + + @@ -63,14 +63,14 @@ $scaled = array('unscaled','scaled'); name; ?> ' >{'contribution_to_cost_'.$scale}, 3); ?>% - annual_costmoney_per_employee; ?> + costmoney_per_employee; ?> mbr; ?>% mtr; ?>% ' >{'costmoney_of_problem_'.$scale}; ?> - annual_costmoney; ?> - ' >{'annualmoney_benefit_'.$scale}; ?> + costmoney; ?> + ' >{'benefitmoney_'.$scale}; ?> ' >1:{'benefit_ratio_'.$scale},3); ?> - ' >{'netmoney_benefit_'.$scale}; ?> + ' >{'net_benefitmoney_'.$scale}; ?> @@ -79,14 +79,14 @@ $scaled = array('unscaled','scaled'); totals->{'contribution_to_cost_'.$scale}; ?>% - totals->annual_costmoney_per_employee; ?> + totals->costmoney_per_employee; ?> totals->{'costmoney_of_problem_'.$scale}; ?> - totals->annual_costmoney; ?> - totals->{'annualmoney_benefit_'.$scale}; ?> + totals->costmoney; ?> + totals->{'benefitmoney_'.$scale}; ?> - totals->{'netmoney_benefit_'.$scale}; ?> + totals->{'net_benefitmoney_'.$scale}; ?> 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 cf2f2039..a703966b 100644 --- a/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/combinedresults/view.html.php b/admin/views/combinedresults/view.html.php index 50063365..fc82bc98 100644 --- a/admin/views/combinedresults/view.html.php +++ b/admin/views/combinedresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companies/tmpl/default.php b/admin/views/companies/tmpl/default.php index 03447516..5255d893 100644 --- a/admin/views/companies/tmpl/default.php +++ b/admin/views/companies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companies/tmpl/default_batch_body.php b/admin/views/companies/tmpl/default_batch_body.php index 0f14a2ac..976ac091 100644 --- a/admin/views/companies/tmpl/default_batch_body.php +++ b/admin/views/companies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/companies/tmpl/default_batch_footer.php b/admin/views/companies/tmpl/default_batch_footer.php index a37fdefe..fd4b4480 100644 --- a/admin/views/companies/tmpl/default_batch_footer.php +++ b/admin/views/companies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/companies/tmpl/default_body.php b/admin/views/companies/tmpl/default_body.php index fce0ae87..732be88b 100644 --- a/admin/views/companies/tmpl/default_body.php +++ b/admin/views/companies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/companies/tmpl/default_foot.php b/admin/views/companies/tmpl/default_foot.php index ada963bc..dc404c63 100644 --- a/admin/views/companies/tmpl/default_foot.php +++ b/admin/views/companies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/companies/tmpl/default_head.php b/admin/views/companies/tmpl/default_head.php index 891fcc03..f39d4184 100644 --- a/admin/views/companies/tmpl/default_head.php +++ b/admin/views/companies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/companies/tmpl/default_toolbar.php b/admin/views/companies/tmpl/default_toolbar.php index 6d4ebdd3..7ea33a5e 100644 --- a/admin/views/companies/tmpl/default_toolbar.php +++ b/admin/views/companies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php index df3fada9..a24144a5 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/company/submitbutton.js b/admin/views/company/submitbutton.js index 45ef69f9..52c88fdb 100644 --- a/admin/views/company/submitbutton.js +++ b/admin/views/company/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index b500c83b..099046b6 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/company/view.html.php b/admin/views/company/view.html.php index e2e0a904..e5e591ad 100644 --- a/admin/views/company/view.html.php +++ b/admin/views/company/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/companyresults/tmpl/default.php b/admin/views/companyresults/tmpl/default.php index 81175cb2..9699bbde 100644 --- a/admin/views/companyresults/tmpl/default.php +++ b/admin/views/companyresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost.php b/admin/views/companyresults/tmpl/default_chart_cost.php index e0c86a77..b1353947 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost.php +++ b/admin/views/companyresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/admin/views/companyresults/tmpl/default_chart_cost_percent.php b/admin/views/companyresults/tmpl/default_chart_cost_percent.php index 6ff75f16..1f4be6e5 100644 --- a/admin/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index ebe8916b..2ebcc968 100644 --- a/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/admin/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php @@ -38,9 +38,9 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr $rowArray[] = array('c' => array( array('v' => $item->name), array('v' => round($item->{'cost_of_problem_'.$scale}), 'f' => $item->{'costmoney_of_problem_'.$scale}), - array('v' => $item->annual_cost, 'f' => $item->annual_costmoney), - array('v' => $item->{'annual_benefit_'.$scale}, 'f' => $item->{'annualmoney_benefit_'.$scale}), - array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'netmoney_benefit_'.$scale}) + array('v' => $item->cost, 'f' => $item->costmoney), + array('v' => $item->{'benefit_'.$scale}, 'f' => $item->{'benefitmoney_'.$scale}), + array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'net_benefitmoney_'.$scale}) )); $i++; } @@ -53,8 +53,8 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr 'cols' => array( array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_CAUSERISK_FACTOR'), 'type' => 'string'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_BENEFIT'), 'type' => 'number'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_NET_BENEFIT'), 'type' => 'number') ), 'rows' => $rowArray 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 d8cef665..267f1209 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index acd08cf0..b3f28a17 100644 --- a/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/admin/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/admin/views/companyresults/tmpl/default_main.php b/admin/views/companyresults/tmpl/default_main.php index b02bd338..2167e18a 100644 --- a/admin/views/companyresults/tmpl/default_main.php +++ b/admin/views/companyresults/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index cb323e36..1ec07652 100644 --- a/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/admin/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/admin/views/companyresults/tmpl/default_table_cost_summary.php b/admin/views/companyresults/tmpl/default_table_cost_summary.php index 5f2afbf4..fee45c0e 100644 --- a/admin/views/companyresults/tmpl/default_table_cost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php index bdf0e9e4..f5fa5829 100644 --- a/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/admin/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php @@ -47,12 +47,12 @@ $scaled = array('unscaled','scaled'); - + - - + + @@ -63,14 +63,14 @@ $scaled = array('unscaled','scaled'); name; ?> ' >{'contribution_to_cost_'.$scale}, 3); ?>% - annual_costmoney_per_employee; ?> + costmoney_per_employee; ?> mbr; ?>% mtr; ?>% ' >{'costmoney_of_problem_'.$scale}; ?> - annual_costmoney; ?> - ' >{'annualmoney_benefit_'.$scale}; ?> + costmoney; ?> + ' >{'benefitmoney_'.$scale}; ?> ' >1:{'benefit_ratio_'.$scale},3); ?> - ' >{'netmoney_benefit_'.$scale}; ?> + ' >{'net_benefitmoney_'.$scale}; ?> @@ -79,14 +79,14 @@ $scaled = array('unscaled','scaled'); totals->{'contribution_to_cost_'.$scale}; ?>% - totals->annual_costmoney_per_employee; ?> + totals->costmoney_per_employee; ?> totals->{'costmoney_of_problem_'.$scale}; ?> - totals->annual_costmoney; ?> - totals->{'annualmoney_benefit_'.$scale}; ?> + totals->costmoney; ?> + totals->{'benefitmoney_'.$scale}; ?> - totals->{'netmoney_benefit_'.$scale}; ?> + totals->{'net_benefitmoney_'.$scale}; ?> 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 cf2f2039..a703966b 100644 --- a/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/admin/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/admin/views/companyresults/tmpl/default_variables.php b/admin/views/companyresults/tmpl/default_variables.php index 94dfce61..8e97b1c1 100644 --- a/admin/views/companyresults/tmpl/default_variables.php +++ b/admin/views/companyresults/tmpl/default_variables.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_variables.php diff --git a/admin/views/companyresults/view.html.php b/admin/views/companyresults/view.html.php index 3f74e5d2..58326d9a 100644 --- a/admin/views/companyresults/view.html.php +++ b/admin/views/companyresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/costbenefitprojection/tmpl/default.php b/admin/views/costbenefitprojection/tmpl/default.php index 412cb14a..10fb463b 100644 --- a/admin/views/costbenefitprojection/tmpl/default.php +++ b/admin/views/costbenefitprojection/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/costbenefitprojection/tmpl/default_main.php b/admin/views/costbenefitprojection/tmpl/default_main.php index e7e22e80..6536011f 100644 --- a/admin/views/costbenefitprojection/tmpl/default_main.php +++ b/admin/views/costbenefitprojection/tmpl/default_main.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_main.php diff --git a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php index 0a5bd04b..59de2793 100644 --- a/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php +++ b/admin/views/costbenefitprojection/tmpl/default_usage_statistics_table.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_usage_statistics_table.php diff --git a/admin/views/costbenefitprojection/tmpl/default_vdm.php b/admin/views/costbenefitprojection/tmpl/default_vdm.php index e5b4867e..f1a94d43 100644 --- a/admin/views/costbenefitprojection/tmpl/default_vdm.php +++ b/admin/views/costbenefitprojection/tmpl/default_vdm.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_vdm.php diff --git a/admin/views/costbenefitprojection/view.html.php b/admin/views/costbenefitprojection/view.html.php index b09f68f2..d149353b 100644 --- a/admin/views/costbenefitprojection/view.html.php +++ b/admin/views/costbenefitprojection/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php index 49f86de2..fb5d90e4 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php index 8de40ee8..10d8efe4 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php index 5cdcfe97..18499fb8 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php index 80e1bfc5..b5cc22a6 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php index ada963bc..dc404c63 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php index 4170fa2c..d195555e 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php index 1d0f647c..199c2d49 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php index 52cde080..eeda4bb0 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js index 51c6589c..8f5db15b 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php index aa6016ea..e8be24fe 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php index 2252c876..35ad4e98 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php index e8863e8c..086bb9ef 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php index 5e2e92e7..c34e87c4 100644 --- a/admin/views/currencies/tmpl/default_batch_body.php +++ b/admin/views/currencies/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php index 1bec3ea2..8ec16606 100644 --- a/admin/views/currencies/tmpl/default_batch_footer.php +++ b/admin/views/currencies/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php index e055d585..f64b017e 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php index b0380c1f..2b43e251 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php index 7efe25cd..2955305a 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php index f3c37577..27b3bff9 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php index 3f3c6792..dd1ffcbd 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js index aa54f448..16d02294 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php index e0f0797e..6602554c 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php index b496e212..67e9b2a6 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/health_data/submitbutton.js b/admin/views/health_data/submitbutton.js index 9b3cfdd6..55baa4e4 100644 --- a/admin/views/health_data/submitbutton.js +++ b/admin/views/health_data/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/health_data/tmpl/edit.php b/admin/views/health_data/tmpl/edit.php index 35e3613e..9eaa5680 100644 --- a/admin/views/health_data/tmpl/edit.php +++ b/admin/views/health_data/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/health_data/view.html.php b/admin/views/health_data/view.html.php index 7983e6bb..05e0ad55 100644 --- a/admin/views/health_data/view.html.php +++ b/admin/views/health_data/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/health_data_sets/tmpl/default.php b/admin/views/health_data_sets/tmpl/default.php index dd90afa1..01a505c9 100644 --- a/admin/views/health_data_sets/tmpl/default.php +++ b/admin/views/health_data_sets/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_body.php b/admin/views/health_data_sets/tmpl/default_batch_body.php index 4a3d1e87..cccde652 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_body.php +++ b/admin/views/health_data_sets/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/health_data_sets/tmpl/default_batch_footer.php b/admin/views/health_data_sets/tmpl/default_batch_footer.php index 17326619..d440c7d4 100644 --- a/admin/views/health_data_sets/tmpl/default_batch_footer.php +++ b/admin/views/health_data_sets/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/health_data_sets/tmpl/default_body.php b/admin/views/health_data_sets/tmpl/default_body.php index 5735406d..63afa059 100644 --- a/admin/views/health_data_sets/tmpl/default_body.php +++ b/admin/views/health_data_sets/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/health_data_sets/tmpl/default_foot.php b/admin/views/health_data_sets/tmpl/default_foot.php index 2f393698..2a44eb8b 100644 --- a/admin/views/health_data_sets/tmpl/default_foot.php +++ b/admin/views/health_data_sets/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/health_data_sets/tmpl/default_head.php b/admin/views/health_data_sets/tmpl/default_head.php index 38a83423..77829cce 100644 --- a/admin/views/health_data_sets/tmpl/default_head.php +++ b/admin/views/health_data_sets/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/health_data_sets/tmpl/default_toolbar.php b/admin/views/health_data_sets/tmpl/default_toolbar.php index eb1e60f2..9b482188 100644 --- a/admin/views/health_data_sets/tmpl/default_toolbar.php +++ b/admin/views/health_data_sets/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/health_data_sets/view.html.php b/admin/views/health_data_sets/view.html.php index 0792396c..4a3e9c7c 100644 --- a/admin/views/health_data_sets/view.html.php +++ b/admin/views/health_data_sets/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 74b73a15..c4ad00dd 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index ca6843f5..05ff08e4 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index ab4f2b5c..114ebf60 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index a5659bdc..ba36904c 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index 0f74c652..82bc1699 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index f9cd7384..b97a887a 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index db3c3765..c17028f7 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index ada963bc..dc404c63 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index 226ba189..1f7e318e 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index 24aecef2..8dbdade8 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index effa5b1d..edf9945a 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 50afa45f..b709b6ea 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 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 35cf968f..c92c4555 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/import_health_data_sets/tmpl/default.php b/admin/views/import_health_data_sets/tmpl/default.php index f937b50d..3af20b8a 100644 --- a/admin/views/import_health_data_sets/tmpl/default.php +++ b/admin/views/import_health_data_sets/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/import_health_data_sets/view.html.php b/admin/views/import_health_data_sets/view.html.php index 3993c07d..0045941d 100644 --- a/admin/views/import_health_data_sets/view.html.php +++ b/admin/views/import_health_data_sets/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 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 1139fa7f..66ac470b 100644 --- a/admin/views/intervention/submitbutton.js +++ b/admin/views/intervention/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/intervention/tmpl/edit.php b/admin/views/intervention/tmpl/edit.php index 68c43060..026ba2d5 100644 --- a/admin/views/intervention/tmpl/edit.php +++ b/admin/views/intervention/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/intervention/view.html.php b/admin/views/intervention/view.html.php index ae6e6906..ed485748 100644 --- a/admin/views/intervention/view.html.php +++ b/admin/views/intervention/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/interventions/tmpl/default.php b/admin/views/interventions/tmpl/default.php index 9de90607..28b847fb 100644 --- a/admin/views/interventions/tmpl/default.php +++ b/admin/views/interventions/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/interventions/tmpl/default_batch_body.php b/admin/views/interventions/tmpl/default_batch_body.php index fa5e62ec..50688c61 100644 --- a/admin/views/interventions/tmpl/default_batch_body.php +++ b/admin/views/interventions/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/interventions/tmpl/default_batch_footer.php b/admin/views/interventions/tmpl/default_batch_footer.php index 3b6c725c..f2dd33fd 100644 --- a/admin/views/interventions/tmpl/default_batch_footer.php +++ b/admin/views/interventions/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/interventions/tmpl/default_body.php b/admin/views/interventions/tmpl/default_body.php index e9451c9d..3d969df9 100644 --- a/admin/views/interventions/tmpl/default_body.php +++ b/admin/views/interventions/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php @@ -98,6 +98,9 @@ $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=inte escape($item->description); ?> + + escape($item->duration); ?> + get('intervention.edit.state')) : ?> checked_out) : ?> diff --git a/admin/views/interventions/tmpl/default_foot.php b/admin/views/interventions/tmpl/default_foot.php index b0380c1f..dc404c63 100644 --- a/admin/views/interventions/tmpl/default_foot.php +++ b/admin/views/interventions/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 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 3d9c3804..6a522856 100644 --- a/admin/views/interventions/tmpl/default_head.php +++ b/admin/views/interventions/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php @@ -52,6 +52,9 @@ defined('_JEXEC') or die('Restricted access'); listDirn, $this->listOrder); ?> + + listDirn, $this->listOrder); ?> + canState): ?> listDirn, $this->listOrder); ?> diff --git a/admin/views/interventions/tmpl/default_toolbar.php b/admin/views/interventions/tmpl/default_toolbar.php index 849e6adc..bfbec7ea 100644 --- a/admin/views/interventions/tmpl/default_toolbar.php +++ b/admin/views/interventions/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/interventions/view.html.php b/admin/views/interventions/view.html.php index 5cc24fc4..3f1eb531 100644 --- a/admin/views/interventions/view.html.php +++ b/admin/views/interventions/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php @@ -260,6 +260,28 @@ 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') + ); + } } } @@ -308,6 +330,7 @@ class CostbenefitprojectionViewInterventions extends JViewLegacy 'a.type' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_TYPE_LABEL'), 'a.coverage' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_COVERAGE_LABEL'), 'a.description' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_LABEL'), + 'a.duration' => JText::_('COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL'), 'a.id' => JText::_('JGRID_HEADING_ID') ); } @@ -378,5 +401,37 @@ 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 075b5d09..4ec4fad5 100644 --- a/admin/views/scaling_factor/submitbutton.js +++ b/admin/views/scaling_factor/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/scaling_factor/tmpl/edit.php b/admin/views/scaling_factor/tmpl/edit.php index f81a7c41..29d55622 100644 --- a/admin/views/scaling_factor/tmpl/edit.php +++ b/admin/views/scaling_factor/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/scaling_factor/view.html.php b/admin/views/scaling_factor/view.html.php index 3c8456d7..fabe5d80 100644 --- a/admin/views/scaling_factor/view.html.php +++ b/admin/views/scaling_factor/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/scaling_factors/tmpl/default.php b/admin/views/scaling_factors/tmpl/default.php index 7063c83b..0fed5001 100644 --- a/admin/views/scaling_factors/tmpl/default.php +++ b/admin/views/scaling_factors/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_body.php b/admin/views/scaling_factors/tmpl/default_batch_body.php index ff7b8de2..24c7cf0d 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_body.php +++ b/admin/views/scaling_factors/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/scaling_factors/tmpl/default_batch_footer.php b/admin/views/scaling_factors/tmpl/default_batch_footer.php index e75a4489..b2b1046d 100644 --- a/admin/views/scaling_factors/tmpl/default_batch_footer.php +++ b/admin/views/scaling_factors/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/scaling_factors/tmpl/default_body.php b/admin/views/scaling_factors/tmpl/default_body.php index 1b8483b9..92e34c60 100644 --- a/admin/views/scaling_factors/tmpl/default_body.php +++ b/admin/views/scaling_factors/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/scaling_factors/tmpl/default_foot.php b/admin/views/scaling_factors/tmpl/default_foot.php index d2a9a1e6..bdcfabb9 100644 --- a/admin/views/scaling_factors/tmpl/default_foot.php +++ b/admin/views/scaling_factors/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/scaling_factors/tmpl/default_head.php b/admin/views/scaling_factors/tmpl/default_head.php index 258cb186..8d1f057d 100644 --- a/admin/views/scaling_factors/tmpl/default_head.php +++ b/admin/views/scaling_factors/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/scaling_factors/tmpl/default_toolbar.php b/admin/views/scaling_factors/tmpl/default_toolbar.php index 16bec60d..7d18ed50 100644 --- a/admin/views/scaling_factors/tmpl/default_toolbar.php +++ b/admin/views/scaling_factors/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/scaling_factors/view.html.php b/admin/views/scaling_factors/view.html.php index 9a994ef4..bab05c19 100644 --- a/admin/views/scaling_factors/view.html.php +++ b/admin/views/scaling_factors/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/service_provider/submitbutton.js b/admin/views/service_provider/submitbutton.js index b3e42122..f390dd35 100644 --- a/admin/views/service_provider/submitbutton.js +++ b/admin/views/service_provider/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/admin/views/service_provider/tmpl/edit.php b/admin/views/service_provider/tmpl/edit.php index a1d0ea0d..a4f8c958 100644 --- a/admin/views/service_provider/tmpl/edit.php +++ b/admin/views/service_provider/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/admin/views/service_provider/view.html.php b/admin/views/service_provider/view.html.php index bec9549d..2bfdd958 100644 --- a/admin/views/service_provider/view.html.php +++ b/admin/views/service_provider/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/admin/views/service_providers/tmpl/default.php b/admin/views/service_providers/tmpl/default.php index 978f7d84..3176bbeb 100644 --- a/admin/views/service_providers/tmpl/default.php +++ b/admin/views/service_providers/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/admin/views/service_providers/tmpl/default_batch_body.php b/admin/views/service_providers/tmpl/default_batch_body.php index 6dc7f7f1..fb0b02cd 100644 --- a/admin/views/service_providers/tmpl/default_batch_body.php +++ b/admin/views/service_providers/tmpl/default_batch_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_body.php diff --git a/admin/views/service_providers/tmpl/default_batch_footer.php b/admin/views/service_providers/tmpl/default_batch_footer.php index 5f66e990..55ac3c16 100644 --- a/admin/views/service_providers/tmpl/default_batch_footer.php +++ b/admin/views/service_providers/tmpl/default_batch_footer.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_batch_footer.php diff --git a/admin/views/service_providers/tmpl/default_body.php b/admin/views/service_providers/tmpl/default_body.php index 085d5b09..73e7ddb3 100644 --- a/admin/views/service_providers/tmpl/default_body.php +++ b/admin/views/service_providers/tmpl/default_body.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_body.php diff --git a/admin/views/service_providers/tmpl/default_foot.php b/admin/views/service_providers/tmpl/default_foot.php index ada963bc..dc404c63 100644 --- a/admin/views/service_providers/tmpl/default_foot.php +++ b/admin/views/service_providers/tmpl/default_foot.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_foot.php diff --git a/admin/views/service_providers/tmpl/default_head.php b/admin/views/service_providers/tmpl/default_head.php index c900f9c7..069877e2 100644 --- a/admin/views/service_providers/tmpl/default_head.php +++ b/admin/views/service_providers/tmpl/default_head.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_head.php diff --git a/admin/views/service_providers/tmpl/default_toolbar.php b/admin/views/service_providers/tmpl/default_toolbar.php index 92b9afab..9f6c9b05 100644 --- a/admin/views/service_providers/tmpl/default_toolbar.php +++ b/admin/views/service_providers/tmpl/default_toolbar.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_toolbar.php diff --git a/admin/views/service_providers/view.html.php b/admin/views/service_providers/view.html.php index f2057fdb..d7a609e5 100644 --- a/admin/views/service_providers/view.html.php +++ b/admin/views/service_providers/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/costbenefitprojection.xml b/costbenefitprojection.xml index acb77b07..d2479c26 100644 --- a/costbenefitprojection.xml +++ b/costbenefitprojection.xml @@ -1,15 +1,15 @@ COM_COSTBENEFITPROJECTION - 5th May, 2016 + 10th May, 2016 Llewellyn van der Merwe llewellyn@vdm.io http://www.vdm.io Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 3.3.11 + 3.3.12 Cost Benefit Projection (v.3.3.11) +

Cost Benefit Projection (v.3.3.12)

[Create Epidemiological Profiles] (https://www.staffhealthcbp.com/) for diseases and risks affecting your company. Detailed information on projected work days lost and costs. Create and edit activities and wellness responses for your workplace. Access to Small Business Modelling. Results displayed by gender. Network with other companies and wellness professionals. diff --git a/script.php b/script.php index 37dab2cb..2e588195 100644 --- a/script.php +++ b/script.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 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","description":"description","reference":"reference","country":"country","share":"share","interventions":"interventions","duration":"duration","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","duration":"duration","share":"share","country":"country","interventions":"interventions","reference":"reference","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","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"}]}'; + $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","share","country","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","description":"description","reference":"reference","country":"country","share":"share","interventions":"interventions","duration":"duration","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","duration":"duration","share":"share","country":"country","interventions":"interventions","reference":"reference","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","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"}]}'; + $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","share","country","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; @@ -1300,7 +1300,7 @@ class com_costbenefitprojectionInstallerScript echo ' -

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

'; +

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

'; } } } diff --git a/site/assets/css/combinedresults.css b/site/assets/css/combinedresults.css index 02004dd2..09a8718d 100644 --- a/site/assets/css/combinedresults.css +++ b/site/assets/css/combinedresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.css diff --git a/site/assets/css/company.css b/site/assets/css/company.css index 354c6b4f..1f8187e7 100644 --- a/site/assets/css/company.css +++ b/site/assets/css/company.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.css diff --git a/site/assets/css/companyresults.css b/site/assets/css/companyresults.css index 35f6a8ec..b9887a99 100644 --- a/site/assets/css/companyresults.css +++ b/site/assets/css/companyresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.css diff --git a/site/assets/css/cpanel.css b/site/assets/css/cpanel.css index ea7113d9..3a31f7db 100644 --- a/site/assets/css/cpanel.css +++ b/site/assets/css/cpanel.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.css diff --git a/site/assets/css/createaccount.css b/site/assets/css/createaccount.css index ab15e3ca..a377e208 100644 --- a/site/assets/css/createaccount.css +++ b/site/assets/css/createaccount.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.css diff --git a/site/assets/css/intervention.css b/site/assets/css/intervention.css index 66597f4d..0e8cfd39 100644 --- a/site/assets/css/intervention.css +++ b/site/assets/css/intervention.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.css diff --git a/site/assets/css/publicresults.css b/site/assets/css/publicresults.css index 1239022b..60642a4b 100644 --- a/site/assets/css/publicresults.css +++ b/site/assets/css/publicresults.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publicresults.css diff --git a/site/assets/css/scaling_factor.css b/site/assets/css/scaling_factor.css index 6949bcd7..7155f41a 100644 --- a/site/assets/css/scaling_factor.css +++ b/site/assets/css/scaling_factor.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index 48af661d..79d11dc0 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage site.css diff --git a/site/controller.php b/site/controller.php index 87f3e5d1..759e444f 100644 --- a/site/controller.php +++ b/site/controller.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage controller.php diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index 573adc3c..e8ef9f1f 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.json.php diff --git a/site/controllers/company.php b/site/controllers/company.php index 9bbe9309..5b5ab2c6 100644 --- a/site/controllers/company.php +++ b/site/controllers/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/site/controllers/help.php b/site/controllers/help.php index bf5a1328..5a64346f 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage help.php diff --git a/site/controllers/intervention.php b/site/controllers/intervention.php index 3095c35f..ce9fc326 100644 --- a/site/controllers/intervention.php +++ b/site/controllers/intervention.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage intervention.php diff --git a/site/controllers/scaling_factor.php b/site/controllers/scaling_factor.php index 16ae5a0f..b0fa5477 100644 --- a/site/controllers/scaling_factor.php +++ b/site/controllers/scaling_factor.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factor.php diff --git a/site/costbenefitprojection.php b/site/costbenefitprojection.php index c9f51bdb..12500873 100644 --- a/site/costbenefitprojection.php +++ b/site/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php diff --git a/site/helpers/costbenefitprojection.php b/site/helpers/costbenefitprojection.php index 84d75afd..a8ab1454 100644 --- a/site/helpers/costbenefitprojection.php +++ b/site/helpers/costbenefitprojection.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage costbenefitprojection.php @@ -587,34 +587,37 @@ abstract class CostbenefitprojectionHelper } return ''; } - - public static function jsonToString($value) + + public static function jsonToString($value, $sperator = ", ", $table = null) { - // check if string is JSON - $result = json_decode($value, true); - if (json_last_error() === JSON_ERROR_NONE) { + // check if string is JSON + $result = json_decode($value, true); + if (json_last_error() === JSON_ERROR_NONE) + { // is JSON - if (self::checkArray($result)) + if (self::checkArray($result)) + { + if (self::checkString($table)) { - $value = ''; - $counter = 0; - foreach ($result as $string) + $names = array(); + foreach ($result as $val) { - if ($counter) + if ($name = self::getVar($table, $val, 'id', 'name')) { - $value .= ", ".$string; + $names[] = $name; } - else - { - $value .= $string; - } - $counter++; } + if (self::checkArray($names)) + { + return (string) implode($sperator,$names); + } } - return json_decode($value); - } - return $value; - } + return (string) implode($sperator,$result); + } + return (string) json_decode($value); + } + return $value; + } /** * Load the Component xml manifest. diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 1724c280..1828ae49 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index e2da1dfc..17c252ae 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage route.php diff --git a/site/language/en-GB/en-GB.com_costbenefitprojection.ini b/site/language/en-GB/en-GB.com_costbenefitprojection.ini index 9531f7e0..beb4e41e 100644 --- a/site/language/en-GB/en-GB.com_costbenefitprojection.ini +++ b/site/language/en-GB/en-GB.com_costbenefitprojection.ini @@ -14,9 +14,6 @@ COM_COSTBENEFITPROJECTION_AGE_GROUPS="Age Groups" COM_COSTBENEFITPROJECTION_AGE_GROUP_CHARTS="Age Group Charts" COM_COSTBENEFITPROJECTION_ALL_NUMBERS_IN_BRACKETS_ARE_THE_RELATED_EMPLOYEES="All numbers in brackets are the related employees." COM_COSTBENEFITPROJECTION_ALL_SERVICE_PROVIDERS="All Service Providers" -COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT="Annual Benefit" -COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION="Annual Cost of Intervention" -COM_COSTBENEFITPROJECTION_ANNUAL_COST_PER_EMPLOYEE="Annual Cost per Employee" COM_COSTBENEFITPROJECTION_ANNUAL_SAVINGS="Annual Savings" COM_COSTBENEFITPROJECTION_APPLICATION_DEVELOPER="Application Developer" COM_COSTBENEFITPROJECTION_ARCHIVED="Archived" @@ -25,10 +22,12 @@ COM_COSTBENEFITPROJECTION_BACK="Back" COM_COSTBENEFITPROJECTION_BASIC="Basic" COM_COSTBENEFITPROJECTION_BASIC_METHOD="Basic Method" COM_COSTBENEFITPROJECTION_BASIC_PROFILE="Basic Profile" +COM_COSTBENEFITPROJECTION_BENEFIT="Benefit" COM_COSTBENEFITPROJECTION_CALCULATED_COSTS_IN_DETAIL="Calculated Costs in Detail" COM_COSTBENEFITPROJECTION_CAUSERISK="Cause/Risk" COM_COSTBENEFITPROJECTION_CAUSERISK_ALIAS="Alias" COM_COSTBENEFITPROJECTION_CAUSERISK_ALIAS_HINT="Auto-generated from name" +COM_COSTBENEFITPROJECTION_CAUSERISK_ALIAS_LABEL="Alias" COM_COSTBENEFITPROJECTION_CAUSERISK_CREATED_BY_DESC="The user that created the Cause/Risk." COM_COSTBENEFITPROJECTION_CAUSERISK_CREATED_BY_LABEL="Created by" COM_COSTBENEFITPROJECTION_CAUSERISK_CREATED_DATE_DESC="The date Cause/Risk was created." @@ -441,9 +440,10 @@ COM_COSTBENEFITPROJECTION_COST_BENEFIT_RATIO="Cost / Benefit Ratio" COM_COSTBENEFITPROJECTION_COST_IN_S="Cost in %s" COM_COSTBENEFITPROJECTION_COST_MORBIDITY="Cost Morbidity" COM_COSTBENEFITPROJECTION_COST_MORTALITY="Cost Mortality" +COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION="Cost of Intervention" COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM="Cost of Problem" COM_COSTBENEFITPROJECTION_COST_PERCENT="Cost Percent" -COM_COSTBENEFITPROJECTION_COST_PER_EMPLOYEE="Cost Per Employee" +COM_COSTBENEFITPROJECTION_COST_PER_EMPLOYEE="Cost per Employee" COM_COSTBENEFITPROJECTION_COST_PRESENTEEISM_DUE_TO_MORBIDITY="Cost Presenteeism (due to morbidity)" COM_COSTBENEFITPROJECTION_COST_SUMMARY="Cost Summary" COM_COSTBENEFITPROJECTION_COUNTRIES="Countries" @@ -496,6 +496,7 @@ COM_COSTBENEFITPROJECTION_COUNTRY_AGE_GROUPS_PERCENTAGES="Age Groups Percentages COM_COSTBENEFITPROJECTION_COUNTRY_AGE_LABEL="Age Group" COM_COSTBENEFITPROJECTION_COUNTRY_ALIAS="Alias" COM_COSTBENEFITPROJECTION_COUNTRY_ALIAS_HINT="Auto-generated from name" +COM_COSTBENEFITPROJECTION_COUNTRY_ALIAS_LABEL="Alias" COM_COSTBENEFITPROJECTION_COUNTRY_CAUSERISK_SELECTION="Cause/Risk Selection" COM_COSTBENEFITPROJECTION_COUNTRY_CAUSESRISKS="Causesrisks" COM_COSTBENEFITPROJECTION_COUNTRY_CAUSESRISKS_LABEL="Causes/Risks" @@ -646,6 +647,7 @@ COM_COSTBENEFITPROJECTION_CREATEACCOUNT_DESC="Create Account" COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE="Create Account (giz) (Site) Access" COM_COSTBENEFITPROJECTION_CREATE_ACCOUNT_GIZ_ACCESS_SITE_DESC=" Allows the users in this group to access site create account giz." COM_COSTBENEFITPROJECTION_CREATE_COMPANY="Create Company" +COM_COSTBENEFITPROJECTION_CREATE_NEW_S="Create New %s" COM_COSTBENEFITPROJECTION_CURRENCIES="Currencies" COM_COSTBENEFITPROJECTION_CURRENCIES_ACCESS="Currencies Access" COM_COSTBENEFITPROJECTION_CURRENCIES_ACCESS_DESC="Allows the users in this group to access access currencies" @@ -693,6 +695,7 @@ COM_COSTBENEFITPROJECTION_CURRENCIES_SUBMENU_DESC="Allows the users in this grou COM_COSTBENEFITPROJECTION_CURRENCY="Currency" COM_COSTBENEFITPROJECTION_CURRENCY_ALIAS="Alias" COM_COSTBENEFITPROJECTION_CURRENCY_ALIAS_HINT="Auto-generated from name" +COM_COSTBENEFITPROJECTION_CURRENCY_ALIAS_LABEL="Alias" COM_COSTBENEFITPROJECTION_CURRENCY_CODETHREE="Codethree" COM_COSTBENEFITPROJECTION_CURRENCY_CODETHREE_DESCRIPTION="The following is a list of active codes of official ISO 4217 currency names." COM_COSTBENEFITPROJECTION_CURRENCY_CODETHREE_HINT="NAD" @@ -783,6 +786,7 @@ COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY="Edit Created By" COM_COSTBENEFITPROJECTION_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by." COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE="Edit Created Date" COM_COSTBENEFITPROJECTION_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date." +COM_COSTBENEFITPROJECTION_EDIT_S="Edit %s" COM_COSTBENEFITPROJECTION_EDIT_VERSIONS="Edit Version" COM_COSTBENEFITPROJECTION_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions." COM_COSTBENEFITPROJECTION_EMAIL="Email" @@ -966,6 +970,7 @@ COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ADMIN_VIEW_LABEL="Admin Views" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALIAS="Alias" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALIAS_HINT="Auto-generated from name" +COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALIAS_LABEL="Alias" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ALL="All" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ARTICLE="Article" COM_COSTBENEFITPROJECTION_HELP_DOCUMENT_ARTICLE_LABEL="Article" @@ -1138,6 +1143,8 @@ 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="Set in number of years" +COM_COSTBENEFITPROJECTION_INTERVENTION_DURATION_LABEL="Duration (years)" 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 23ccd57c..1597fd89 100644 --- a/site/layouts/appnotice.php +++ b/site/layouts/appnotice.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage appnotice.php diff --git a/site/layouts/company/age_groups_percentages_fullwidth.php b/site/layouts/company/age_groups_percentages_fullwidth.php index 6b7179d6..ae8aa79d 100644 --- a/site/layouts/company/age_groups_percentages_fullwidth.php +++ b/site/layouts/company/age_groups_percentages_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_fullwidth.php diff --git a/site/layouts/company/age_groups_percentages_left.php b/site/layouts/company/age_groups_percentages_left.php index 2a2eec3b..af0473a6 100644 --- a/site/layouts/company/age_groups_percentages_left.php +++ b/site/layouts/company/age_groups_percentages_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_left.php diff --git a/site/layouts/company/age_groups_percentages_right.php b/site/layouts/company/age_groups_percentages_right.php index 5412af6b..8225dd4d 100644 --- a/site/layouts/company/age_groups_percentages_right.php +++ b/site/layouts/company/age_groups_percentages_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage age_groups_percentages_right.php diff --git a/site/layouts/company/causerisk_selection_fullwidth.php b/site/layouts/company/causerisk_selection_fullwidth.php index 4cd4ca6b..46438228 100644 --- a/site/layouts/company/causerisk_selection_fullwidth.php +++ b/site/layouts/company/causerisk_selection_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage causerisk_selection_fullwidth.php diff --git a/site/layouts/company/details_above.php b/site/layouts/company/details_above.php index d7867017..d9a01104 100644 --- a/site/layouts/company/details_above.php +++ b/site/layouts/company/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/company/details_left.php b/site/layouts/company/details_left.php index 46355b66..debb754f 100644 --- a/site/layouts/company/details_left.php +++ b/site/layouts/company/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/site/layouts/company/details_right.php b/site/layouts/company/details_right.php index d00caec7..673f65db 100644 --- a/site/layouts/company/details_right.php +++ b/site/layouts/company/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/site/layouts/company/details_under.php b/site/layouts/company/details_under.php index 03e4427c..9f3c0b31 100644 --- a/site/layouts/company/details_under.php +++ b/site/layouts/company/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/site/layouts/company/interventions_fullwidth.php b/site/layouts/company/interventions_fullwidth.php index 398ba66a..1e7700ab 100644 --- a/site/layouts/company/interventions_fullwidth.php +++ b/site/layouts/company/interventions_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage interventions_fullwidth.php @@ -54,6 +54,9 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); + + + @@ -92,6 +95,9 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); escape($item->description); ?> + + escape($item->duration); ?> + published == 1):?> @@ -125,7 +131,7 @@ $can = CostbenefitprojectionHelper::getActions('intervention'); - + diff --git a/site/layouts/company/publishing.php b/site/layouts/company/publishing.php index c26f6c72..47caf08e 100644 --- a/site/layouts/company/publishing.php +++ b/site/layouts/company/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/company/publlshing.php b/site/layouts/company/publlshing.php index fc32ca84..430ab0b5 100644 --- a/site/layouts/company/publlshing.php +++ b/site/layouts/company/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/layouts/company/scaling_factors_fullwidth.php b/site/layouts/company/scaling_factors_fullwidth.php index 014e8029..9d26e531 100644 --- a/site/layouts/company/scaling_factors_fullwidth.php +++ b/site/layouts/company/scaling_factors_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage scaling_factors_fullwidth.php diff --git a/site/layouts/companydetails.php b/site/layouts/companydetails.php index 497f5f4d..802f38ae 100644 --- a/site/layouts/companydetails.php +++ b/site/layouts/companydetails.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companydetails.php diff --git a/site/layouts/databreakdownmalefemale.php b/site/layouts/databreakdownmalefemale.php index de43f7bd..4a0a9e80 100644 --- a/site/layouts/databreakdownmalefemale.php +++ b/site/layouts/databreakdownmalefemale.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage databreakdownmalefemale.php diff --git a/site/layouts/intervention/details_above.php b/site/layouts/intervention/details_above.php index d8016da9..97a10fc5 100644 --- a/site/layouts/intervention/details_above.php +++ b/site/layouts/intervention/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/intervention/details_fullwidth.php b/site/layouts/intervention/details_fullwidth.php index 44ba1398..c28a9bec 100644 --- a/site/layouts/intervention/details_fullwidth.php +++ b/site/layouts/intervention/details_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_fullwidth.php diff --git a/site/layouts/intervention/details_under.php b/site/layouts/intervention/details_under.php index 03e4427c..9f3c0b31 100644 --- a/site/layouts/intervention/details_under.php +++ b/site/layouts/intervention/details_under.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_under.php diff --git a/site/layouts/intervention/publishing.php b/site/layouts/intervention/publishing.php index c26f6c72..47caf08e 100644 --- a/site/layouts/intervention/publishing.php +++ b/site/layouts/intervention/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/intervention/publlshing.php b/site/layouts/intervention/publlshing.php index 731265dd..a383c21d 100644 --- a/site/layouts/intervention/publlshing.php +++ b/site/layouts/intervention/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/layouts/intervention/settings_fullwidth.php b/site/layouts/intervention/settings_fullwidth.php index 46dd82b8..bc8dc792 100644 --- a/site/layouts/intervention/settings_fullwidth.php +++ b/site/layouts/intervention/settings_fullwidth.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_fullwidth.php diff --git a/site/layouts/intervention/settings_left.php b/site/layouts/intervention/settings_left.php index c804f53c..45dd2588 100644 --- a/site/layouts/intervention/settings_left.php +++ b/site/layouts/intervention/settings_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage settings_left.php diff --git a/site/layouts/scaling_factor/details_above.php b/site/layouts/scaling_factor/details_above.php index bc657a11..819c76f1 100644 --- a/site/layouts/scaling_factor/details_above.php +++ b/site/layouts/scaling_factor/details_above.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_above.php diff --git a/site/layouts/scaling_factor/details_left.php b/site/layouts/scaling_factor/details_left.php index 14a2b343..5a35e751 100644 --- a/site/layouts/scaling_factor/details_left.php +++ b/site/layouts/scaling_factor/details_left.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_left.php diff --git a/site/layouts/scaling_factor/details_right.php b/site/layouts/scaling_factor/details_right.php index d465bcce..67af40e8 100644 --- a/site/layouts/scaling_factor/details_right.php +++ b/site/layouts/scaling_factor/details_right.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage details_right.php diff --git a/site/layouts/scaling_factor/publishing.php b/site/layouts/scaling_factor/publishing.php index c26f6c72..47caf08e 100644 --- a/site/layouts/scaling_factor/publishing.php +++ b/site/layouts/scaling_factor/publishing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publishing.php diff --git a/site/layouts/scaling_factor/publlshing.php b/site/layouts/scaling_factor/publlshing.php index 731265dd..a383c21d 100644 --- a/site/layouts/scaling_factor/publlshing.php +++ b/site/layouts/scaling_factor/publlshing.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage publlshing.php diff --git a/site/models/ajax.php b/site/models/ajax.php index 26045608..45a4ae1e 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage ajax.php diff --git a/site/models/combinedresults.php b/site/models/combinedresults.php index 73095344..76ab7a28 100644 --- a/site/models/combinedresults.php +++ b/site/models/combinedresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage combinedresults.php diff --git a/site/models/company.php b/site/models/company.php index b5e65b09..69bbdba5 100644 --- a/site/models/company.php +++ b/site/models/company.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.php diff --git a/site/models/companyresults.php b/site/models/companyresults.php index 6de6a0b9..432a3016 100644 --- a/site/models/companyresults.php +++ b/site/models/companyresults.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage companyresults.php diff --git a/site/models/cpanel.php b/site/models/cpanel.php index 36421c28..5b455007 100644 --- a/site/models/cpanel.php +++ b/site/models/cpanel.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage cpanel.php diff --git a/site/models/createaccount.php b/site/models/createaccount.php index 87a1a47f..4ecb0b2e 100644 --- a/site/models/createaccount.php +++ b/site/models/createaccount.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage createaccount.php diff --git a/site/models/forms/company.js b/site/models/forms/company.js index 7fbd8b0f..c0e672e9 100644 --- a/site/models/forms/company.js +++ b/site/models/forms/company.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage company.js diff --git a/site/models/forms/intervention.js b/site/models/forms/intervention.js index 546574b3..da202f52 100644 --- a/site/models/forms/intervention.js +++ b/site/models/forms/intervention.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 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 40079f09..7af61686 100644 --- a/site/models/forms/intervention.xml +++ b/site/models/forms/intervention.xml @@ -140,18 +140,37 @@ filter="HTML" hint="COM_COSTBENEFITPROJECTION_INTERVENTION_DESCRIPTION_HINT" /> - + + + + + + + + - - - - - - - - + results->interventions) && CostbenefitprojectionHelper::checkArr $rowArray[] = array('c' => array( array('v' => $item->name), array('v' => round($item->{'cost_of_problem_'.$scale}), 'f' => $item->{'costmoney_of_problem_'.$scale}), - array('v' => $item->annual_cost, 'f' => $item->annual_costmoney), - array('v' => $item->{'annual_benefit_'.$scale}, 'f' => $item->{'annualmoney_benefit_'.$scale}), - array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'netmoney_benefit_'.$scale}) + array('v' => $item->cost, 'f' => $item->costmoney), + array('v' => $item->{'benefit_'.$scale}, 'f' => $item->{'benefitmoney_'.$scale}), + array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'net_benefitmoney_'.$scale}) )); $i++; } @@ -53,8 +53,8 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr 'cols' => array( array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_CAUSERISK_FACTOR'), 'type' => 'string'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_BENEFIT'), 'type' => 'number'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_NET_BENEFIT'), 'type' => 'number') ), 'rows' => $rowArray diff --git a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php index dc0fb6a1..f6f5ae14 100644 --- a/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php +++ b/site/views/combinedresults/tmpl/default_chart_intervention_cost_benefit_save.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_save.php @@ -38,9 +38,9 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr $rowArray[] = array('c' => array( array('v' => $item->name), array('v' => round($item->{'cost_of_problem_'.$scale}), 'f' => $item->{'costmoney_of_problem_'.$scale}), - array('v' => $item->annual_cost, 'f' => $item->annual_costmoney), - array('v' => $item->{'annual_benefit_'.$scale}, 'f' => $item->{'annualmoney_benefit_'.$scale}), - array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'netmoney_benefit_'.$scale}) + array('v' => $item->_cost, 'f' => $item->costmoney), + array('v' => $item->{'benefit_'.$scale}, 'f' => $item->{'benefitmoney_'.$scale}), + array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'net_benefitmoney_'.$scale}) )); $i++; } @@ -53,8 +53,8 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr 'cols' => array( array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_CAUSERISK_FACTOR'), 'type' => 'string'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_BENEFIT'), 'type' => 'number'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_NET_BENEFIT'), 'type' => 'number') ), 'rows' => $rowArray diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php index d8cef665..267f1209 100644 --- a/site/views/combinedresults/tmpl/default_chart_work_days_lost.php +++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php index acd08cf0..b3f28a17 100644 --- a/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php +++ b/site/views/combinedresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php index cb323e36..1ec07652 100644 --- a/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/site/views/combinedresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/site/views/combinedresults/tmpl/default_table_cost_summary.php b/site/views/combinedresults/tmpl/default_table_cost_summary.php index 5f2afbf4..fee45c0e 100644 --- a/site/views/combinedresults/tmpl/default_table_cost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php index bdf0e9e4..f5fa5829 100644 --- a/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php +++ b/site/views/combinedresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php @@ -47,12 +47,12 @@ $scaled = array('unscaled','scaled'); - + - - + + @@ -63,14 +63,14 @@ $scaled = array('unscaled','scaled'); name; ?> ' >{'contribution_to_cost_'.$scale}, 3); ?>% - annual_costmoney_per_employee; ?> + costmoney_per_employee; ?> mbr; ?>% mtr; ?>% ' >{'costmoney_of_problem_'.$scale}; ?> - annual_costmoney; ?> - ' >{'annualmoney_benefit_'.$scale}; ?> + costmoney; ?> + ' >{'benefitmoney_'.$scale}; ?> ' >1:{'benefit_ratio_'.$scale},3); ?> - ' >{'netmoney_benefit_'.$scale}; ?> + ' >{'net_benefitmoney_'.$scale}; ?> @@ -79,14 +79,14 @@ $scaled = array('unscaled','scaled'); totals->{'contribution_to_cost_'.$scale}; ?>% - totals->annual_costmoney_per_employee; ?> + totals->costmoney_per_employee; ?> totals->{'costmoney_of_problem_'.$scale}; ?> - totals->annual_costmoney; ?> - totals->{'annualmoney_benefit_'.$scale}; ?> + totals->costmoney; ?> + totals->{'benefitmoney_'.$scale}; ?> - totals->{'netmoney_benefit_'.$scale}; ?> + totals->{'net_benefitmoney_'.$scale}; ?> diff --git a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php index cf2f2039..a703966b 100644 --- a/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/combinedresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/site/views/combinedresults/view.html.php b/site/views/combinedresults/view.html.php index 0fa686d8..119e5fac 100644 --- a/site/views/combinedresults/view.html.php +++ b/site/views/combinedresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/company/submitbutton.js b/site/views/company/submitbutton.js index 45ef69f9..52c88fdb 100644 --- a/site/views/company/submitbutton.js +++ b/site/views/company/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/company/tmpl/edit.php b/site/views/company/tmpl/edit.php index 93281c80..02b91845 100644 --- a/site/views/company/tmpl/edit.php +++ b/site/views/company/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/company/view.html.php b/site/views/company/view.html.php index 50e84f91..931a1288 100644 --- a/site/views/company/view.html.php +++ b/site/views/company/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/companyresults/tmpl/default.php b/site/views/companyresults/tmpl/default.php index 521273df..cf875579 100644 --- a/site/views/companyresults/tmpl/default.php +++ b/site/views/companyresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/companyresults/tmpl/default_chart_cost.php b/site/views/companyresults/tmpl/default_chart_cost.php index e0c86a77..b1353947 100644 --- a/site/views/companyresults/tmpl/default_chart_cost.php +++ b/site/views/companyresults/tmpl/default_chart_cost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost.php diff --git a/site/views/companyresults/tmpl/default_chart_cost_percent.php b/site/views/companyresults/tmpl/default_chart_cost_percent.php index 6ff75f16..1f4be6e5 100644 --- a/site/views/companyresults/tmpl/default_chart_cost_percent.php +++ b/site/views/companyresults/tmpl/default_chart_cost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_percent.php diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php index ebe8916b..2ebcc968 100644 --- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php +++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit.php @@ -38,9 +38,9 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr $rowArray[] = array('c' => array( array('v' => $item->name), array('v' => round($item->{'cost_of_problem_'.$scale}), 'f' => $item->{'costmoney_of_problem_'.$scale}), - array('v' => $item->annual_cost, 'f' => $item->annual_costmoney), - array('v' => $item->{'annual_benefit_'.$scale}, 'f' => $item->{'annualmoney_benefit_'.$scale}), - array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'netmoney_benefit_'.$scale}) + array('v' => $item->cost, 'f' => $item->costmoney), + array('v' => $item->{'benefit_'.$scale}, 'f' => $item->{'benefitmoney_'.$scale}), + array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'net_benefitmoney_'.$scale}) )); $i++; } @@ -53,8 +53,8 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr 'cols' => array( array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_CAUSERISK_FACTOR'), 'type' => 'string'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_BENEFIT'), 'type' => 'number'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_NET_BENEFIT'), 'type' => 'number') ), 'rows' => $rowArray diff --git a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php index dc0fb6a1..f6f5ae14 100644 --- a/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php +++ b/site/views/companyresults/tmpl/default_chart_intervention_cost_benefit_save.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_save.php @@ -38,9 +38,9 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr $rowArray[] = array('c' => array( array('v' => $item->name), array('v' => round($item->{'cost_of_problem_'.$scale}), 'f' => $item->{'costmoney_of_problem_'.$scale}), - array('v' => $item->annual_cost, 'f' => $item->annual_costmoney), - array('v' => $item->{'annual_benefit_'.$scale}, 'f' => $item->{'annualmoney_benefit_'.$scale}), - array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'netmoney_benefit_'.$scale}) + array('v' => $item->_cost, 'f' => $item->costmoney), + array('v' => $item->{'benefit_'.$scale}, 'f' => $item->{'benefitmoney_'.$scale}), + array('v' => $item->{'net_benefit_'.$scale}, 'f' => $item->{'net_benefitmoney_'.$scale}) )); $i++; } @@ -53,8 +53,8 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr 'cols' => array( array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_CAUSERISK_FACTOR'), 'type' => 'string'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_BENEFIT'), 'type' => 'number'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_NET_BENEFIT'), 'type' => 'number') ), 'rows' => $rowArray diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost.php b/site/views/companyresults/tmpl/default_chart_work_days_lost.php index d8cef665..267f1209 100644 --- a/site/views/companyresults/tmpl/default_chart_work_days_lost.php +++ b/site/views/companyresults/tmpl/default_chart_work_days_lost.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost.php diff --git a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php index acd08cf0..b3f28a17 100644 --- a/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php +++ b/site/views/companyresults/tmpl/default_chart_work_days_lost_percent.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_work_days_lost_percent.php diff --git a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php index cb323e36..1ec07652 100644 --- a/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php +++ b/site/views/companyresults/tmpl/default_table_calculated_cost_in_detail.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_calculated_cost_in_detail.php diff --git a/site/views/companyresults/tmpl/default_table_cost_summary.php b/site/views/companyresults/tmpl/default_table_cost_summary.php index 5f2afbf4..fee45c0e 100644 --- a/site/views/companyresults/tmpl/default_table_cost_summary.php +++ b/site/views/companyresults/tmpl/default_table_cost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_cost_summary.php diff --git a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php index bdf0e9e4..f5fa5829 100644 --- a/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php +++ b/site/views/companyresults/tmpl/default_table_intervention_net_benefit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_intervention_net_benefit.php @@ -47,12 +47,12 @@ $scaled = array('unscaled','scaled'); - + - - + + @@ -63,14 +63,14 @@ $scaled = array('unscaled','scaled'); name; ?> ' >{'contribution_to_cost_'.$scale}, 3); ?>% - annual_costmoney_per_employee; ?> + costmoney_per_employee; ?> mbr; ?>% mtr; ?>% ' >{'costmoney_of_problem_'.$scale}; ?> - annual_costmoney; ?> - ' >{'annualmoney_benefit_'.$scale}; ?> + costmoney; ?> + ' >{'benefitmoney_'.$scale}; ?> ' >1:{'benefit_ratio_'.$scale},3); ?> - ' >{'netmoney_benefit_'.$scale}; ?> + ' >{'net_benefitmoney_'.$scale}; ?> @@ -79,14 +79,14 @@ $scaled = array('unscaled','scaled'); totals->{'contribution_to_cost_'.$scale}; ?>% - totals->annual_costmoney_per_employee; ?> + totals->costmoney_per_employee; ?> totals->{'costmoney_of_problem_'.$scale}; ?> - totals->annual_costmoney; ?> - totals->{'annualmoney_benefit_'.$scale}; ?> + totals->costmoney; ?> + totals->{'benefitmoney_'.$scale}; ?> - totals->{'netmoney_benefit_'.$scale}; ?> + totals->{'net_benefitmoney_'.$scale}; ?> diff --git a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php index cf2f2039..a703966b 100644 --- a/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php +++ b/site/views/companyresults/tmpl/default_table_work_days_lost_summary.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_table_work_days_lost_summary.php diff --git a/site/views/companyresults/view.html.php b/site/views/companyresults/view.html.php index 1fd90f19..a221272d 100644 --- a/site/views/companyresults/view.html.php +++ b/site/views/companyresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/cpanel/tmpl/default.php b/site/views/cpanel/tmpl/default.php index f9e63739..ca133020 100644 --- a/site/views/cpanel/tmpl/default.php +++ b/site/views/cpanel/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/cpanel/view.html.php b/site/views/cpanel/view.html.php index f9372cf6..855ec8f9 100644 --- a/site/views/cpanel/view.html.php +++ b/site/views/cpanel/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/createaccount/tmpl/default.php b/site/views/createaccount/tmpl/default.php index b9565062..6c811fdc 100644 --- a/site/views/createaccount/tmpl/default.php +++ b/site/views/createaccount/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/createaccount/tmpl/default_cbpmenumodule.php b/site/views/createaccount/tmpl/default_cbpmenumodule.php index c962c70d..1bd0eaee 100644 --- a/site/views/createaccount/tmpl/default_cbpmenumodule.php +++ b/site/views/createaccount/tmpl/default_cbpmenumodule.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_cbpmenumodule.php diff --git a/site/views/createaccount/view.html.php b/site/views/createaccount/view.html.php index 4f04f643..30c1a8e7 100644 --- a/site/views/createaccount/view.html.php +++ b/site/views/createaccount/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/intervention/submitbutton.js b/site/views/intervention/submitbutton.js index 1139fa7f..66ac470b 100644 --- a/site/views/intervention/submitbutton.js +++ b/site/views/intervention/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/intervention/tmpl/edit.php b/site/views/intervention/tmpl/edit.php index 5f126b3a..31d20037 100644 --- a/site/views/intervention/tmpl/edit.php +++ b/site/views/intervention/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/intervention/view.html.php b/site/views/intervention/view.html.php index df82c3ec..351cdb3d 100644 --- a/site/views/intervention/view.html.php +++ b/site/views/intervention/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/publicresults/tmpl/default.php b/site/views/publicresults/tmpl/default.php index e108cbb1..6dd58237 100644 --- a/site/views/publicresults/tmpl/default.php +++ b/site/views/publicresults/tmpl/default.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default.php diff --git a/site/views/publicresults/tmpl/default_cbpmenumodule.php b/site/views/publicresults/tmpl/default_cbpmenumodule.php index c962c70d..1bd0eaee 100644 --- a/site/views/publicresults/tmpl/default_cbpmenumodule.php +++ b/site/views/publicresults/tmpl/default_cbpmenumodule.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_cbpmenumodule.php diff --git a/site/views/publicresults/tmpl/default_chart_cost_public.php b/site/views/publicresults/tmpl/default_chart_cost_public.php index 9e0f9c50..2249db67 100644 --- a/site/views/publicresults/tmpl/default_chart_cost_public.php +++ b/site/views/publicresults/tmpl/default_chart_cost_public.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_cost_public.php diff --git a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php index 3b1c3c31..4e6b19c5 100644 --- a/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php +++ b/site/views/publicresults/tmpl/default_chart_intervention_cost_benefit_public.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_chart_intervention_cost_benefit_public.php @@ -35,9 +35,9 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr $rowArray[] = array('c' => array( array('v' => $item->name), array('v' => round($item->cost_of_problem_unscaled), 'f' => $item->costmoney_of_problem_unscaled), - array('v' => $item->annual_cost, 'f' => $item->annual_costmoney), - array('v' => $item->annual_benefit_unscaled, 'f' => $item->annualmoney_benefit_unscaled), - array('v' => $item->net_benefit_unscaled, 'f' => $item->netmoney_benefit_unscaled) + array('v' => $item->cost, 'f' => $item->costmoney), + array('v' => $item->benefit_unscaled, 'f' => $item->benefitmoney_unscaled), + array('v' => $item->net_benefit_unscaled, 'f' => $item->net_benefitmoney_unscaled) )); $i++; } @@ -50,8 +50,8 @@ if(isset($this->results->interventions) && CostbenefitprojectionHelper::checkArr 'cols' => array( array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_CAUSERISK_FACTOR'), 'type' => 'string'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_PROBLEM'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_COST_OF_INTERVENTION'), 'type' => 'number'), - array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_ANNUAL_BENEFIT'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_COST_OF_INTERVENTION'), 'type' => 'number'), + array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_BENEFIT'), 'type' => 'number'), array('id' => '', 'label' => JText::_('COM_COSTBENEFITPROJECTION_NET_BENEFIT'), 'type' => 'number') ), 'rows' => $rowArray diff --git a/site/views/publicresults/tmpl/default_contact_form_public.php b/site/views/publicresults/tmpl/default_contact_form_public.php index 2341d025..8dffc1fd 100644 --- a/site/views/publicresults/tmpl/default_contact_form_public.php +++ b/site/views/publicresults/tmpl/default_contact_form_public.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage default_contact_form_public.php diff --git a/site/views/publicresults/view.html.php b/site/views/publicresults/view.html.php index 930714e7..686041c4 100644 --- a/site/views/publicresults/view.html.php +++ b/site/views/publicresults/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php diff --git a/site/views/scaling_factor/submitbutton.js b/site/views/scaling_factor/submitbutton.js index 075b5d09..4ec4fad5 100644 --- a/site/views/scaling_factor/submitbutton.js +++ b/site/views/scaling_factor/submitbutton.js @@ -2,8 +2,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage submitbutton.js diff --git a/site/views/scaling_factor/tmpl/edit.php b/site/views/scaling_factor/tmpl/edit.php index f14ce590..7bfcd093 100644 --- a/site/views/scaling_factor/tmpl/edit.php +++ b/site/views/scaling_factor/tmpl/edit.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage edit.php diff --git a/site/views/scaling_factor/view.html.php b/site/views/scaling_factor/view.html.php index 9f63fe71..7039d74a 100644 --- a/site/views/scaling_factor/view.html.php +++ b/site/views/scaling_factor/view.html.php @@ -3,8 +3,8 @@ Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb /-------------------------------------------------------------------------------------------------------/ - @version 3.3.11 - @build 5th May, 2016 + @version 3.3.12 + @build 10th May, 2016 @created 15th June, 2012 @package Cost Benefit Projection @subpackage view.html.php