From dbc4caaadd7a5b928646097e6643cd2b51cfaf76 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Tue, 1 Dec 2015 07:18:34 +0200 Subject: [PATCH] Changed to readme file, other changes are only random var changes (due to automation) --- README.md | 8 +- .../company/interventions_fullwidth.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- admin/layouts/country/companies_fullwidth.php | 2 +- .../country/service_providers_fullwidth.php | 2 +- .../service_provider/companies_fullwidth.php | 2 +- admin/models/company.php | 36 ++-- admin/models/country.php | 38 ++--- admin/models/forms/company.js | 90 +++++----- admin/models/forms/help_document.js | 154 +++++++++--------- admin/models/forms/intervention.js | 30 ++-- admin/models/service_provider.php | 22 +-- admin/views/company/tmpl/edit.php | 20 +-- admin/views/company/view.html.php | 4 +- admin/views/country/view.html.php | 4 +- admin/views/help_document/tmpl/edit.php | 60 +++---- admin/views/intervention/tmpl/edit.php | 20 +-- admin/views/service_provider/view.html.php | 2 +- .../company/interventions_fullwidth.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- site/models/company.php | 36 ++-- site/models/forms/company.js | 90 +++++----- site/models/forms/intervention.js | 30 ++-- site/views/company/tmpl/edit.php | 20 +-- site/views/company/view.html.php | 4 +- site/views/intervention/tmpl/edit.php | 20 +-- 26 files changed, 354 insertions(+), 348 deletions(-) diff --git a/README.md b/README.md index 17aa5286..345109c9 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,12 @@ Having seen the health priorities for your workforce, the tool outputs projectio Benefits are calculated based on the model projecting reductions in workdays lost due to sickness, presenteeism and death. +# Requirements + +Due to the size of the permissional structure, you will need to increase max_input_vars until the permissions are able to save. +``` +max_input_vars = 5000 +``` # Build Details + *Company*: [Deutsche Gesellschaft für International Zusammenarbeit (GIZ) Gmb] (https://www.staffhealthcbp.com/) @@ -20,7 +26,7 @@ Benefits are calculated based on the model projecting reductions in workdays los + *Version*: 3.0.8 + *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*: **77989** ++ *Line count*: **77995** + *File count*: **528** + *Folder count*: **99** diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index 37ac0ae5..45a45d2e 100644 --- a/admin/layouts/company/interventions_fullwidth.php +++ b/admin/layouts/company/interventions_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->qhdinterventions; +$items = $displayData->obuinterventions; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; diff --git a/admin/layouts/company/scaling_factors_fullwidth.php b/admin/layouts/company/scaling_factors_fullwidth.php index 58f84d49..3d3a4181 100644 --- a/admin/layouts/company/scaling_factors_fullwidth.php +++ b/admin/layouts/company/scaling_factors_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->tpmscaling_factors; +$items = $displayData->qwjscaling_factors; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=scaling_factors&task=scaling_factor.edit"; diff --git a/admin/layouts/country/companies_fullwidth.php b/admin/layouts/country/companies_fullwidth.php index 967ae855..fe63ed37 100644 --- a/admin/layouts/country/companies_fullwidth.php +++ b/admin/layouts/country/companies_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->iaacompanies; +$items = $displayData->ywucompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index 8d334964..c731bcbb 100644 --- a/admin/layouts/country/service_providers_fullwidth.php +++ b/admin/layouts/country/service_providers_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->zpqservice_providers; +$items = $displayData->gmeservice_providers; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=service_providers&task=service_provider.edit"; diff --git a/admin/layouts/service_provider/companies_fullwidth.php b/admin/layouts/service_provider/companies_fullwidth.php index 95f14e2c..064ed251 100644 --- a/admin/layouts/service_provider/companies_fullwidth.php +++ b/admin/layouts/service_provider/companies_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->rfvcompanies; +$items = $displayData->uvzcompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/models/company.php b/admin/models/company.php index 7da86406..699e8a69 100644 --- a/admin/models/company.php +++ b/admin/models/company.php @@ -154,8 +154,8 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.company'); } } - $this->companymjgp = $item->id; - $this->companyosda = $item->id; + $this->companytgip = $item->id; + $this->companypqjv = $item->id; return $item; } @@ -165,7 +165,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getTpmscaling_factors() + public function getQwjscaling_factors() { // [6945] Get the user object. $user = JFactory::getUser(); @@ -204,15 +204,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $query->select($db->quoteName('h.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'h') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('h.id') . ')'); - // [6973] Filter by companymjgp global. - $companymjgp = $this->companymjgp; - if (is_numeric($companymjgp )) + // [6973] Filter by companytgip global. + $companytgip = $this->companytgip; + if (is_numeric($companytgip )) { - $query->where('a.company = ' . (int) $companymjgp ); + $query->where('a.company = ' . (int) $companytgip ); } - elseif (is_string($companymjgp)) + elseif (is_string($companytgip)) { - $query->where('a.company = ' . $db->quote($companymjgp)); + $query->where('a.company = ' . $db->quote($companytgip)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getQhdinterventions() + public function getObuinterventions() { // [6945] Get the user object. $user = JFactory::getUser(); @@ -290,15 +290,15 @@ class CostbenefitprojectionModelCompany extends JModelAdmin $query->select($db->quoteName('g.name','company_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_company', 'g') . ' ON (' . $db->quoteName('a.company') . ' = ' . $db->quoteName('g.id') . ')'); - // [6973] Filter by companyosda global. - $companyosda = $this->companyosda; - if (is_numeric($companyosda )) + // [6973] Filter by companypqjv global. + $companypqjv = $this->companypqjv; + if (is_numeric($companypqjv )) { - $query->where('a.company = ' . (int) $companyosda ); + $query->where('a.company = ' . (int) $companypqjv ); } - elseif (is_string($companyosda)) + elseif (is_string($companypqjv)) { - $query->where('a.company = ' . $db->quote($companyosda)); + $query->where('a.company = ' . $db->quote($companypqjv)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // [10884] convert type - $item->type = $this->selectionTranslationQhdinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationObuinterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - public function selectionTranslationQhdinterventions($value,$name) + public function selectionTranslationObuinterventions($value,$name) { // [10910] Array of type language strings if ($name == 'type') diff --git a/admin/models/country.php b/admin/models/country.php index 7d4ac243..88cf64fb 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -101,8 +101,8 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.country'); } } - $this->countryejzr = $item->id; - $this->countryigpl = $item->id; + $this->countrycfxe = $item->id; + $this->countryuagu = $item->id; return $item; } @@ -112,7 +112,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getZpqservice_providers() + public function getGmeservice_providers() { // [6945] Get the user object. $user = JFactory::getUser(); @@ -151,15 +151,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('h.name','country_name')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_country', 'h') . ' ON (' . $db->quoteName('a.country') . ' = ' . $db->quoteName('h.id') . ')'); - // [6973] Filter by countryejzr global. - $countryejzr = $this->countryejzr; - if (is_numeric($countryejzr )) + // [6973] Filter by countrycfxe global. + $countrycfxe = $this->countrycfxe; + if (is_numeric($countrycfxe )) { - $query->where('a.country = ' . (int) $countryejzr ); + $query->where('a.country = ' . (int) $countrycfxe ); } - elseif (is_string($countryejzr)) + elseif (is_string($countrycfxe)) { - $query->where('a.country = ' . $db->quote($countryejzr)); + $query->where('a.country = ' . $db->quote($countrycfxe)); } else { @@ -202,7 +202,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getIaacompanies() + public function getYwucompanies() { // [6945] Get the user object. $user = JFactory::getUser(); @@ -245,15 +245,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('i.user','serviceprovider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')'); - // [6973] Filter by countryigpl global. - $countryigpl = $this->countryigpl; - if (is_numeric($countryigpl )) + // [6973] Filter by countryuagu global. + $countryuagu = $this->countryuagu; + if (is_numeric($countryuagu )) { - $query->where('a.country = ' . (int) $countryigpl ); + $query->where('a.country = ' . (int) $countryuagu ); } - elseif (is_string($countryigpl)) + elseif (is_string($countryuagu)) { - $query->where('a.country = ' . $db->quote($countryigpl)); + $query->where('a.country = ' . $db->quote($countryuagu)); } else { @@ -308,9 +308,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // [10884] convert department - $item->department = $this->selectionTranslationIaacompanies($item->department, 'department'); + $item->department = $this->selectionTranslationYwucompanies($item->department, 'department'); // [10884] convert per - $item->per = $this->selectionTranslationIaacompanies($item->per, 'per'); + $item->per = $this->selectionTranslationYwucompanies($item->per, 'per'); } } @@ -324,7 +324,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationIaacompanies($value,$name) + public function selectionTranslationYwucompanies($value,$name) { // [10910] Array of department language strings if ($name == 'department') diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js index 8902c6f4..313a8d9f 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_tvbJQGaZoN_required = false; -jform_tvbJQGabaz_required = false; -jform_tvbJQGaGLC_required = false; -jform_tvbJQGamKo_required = false; -jform_tvbJQGabLy_required = false; -jform_tvbJQGawmE_required = false; -jform_tvbJQGaHqH_required = false; +jform_ZxcgApLdfm_required = false; +jform_ZxcgApLHuF_required = false; +jform_ZxcgApLlPf_required = false; +jform_ZxcgApLldq_required = false; +jform_ZxcgApLHZV_required = false; +jform_ZxcgApLAim_required = false; +jform_ZxcgApLXqL_required = false; // Initial Script jQuery(document).ready(function() { - var department_tvbJQGa = jQuery("#jform_department input[type='radio']:checked").val(); - tvbJQGa(department_tvbJQGa); + var department_ZxcgApL = jQuery("#jform_department input[type='radio']:checked").val(); + ZxcgApL(department_ZxcgApL); - var department_KxieanM = jQuery("#jform_department input[type='radio']:checked").val(); - KxieanM(department_KxieanM); + var department_rhEqLHv = jQuery("#jform_department input[type='radio']:checked").val(); + rhEqLHv(department_rhEqLHv); }); -// the tvbJQGa function -function tvbJQGa(department_tvbJQGa) +// the ZxcgApL function +function ZxcgApL(department_ZxcgApL) { // [8008] set the function logic - if (department_tvbJQGa == 2) + if (department_ZxcgApL == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_tvbJQGaZoN_required) + if (jform_ZxcgApLdfm_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_tvbJQGaZoN_required = false; + jform_ZxcgApLdfm_required = false; } jQuery('#jform_percentfemale').closest('.control-group').show(); jQuery('#jform_percentmale').closest('.control-group').show(); jQuery('#jform_productivity_losses').closest('.control-group').show(); - if (jform_tvbJQGabaz_required) + if (jform_ZxcgApLHuF_required) { updateFieldRequired('productivity_losses',0); jQuery('#jform_productivity_losses').prop('required','required'); jQuery('#jform_productivity_losses').attr('aria-required',true); jQuery('#jform_productivity_losses').addClass('required'); - jform_tvbJQGabaz_required = false; + jform_ZxcgApLHuF_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_tvbJQGaGLC_required) + if (jform_ZxcgApLlPf_required) { updateFieldRequired('medical_turnovers_females',0); jQuery('#jform_medical_turnovers_females').prop('required','required'); jQuery('#jform_medical_turnovers_females').attr('aria-required',true); jQuery('#jform_medical_turnovers_females').addClass('required'); - jform_tvbJQGaGLC_required = false; + jform_ZxcgApLlPf_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_tvbJQGamKo_required) + if (jform_ZxcgApLldq_required) { updateFieldRequired('medical_turnovers_males',0); jQuery('#jform_medical_turnovers_males').prop('required','required'); jQuery('#jform_medical_turnovers_males').attr('aria-required',true); jQuery('#jform_medical_turnovers_males').addClass('required'); - jform_tvbJQGamKo_required = false; + jform_ZxcgApLldq_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_tvbJQGabLy_required) + if (jform_ZxcgApLHZV_required) { updateFieldRequired('sick_leave_females',0); jQuery('#jform_sick_leave_females').prop('required','required'); jQuery('#jform_sick_leave_females').attr('aria-required',true); jQuery('#jform_sick_leave_females').addClass('required'); - jform_tvbJQGabLy_required = false; + jform_ZxcgApLHZV_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_tvbJQGawmE_required) + if (jform_ZxcgApLAim_required) { updateFieldRequired('sick_leave_males',0); jQuery('#jform_sick_leave_males').prop('required','required'); jQuery('#jform_sick_leave_males').attr('aria-required',true); jQuery('#jform_sick_leave_males').addClass('required'); - jform_tvbJQGawmE_required = false; + jform_ZxcgApLAim_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_tvbJQGaHqH_required) + if (jform_ZxcgApLXqL_required) { updateFieldRequired('total_healthcare',0); jQuery('#jform_total_healthcare').prop('required','required'); jQuery('#jform_total_healthcare').attr('aria-required',true); jQuery('#jform_total_healthcare').addClass('required'); - jform_tvbJQGaHqH_required = false; + jform_ZxcgApLXqL_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_tvbJQGaZoN_required) + if (!jform_ZxcgApLdfm_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_tvbJQGaZoN_required = true; + jform_ZxcgApLdfm_required = true; } jQuery('#jform_percentfemale').closest('.control-group').hide(); jQuery('#jform_percentmale').closest('.control-group').hide(); jQuery('#jform_productivity_losses').closest('.control-group').hide(); - if (!jform_tvbJQGabaz_required) + if (!jform_ZxcgApLHuF_required) { updateFieldRequired('productivity_losses',1); jQuery('#jform_productivity_losses').removeAttr('required'); jQuery('#jform_productivity_losses').removeAttr('aria-required'); jQuery('#jform_productivity_losses').removeClass('required'); - jform_tvbJQGabaz_required = true; + jform_ZxcgApLHuF_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_tvbJQGaGLC_required) + if (!jform_ZxcgApLlPf_required) { updateFieldRequired('medical_turnovers_females',1); jQuery('#jform_medical_turnovers_females').removeAttr('required'); jQuery('#jform_medical_turnovers_females').removeAttr('aria-required'); jQuery('#jform_medical_turnovers_females').removeClass('required'); - jform_tvbJQGaGLC_required = true; + jform_ZxcgApLlPf_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_tvbJQGamKo_required) + if (!jform_ZxcgApLldq_required) { updateFieldRequired('medical_turnovers_males',1); jQuery('#jform_medical_turnovers_males').removeAttr('required'); jQuery('#jform_medical_turnovers_males').removeAttr('aria-required'); jQuery('#jform_medical_turnovers_males').removeClass('required'); - jform_tvbJQGamKo_required = true; + jform_ZxcgApLldq_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_tvbJQGabLy_required) + if (!jform_ZxcgApLHZV_required) { updateFieldRequired('sick_leave_females',1); jQuery('#jform_sick_leave_females').removeAttr('required'); jQuery('#jform_sick_leave_females').removeAttr('aria-required'); jQuery('#jform_sick_leave_females').removeClass('required'); - jform_tvbJQGabLy_required = true; + jform_ZxcgApLHZV_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_tvbJQGawmE_required) + if (!jform_ZxcgApLAim_required) { updateFieldRequired('sick_leave_males',1); jQuery('#jform_sick_leave_males').removeAttr('required'); jQuery('#jform_sick_leave_males').removeAttr('aria-required'); jQuery('#jform_sick_leave_males').removeClass('required'); - jform_tvbJQGawmE_required = true; + jform_ZxcgApLAim_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_tvbJQGaHqH_required) + if (!jform_ZxcgApLXqL_required) { updateFieldRequired('total_healthcare',1); jQuery('#jform_total_healthcare').removeAttr('required'); jQuery('#jform_total_healthcare').removeAttr('aria-required'); jQuery('#jform_total_healthcare').removeClass('required'); - jform_tvbJQGaHqH_required = true; + jform_ZxcgApLXqL_required = true; } } } -// the KxieanM function -function KxieanM(department_KxieanM) +// the rhEqLHv function +function rhEqLHv(department_rhEqLHv) { // [8008] set the function logic - if (department_KxieanM == 1) + if (department_rhEqLHv == 1) { jQuery('.age_groups_note').closest('.control-group').show(); jQuery('.cause_risk_selection_note').closest('.control-group').show(); diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 6b4b365a..03a0a161 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_NyyUdhGVEZ_required = false; -jform_pmvIgHONIS_required = false; -jform_EaIzsbhXes_required = false; -jform_jRYBNcOmXz_required = false; +jform_GNSempCdHk_required = false; +jform_btpFKYzVNQ_required = false; +jform_kYXZiqcCXv_required = false; +jform_fKlWJFrnET_required = false; // Initial Script jQuery(document).ready(function() { - var location_KVbOrVT = jQuery("#jform_location input[type='radio']:checked").val(); - KVbOrVT(location_KVbOrVT); + var location_qNlskgN = jQuery("#jform_location input[type='radio']:checked").val(); + qNlskgN(location_qNlskgN); - var location_snHFbml = jQuery("#jform_location input[type='radio']:checked").val(); - snHFbml(location_snHFbml); + var location_ksdmMsB = jQuery("#jform_location input[type='radio']:checked").val(); + ksdmMsB(location_ksdmMsB); - var type_NyyUdhG = jQuery("#jform_type").val(); - NyyUdhG(type_NyyUdhG); + var type_GNSempC = jQuery("#jform_type").val(); + GNSempC(type_GNSempC); - var type_pmvIgHO = jQuery("#jform_type").val(); - pmvIgHO(type_pmvIgHO); + var type_btpFKYz = jQuery("#jform_type").val(); + btpFKYz(type_btpFKYz); - var type_EaIzsbh = jQuery("#jform_type").val(); - EaIzsbh(type_EaIzsbh); + var type_kYXZiqc = jQuery("#jform_type").val(); + kYXZiqc(type_kYXZiqc); - var target_jRYBNcO = jQuery("#jform_target input[type='radio']:checked").val(); - jRYBNcO(target_jRYBNcO); + var target_fKlWJFr = jQuery("#jform_target input[type='radio']:checked").val(); + fKlWJFr(target_fKlWJFr); }); -// the KVbOrVT function -function KVbOrVT(location_KVbOrVT) +// the qNlskgN function +function qNlskgN(location_qNlskgN) { // [8008] set the function logic - if (location_KVbOrVT == 1) + if (location_qNlskgN == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function KVbOrVT(location_KVbOrVT) } } -// the snHFbml function -function snHFbml(location_snHFbml) +// the ksdmMsB function +function ksdmMsB(location_ksdmMsB) { // [8008] set the function logic - if (location_snHFbml == 2) + if (location_ksdmMsB == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function snHFbml(location_snHFbml) } } -// the NyyUdhG function -function NyyUdhG(type_NyyUdhG) +// the GNSempC function +function GNSempC(type_GNSempC) { - if (isSet(type_NyyUdhG) && type_NyyUdhG.constructor !== Array) + if (isSet(type_GNSempC) && type_GNSempC.constructor !== Array) { - var temp_NyyUdhG = type_NyyUdhG; - var type_NyyUdhG = []; - type_NyyUdhG.push(temp_NyyUdhG); + var temp_GNSempC = type_GNSempC; + var type_GNSempC = []; + type_GNSempC.push(temp_GNSempC); } - else if (!isSet(type_NyyUdhG)) + else if (!isSet(type_GNSempC)) { - var type_NyyUdhG = []; + var type_GNSempC = []; } - var type = type_NyyUdhG.some(type_NyyUdhG_SomeFunc); + var type = type_GNSempC.some(type_GNSempC_SomeFunc); // [7986] set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_NyyUdhGVEZ_required) + if (jform_GNSempCdHk_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_NyyUdhGVEZ_required = false; + jform_GNSempCdHk_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_NyyUdhGVEZ_required) + if (!jform_GNSempCdHk_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_NyyUdhGVEZ_required = true; + jform_GNSempCdHk_required = true; } } } -// the NyyUdhG Some function -function type_NyyUdhG_SomeFunc(type_NyyUdhG) +// the GNSempC Some function +function type_GNSempC_SomeFunc(type_GNSempC) { // [7973] set the function logic - if (type_NyyUdhG == 3) + if (type_GNSempC == 3) { return true; } return false; } -// the pmvIgHO function -function pmvIgHO(type_pmvIgHO) +// the btpFKYz function +function btpFKYz(type_btpFKYz) { - if (isSet(type_pmvIgHO) && type_pmvIgHO.constructor !== Array) + if (isSet(type_btpFKYz) && type_btpFKYz.constructor !== Array) { - var temp_pmvIgHO = type_pmvIgHO; - var type_pmvIgHO = []; - type_pmvIgHO.push(temp_pmvIgHO); + var temp_btpFKYz = type_btpFKYz; + var type_btpFKYz = []; + type_btpFKYz.push(temp_btpFKYz); } - else if (!isSet(type_pmvIgHO)) + else if (!isSet(type_btpFKYz)) { - var type_pmvIgHO = []; + var type_btpFKYz = []; } - var type = type_pmvIgHO.some(type_pmvIgHO_SomeFunc); + var type = type_btpFKYz.some(type_btpFKYz_SomeFunc); // [7986] set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_pmvIgHONIS_required) + if (jform_btpFKYzVNQ_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_pmvIgHONIS_required = false; + jform_btpFKYzVNQ_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_pmvIgHONIS_required) + if (!jform_btpFKYzVNQ_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_pmvIgHONIS_required = true; + jform_btpFKYzVNQ_required = true; } } } -// the pmvIgHO Some function -function type_pmvIgHO_SomeFunc(type_pmvIgHO) +// the btpFKYz Some function +function type_btpFKYz_SomeFunc(type_btpFKYz) { // [7973] set the function logic - if (type_pmvIgHO == 1) + if (type_btpFKYz == 1) { return true; } return false; } -// the EaIzsbh function -function EaIzsbh(type_EaIzsbh) +// the kYXZiqc function +function kYXZiqc(type_kYXZiqc) { - if (isSet(type_EaIzsbh) && type_EaIzsbh.constructor !== Array) + if (isSet(type_kYXZiqc) && type_kYXZiqc.constructor !== Array) { - var temp_EaIzsbh = type_EaIzsbh; - var type_EaIzsbh = []; - type_EaIzsbh.push(temp_EaIzsbh); + var temp_kYXZiqc = type_kYXZiqc; + var type_kYXZiqc = []; + type_kYXZiqc.push(temp_kYXZiqc); } - else if (!isSet(type_EaIzsbh)) + else if (!isSet(type_kYXZiqc)) { - var type_EaIzsbh = []; + var type_kYXZiqc = []; } - var type = type_EaIzsbh.some(type_EaIzsbh_SomeFunc); + var type = type_kYXZiqc.some(type_kYXZiqc_SomeFunc); // [7986] set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_EaIzsbhXes_required) + if (jform_kYXZiqcCXv_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_EaIzsbhXes_required = false; + jform_kYXZiqcCXv_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_EaIzsbhXes_required) + if (!jform_kYXZiqcCXv_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_EaIzsbhXes_required = true; + jform_kYXZiqcCXv_required = true; } } } -// the EaIzsbh Some function -function type_EaIzsbh_SomeFunc(type_EaIzsbh) +// the kYXZiqc Some function +function type_kYXZiqc_SomeFunc(type_kYXZiqc) { // [7973] set the function logic - if (type_EaIzsbh == 2) + if (type_kYXZiqc == 2) { return true; } return false; } -// the jRYBNcO function -function jRYBNcO(target_jRYBNcO) +// the fKlWJFr function +function fKlWJFr(target_fKlWJFr) { // [8008] set the function logic - if (target_jRYBNcO == 1) + if (target_fKlWJFr == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_jRYBNcOmXz_required) + if (jform_fKlWJFrnET_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_jRYBNcOmXz_required = false; + jform_fKlWJFrnET_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_jRYBNcOmXz_required) + if (!jform_fKlWJFrnET_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_jRYBNcOmXz_required = true; + jform_fKlWJFrnET_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index a33619ec..079c7775 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -17,54 +17,54 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_NqgeyPGPCt_required = false; +jform_YwksxEqNkO_required = false; // Initial Script jQuery(document).ready(function() { - var type_NqgeyPG = jQuery("#jform_type input[type='radio']:checked").val(); - NqgeyPG(type_NqgeyPG); + var type_YwksxEq = jQuery("#jform_type input[type='radio']:checked").val(); + YwksxEq(type_YwksxEq); - var type_oEwwRnj = jQuery("#jform_type input[type='radio']:checked").val(); - oEwwRnj(type_oEwwRnj); + var type_XJhCuBT = jQuery("#jform_type input[type='radio']:checked").val(); + XJhCuBT(type_XJhCuBT); }); -// the NqgeyPG function -function NqgeyPG(type_NqgeyPG) +// the YwksxEq function +function YwksxEq(type_YwksxEq) { // [8008] set the function logic - if (type_NqgeyPG == 2) + if (type_YwksxEq == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_NqgeyPGPCt_required) + if (jform_YwksxEqNkO_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_NqgeyPGPCt_required = false; + jform_YwksxEqNkO_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_NqgeyPGPCt_required) + if (!jform_YwksxEqNkO_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_NqgeyPGPCt_required = true; + jform_YwksxEqNkO_required = true; } } } -// the oEwwRnj function -function oEwwRnj(type_oEwwRnj) +// the XJhCuBT function +function XJhCuBT(type_XJhCuBT) { // [8008] set the function logic - if (type_oEwwRnj == 1) + if (type_XJhCuBT == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 3f7db30a..2aaf488e 100644 --- a/admin/models/service_provider.php +++ b/admin/models/service_provider.php @@ -95,7 +95,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.service_provider'); } } - $this->serviceproviderieag = $item->id; + $this->serviceproviderodiy = $item->id; return $item; } @@ -105,7 +105,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getRfvcompanies() + public function getUvzcompanies() { // [6945] Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $query->select($db->quoteName('i.user','serviceprovider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.serviceprovider') . ' = ' . $db->quoteName('i.id') . ')'); - // [6973] Filter by serviceproviderieag global. - $serviceproviderieag = $this->serviceproviderieag; - if (is_numeric($serviceproviderieag )) + // [6973] Filter by serviceproviderodiy global. + $serviceproviderodiy = $this->serviceproviderodiy; + if (is_numeric($serviceproviderodiy )) { - $query->where('a.serviceprovider = ' . (int) $serviceproviderieag ); + $query->where('a.serviceprovider = ' . (int) $serviceproviderodiy ); } - elseif (is_string($serviceproviderieag)) + elseif (is_string($serviceproviderodiy)) { - $query->where('a.serviceprovider = ' . $db->quote($serviceproviderieag)); + $query->where('a.serviceprovider = ' . $db->quote($serviceproviderodiy)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // [10884] convert department - $item->department = $this->selectionTranslationRfvcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationUvzcompanies($item->department, 'department'); // [10884] convert per - $item->per = $this->selectionTranslationRfvcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationUvzcompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - public function selectionTranslationRfvcompanies($value,$name) + public function selectionTranslationUvzcompanies($value,$name) { // [10910] Array of department language strings if ($name == 'department') diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index 98ce6b45..21a857a9 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -135,33 +135,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');