From 050115f97dc98494a5b32fe943ece1a191ba2978 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 26 Feb 2016 15:57:23 +0200 Subject: [PATCH] Trying to remove random variable changes per/build, or at least to cut it down in a major way. --- .../company/interventions_fullwidth.php | 2 +- .../company/scaling_factors_fullwidth.php | 2 +- admin/layouts/country/companies_fullwidth.php | 2 +- .../country/interventions_fullwidth.php | 2 +- .../country/service_providers_fullwidth.php | 2 +- .../service_provider/companies_fullwidth.php | 2 +- admin/models/companies.php | 2 +- admin/models/company.php | 36 ++-- admin/models/country.php | 58 +++---- admin/models/forms/company.js | 90 +++++----- admin/models/forms/help_document.js | 154 +++++++++--------- admin/models/forms/intervention.js | 68 ++++---- admin/models/forms/scaling_factor.js | 38 ++--- admin/models/health_data_sets.php | 2 +- admin/models/help_documents.php | 2 +- admin/models/interventions.php | 2 +- admin/models/service_provider.php | 22 +-- admin/views/companies/view.html.php | 4 +- admin/views/company/tmpl/edit.php | 20 +-- admin/views/company/view.html.php | 4 +- admin/views/country/view.html.php | 6 +- admin/views/health_data_sets/view.html.php | 2 +- admin/views/help_document/tmpl/edit.php | 60 +++---- admin/views/help_documents/view.html.php | 8 +- admin/views/intervention/tmpl/edit.php | 30 ++-- admin/views/interventions/view.html.php | 6 +- admin/views/scaling_factor/tmpl/edit.php | 10 +- 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 | 68 ++++---- site/models/forms/scaling_factor.js | 38 ++--- site/views/company/tmpl/edit.php | 20 +-- site/views/company/view.html.php | 4 +- site/views/intervention/tmpl/edit.php | 30 ++-- site/views/scaling_factor/tmpl/edit.php | 10 +- 38 files changed, 469 insertions(+), 469 deletions(-) diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index c9abb913..89faf005 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->rjqinterventions; +$items = $displayData->vwdinterventions; $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 22bd8206..b9ff9c2e 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->cwvscaling_factors; +$items = $displayData->vwcscaling_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 60e2e2b5..dd9cbc3b 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->sbccompanies; +$items = $displayData->vwhcompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/layouts/country/interventions_fullwidth.php b/admin/layouts/country/interventions_fullwidth.php index d6cba51c..67e59ffd 100644 --- a/admin/layouts/country/interventions_fullwidth.php +++ b/admin/layouts/country/interventions_fullwidth.php @@ -22,7 +22,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->fnxinterventions; +$items = $displayData->vwfinterventions; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=interventions&task=intervention.edit"; diff --git a/admin/layouts/country/service_providers_fullwidth.php b/admin/layouts/country/service_providers_fullwidth.php index b6d040f7..26f2a31f 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->qkaservice_providers; +$items = $displayData->vwgservice_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 d49388d9..00ce6391 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->svucompanies; +$items = $displayData->vwecompanies; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_costbenefitprojection&view=companies&task=company.edit"; diff --git a/admin/models/companies.php b/admin/models/companies.php index 13c85562..62c03249 100644 --- a/admin/models/companies.php +++ b/admin/models/companies.php @@ -156,7 +156,7 @@ class CostbenefitprojectionModelCompanies extends JModelList * * @return translatable string */ - protected function selectionTranslation($value,$name) + public function selectionTranslation($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/models/company.php b/admin/models/company.php index 09cee46c..92f2cddc 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->companymmfv = $item->id; - $this->companyzzjj = $item->id; + $this->companyvvvv = $item->id; + $this->companyvvvw = $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 getCwvscaling_factors() + public function getVwcscaling_factors() { // 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') . ')'); - // Filter by companymmfv global. - $companymmfv = $this->companymmfv; - if (is_numeric($companymmfv )) + // Filter by companyvvvv global. + $companyvvvv = $this->companyvvvv; + if (is_numeric($companyvvvv )) { - $query->where('a.company = ' . (int) $companymmfv ); + $query->where('a.company = ' . (int) $companyvvvv ); } - elseif (is_string($companymmfv)) + elseif (is_string($companyvvvv)) { - $query->where('a.company = ' . $db->quote($companymmfv)); + $query->where('a.company = ' . $db->quote($companyvvvv)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getRjqinterventions() + public function getVwdinterventions() { // 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') . ')'); - // Filter by companyzzjj global. - $companyzzjj = $this->companyzzjj; - if (is_numeric($companyzzjj )) + // Filter by companyvvvw global. + $companyvvvw = $this->companyvvvw; + if (is_numeric($companyvvvw )) { - $query->where('a.company = ' . (int) $companyzzjj ); + $query->where('a.company = ' . (int) $companyvvvw ); } - elseif (is_string($companyzzjj)) + elseif (is_string($companyvvvw)) { - $query->where('a.company = ' . $db->quote($companyzzjj)); + $query->where('a.company = ' . $db->quote($companyvvvw)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationRjqinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationVwdinterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - protected function selectionTranslationRjqinterventions($value,$name) + public function selectionTranslationVwdinterventions($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/country.php b/admin/models/country.php index 689739fe..384f7525 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -101,9 +101,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $item->tags->getTagIds($item->id, 'com_costbenefitprojection.country'); } } - $this->countrymdld = $item->id; - $this->countrytzts = $item->id; - $this->countrydlwr = $item->id; + $this->countryvvvy = $item->id; + $this->countryvvvz = $item->id; + $this->countryvvwa = $item->id; return $item; } @@ -113,7 +113,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getFnxinterventions() + public function getVwfinterventions() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelCountry 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') . ')'); - // Filter by countrymdld global. - $countrymdld = $this->countrymdld; - if (is_numeric($countrymdld )) + // Filter by countryvvvy global. + $countryvvvy = $this->countryvvvy; + if (is_numeric($countryvvvy )) { - $query->where('a.country = ' . (int) $countrymdld ); + $query->where('a.country = ' . (int) $countryvvvy ); } - elseif (is_string($countrymdld)) + elseif (is_string($countryvvvy)) { - $query->where('a.country = ' . $db->quote($countrymdld)); + $query->where('a.country = ' . $db->quote($countryvvvy)); } else { @@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationFnxinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationVwfinterventions($item->type, 'type'); } } @@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - protected function selectionTranslationFnxinterventions($value,$name) + public function selectionTranslationVwfinterventions($value,$name) { // Array of type language strings if ($name == 'type') @@ -246,7 +246,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getQkaservice_providers() + public function getVwgservice_providers() { // Get the user object. $user = JFactory::getUser(); @@ -285,15 +285,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') . ')'); - // Filter by countrytzts global. - $countrytzts = $this->countrytzts; - if (is_numeric($countrytzts )) + // Filter by countryvvvz global. + $countryvvvz = $this->countryvvvz; + if (is_numeric($countryvvvz )) { - $query->where('a.country = ' . (int) $countrytzts ); + $query->where('a.country = ' . (int) $countryvvvz ); } - elseif (is_string($countrytzts)) + elseif (is_string($countryvvvz)) { - $query->where('a.country = ' . $db->quote($countrytzts)); + $query->where('a.country = ' . $db->quote($countryvvvz)); } else { @@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getSbccompanies() + public function getVwhcompanies() { // Get the user object. $user = JFactory::getUser(); @@ -379,15 +379,15 @@ class CostbenefitprojectionModelCountry extends JModelAdmin $query->select($db->quoteName('i.user','service_provider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.service_provider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by countrydlwr global. - $countrydlwr = $this->countrydlwr; - if (is_numeric($countrydlwr )) + // Filter by countryvvwa global. + $countryvvwa = $this->countryvvwa; + if (is_numeric($countryvvwa )) { - $query->where('a.country = ' . (int) $countrydlwr ); + $query->where('a.country = ' . (int) $countryvvwa ); } - elseif (is_string($countrydlwr)) + elseif (is_string($countryvvwa)) { - $query->where('a.country = ' . $db->quote($countrydlwr)); + $query->where('a.country = ' . $db->quote($countryvvwa)); } else { @@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationSbccompanies($item->department, 'department'); + $item->department = $this->selectionTranslationVwhcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationSbccompanies($item->per, 'per'); + $item->per = $this->selectionTranslationVwhcompanies($item->per, 'per'); } } @@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - protected function selectionTranslationSbccompanies($value,$name) + public function selectionTranslationVwhcompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/models/forms/company.js b/admin/models/forms/company.js index 99b7940d..e6ae18d6 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_GoUKnYRWrn_required = false; -jform_GoUKnYRuhe_required = false; -jform_GoUKnYRlzC_required = false; -jform_GoUKnYRmUE_required = false; -jform_GoUKnYRvxB_required = false; -jform_GoUKnYRZZT_required = false; -jform_GoUKnYRXRy_required = false; +jform_vvvvvvvvvv_required = false; +jform_vvvvvvvvvw_required = false; +jform_vvvvvvvvvx_required = false; +jform_vvvvvvvvvy_required = false; +jform_vvvvvvvvvz_required = false; +jform_vvvvvvvvwa_required = false; +jform_vvvvvvvvwb_required = false; // Initial Script jQuery(document).ready(function() { - var department_GoUKnYR = jQuery("#jform_department input[type='radio']:checked").val(); - GoUKnYR(department_GoUKnYR); + var department_vvvvvvv = jQuery("#jform_department input[type='radio']:checked").val(); + vvvvvvv(department_vvvvvvv); - var department_tWDagyL = jQuery("#jform_department input[type='radio']:checked").val(); - tWDagyL(department_tWDagyL); + var department_vvvvvvw = jQuery("#jform_department input[type='radio']:checked").val(); + vvvvvvw(department_vvvvvvw); }); -// the GoUKnYR function -function GoUKnYR(department_GoUKnYR) +// the vvvvvvv function +function vvvvvvv(department_vvvvvvv) { // set the function logic - if (department_GoUKnYR == 2) + if (department_vvvvvvv == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_GoUKnYRWrn_required) + if (jform_vvvvvvvvvv_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_GoUKnYRWrn_required = false; + jform_vvvvvvvvvv_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_GoUKnYRuhe_required) + if (jform_vvvvvvvvvw_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_GoUKnYRuhe_required = false; + jform_vvvvvvvvvw_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_GoUKnYRlzC_required) + if (jform_vvvvvvvvvx_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_GoUKnYRlzC_required = false; + jform_vvvvvvvvvx_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_GoUKnYRmUE_required) + if (jform_vvvvvvvvvy_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_GoUKnYRmUE_required = false; + jform_vvvvvvvvvy_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_GoUKnYRvxB_required) + if (jform_vvvvvvvvvz_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_GoUKnYRvxB_required = false; + jform_vvvvvvvvvz_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_GoUKnYRZZT_required) + if (jform_vvvvvvvvwa_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_GoUKnYRZZT_required = false; + jform_vvvvvvvvwa_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_GoUKnYRXRy_required) + if (jform_vvvvvvvvwb_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_GoUKnYRXRy_required = false; + jform_vvvvvvvvwb_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_GoUKnYRWrn_required) + if (!jform_vvvvvvvvvv_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_GoUKnYRWrn_required = true; + jform_vvvvvvvvvv_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_GoUKnYRuhe_required) + if (!jform_vvvvvvvvvw_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_GoUKnYRuhe_required = true; + jform_vvvvvvvvvw_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_GoUKnYRlzC_required) + if (!jform_vvvvvvvvvx_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_GoUKnYRlzC_required = true; + jform_vvvvvvvvvx_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_GoUKnYRmUE_required) + if (!jform_vvvvvvvvvy_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_GoUKnYRmUE_required = true; + jform_vvvvvvvvvy_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_GoUKnYRvxB_required) + if (!jform_vvvvvvvvvz_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_GoUKnYRvxB_required = true; + jform_vvvvvvvvvz_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_GoUKnYRZZT_required) + if (!jform_vvvvvvvvwa_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_GoUKnYRZZT_required = true; + jform_vvvvvvvvwa_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_GoUKnYRXRy_required) + if (!jform_vvvvvvvvwb_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_GoUKnYRXRy_required = true; + jform_vvvvvvvvwb_required = true; } } } -// the tWDagyL function -function tWDagyL(department_tWDagyL) +// the vvvvvvw function +function vvvvvvw(department_vvvvvvw) { // set the function logic - if (department_tWDagyL == 1) + if (department_vvvvvvw == 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 10c3dfcb..e6591a73 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_hqyqHkSVEX_required = false; -jform_TXCmbHJieM_required = false; -jform_BZIvONJWYe_required = false; -jform_kguPvVXpQH_required = false; +jform_vvvvvwdvwl_required = false; +jform_vvvvvwevwm_required = false; +jform_vvvvvwfvwn_required = false; +jform_vvvvvwgvwo_required = false; // Initial Script jQuery(document).ready(function() { - var location_jsYlSTb = jQuery("#jform_location input[type='radio']:checked").val(); - jsYlSTb(location_jsYlSTb); + var location_vvvvvwb = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvvwb(location_vvvvvwb); - var location_Rhrgnts = jQuery("#jform_location input[type='radio']:checked").val(); - Rhrgnts(location_Rhrgnts); + var location_vvvvvwc = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvvwc(location_vvvvvwc); - var type_hqyqHkS = jQuery("#jform_type").val(); - hqyqHkS(type_hqyqHkS); + var type_vvvvvwd = jQuery("#jform_type").val(); + vvvvvwd(type_vvvvvwd); - var type_TXCmbHJ = jQuery("#jform_type").val(); - TXCmbHJ(type_TXCmbHJ); + var type_vvvvvwe = jQuery("#jform_type").val(); + vvvvvwe(type_vvvvvwe); - var type_BZIvONJ = jQuery("#jform_type").val(); - BZIvONJ(type_BZIvONJ); + var type_vvvvvwf = jQuery("#jform_type").val(); + vvvvvwf(type_vvvvvwf); - var target_kguPvVX = jQuery("#jform_target input[type='radio']:checked").val(); - kguPvVX(target_kguPvVX); + var target_vvvvvwg = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvvwg(target_vvvvvwg); }); -// the jsYlSTb function -function jsYlSTb(location_jsYlSTb) +// the vvvvvwb function +function vvvvvwb(location_vvvvvwb) { // set the function logic - if (location_jsYlSTb == 1) + if (location_vvvvvwb == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function jsYlSTb(location_jsYlSTb) } } -// the Rhrgnts function -function Rhrgnts(location_Rhrgnts) +// the vvvvvwc function +function vvvvvwc(location_vvvvvwc) { // set the function logic - if (location_Rhrgnts == 2) + if (location_vvvvvwc == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function Rhrgnts(location_Rhrgnts) } } -// the hqyqHkS function -function hqyqHkS(type_hqyqHkS) +// the vvvvvwd function +function vvvvvwd(type_vvvvvwd) { - if (isSet(type_hqyqHkS) && type_hqyqHkS.constructor !== Array) + if (isSet(type_vvvvvwd) && type_vvvvvwd.constructor !== Array) { - var temp_hqyqHkS = type_hqyqHkS; - var type_hqyqHkS = []; - type_hqyqHkS.push(temp_hqyqHkS); + var temp_vvvvvwd = type_vvvvvwd; + var type_vvvvvwd = []; + type_vvvvvwd.push(temp_vvvvvwd); } - else if (!isSet(type_hqyqHkS)) + else if (!isSet(type_vvvvvwd)) { - var type_hqyqHkS = []; + var type_vvvvvwd = []; } - var type = type_hqyqHkS.some(type_hqyqHkS_SomeFunc); + var type = type_vvvvvwd.some(type_vvvvvwd_SomeFunc); // set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_hqyqHkSVEX_required) + if (jform_vvvvvwdvwl_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_hqyqHkSVEX_required = false; + jform_vvvvvwdvwl_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_hqyqHkSVEX_required) + if (!jform_vvvvvwdvwl_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_hqyqHkSVEX_required = true; + jform_vvvvvwdvwl_required = true; } } } -// the hqyqHkS Some function -function type_hqyqHkS_SomeFunc(type_hqyqHkS) +// the vvvvvwd Some function +function type_vvvvvwd_SomeFunc(type_vvvvvwd) { // set the function logic - if (type_hqyqHkS == 3) + if (type_vvvvvwd == 3) { return true; } return false; } -// the TXCmbHJ function -function TXCmbHJ(type_TXCmbHJ) +// the vvvvvwe function +function vvvvvwe(type_vvvvvwe) { - if (isSet(type_TXCmbHJ) && type_TXCmbHJ.constructor !== Array) + if (isSet(type_vvvvvwe) && type_vvvvvwe.constructor !== Array) { - var temp_TXCmbHJ = type_TXCmbHJ; - var type_TXCmbHJ = []; - type_TXCmbHJ.push(temp_TXCmbHJ); + var temp_vvvvvwe = type_vvvvvwe; + var type_vvvvvwe = []; + type_vvvvvwe.push(temp_vvvvvwe); } - else if (!isSet(type_TXCmbHJ)) + else if (!isSet(type_vvvvvwe)) { - var type_TXCmbHJ = []; + var type_vvvvvwe = []; } - var type = type_TXCmbHJ.some(type_TXCmbHJ_SomeFunc); + var type = type_vvvvvwe.some(type_vvvvvwe_SomeFunc); // set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_TXCmbHJieM_required) + if (jform_vvvvvwevwm_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_TXCmbHJieM_required = false; + jform_vvvvvwevwm_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_TXCmbHJieM_required) + if (!jform_vvvvvwevwm_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_TXCmbHJieM_required = true; + jform_vvvvvwevwm_required = true; } } } -// the TXCmbHJ Some function -function type_TXCmbHJ_SomeFunc(type_TXCmbHJ) +// the vvvvvwe Some function +function type_vvvvvwe_SomeFunc(type_vvvvvwe) { // set the function logic - if (type_TXCmbHJ == 1) + if (type_vvvvvwe == 1) { return true; } return false; } -// the BZIvONJ function -function BZIvONJ(type_BZIvONJ) +// the vvvvvwf function +function vvvvvwf(type_vvvvvwf) { - if (isSet(type_BZIvONJ) && type_BZIvONJ.constructor !== Array) + if (isSet(type_vvvvvwf) && type_vvvvvwf.constructor !== Array) { - var temp_BZIvONJ = type_BZIvONJ; - var type_BZIvONJ = []; - type_BZIvONJ.push(temp_BZIvONJ); + var temp_vvvvvwf = type_vvvvvwf; + var type_vvvvvwf = []; + type_vvvvvwf.push(temp_vvvvvwf); } - else if (!isSet(type_BZIvONJ)) + else if (!isSet(type_vvvvvwf)) { - var type_BZIvONJ = []; + var type_vvvvvwf = []; } - var type = type_BZIvONJ.some(type_BZIvONJ_SomeFunc); + var type = type_vvvvvwf.some(type_vvvvvwf_SomeFunc); // set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_BZIvONJWYe_required) + if (jform_vvvvvwfvwn_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_BZIvONJWYe_required = false; + jform_vvvvvwfvwn_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_BZIvONJWYe_required) + if (!jform_vvvvvwfvwn_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_BZIvONJWYe_required = true; + jform_vvvvvwfvwn_required = true; } } } -// the BZIvONJ Some function -function type_BZIvONJ_SomeFunc(type_BZIvONJ) +// the vvvvvwf Some function +function type_vvvvvwf_SomeFunc(type_vvvvvwf) { // set the function logic - if (type_BZIvONJ == 2) + if (type_vvvvvwf == 2) { return true; } return false; } -// the kguPvVX function -function kguPvVX(target_kguPvVX) +// the vvvvvwg function +function vvvvvwg(target_vvvvvwg) { // set the function logic - if (target_kguPvVX == 1) + if (target_vvvvvwg == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_kguPvVXpQH_required) + if (jform_vvvvvwgvwo_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_kguPvVXpQH_required = false; + jform_vvvvvwgvwo_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_kguPvVXpQH_required) + if (!jform_vvvvvwgvwo_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_kguPvVXpQH_required = true; + jform_vvvvvwgvwo_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index d1da620d..0f212097 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -17,58 +17,58 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_CVKWmltbch_required = false; -jform_uvfXsGAdeB_required = false; +jform_vvvvvvyvwj_required = false; +jform_vvvvvwavwk_required = false; // Initial Script jQuery(document).ready(function() { - var type_CVKWmlt = jQuery("#jform_type input[type='radio']:checked").val(); - CVKWmlt(type_CVKWmlt); + var type_vvvvvvy = jQuery("#jform_type input[type='radio']:checked").val(); + vvvvvvy(type_vvvvvvy); - var type_WXlltJD = jQuery("#jform_type input[type='radio']:checked").val(); - WXlltJD(type_WXlltJD); + var type_vvvvvvz = jQuery("#jform_type input[type='radio']:checked").val(); + vvvvvvz(type_vvvvvvz); - var company_uvfXsGA = jQuery("#jform_company").val(); - uvfXsGA(company_uvfXsGA); + var company_vvvvvwa = jQuery("#jform_company").val(); + vvvvvwa(company_vvvvvwa); }); -// the CVKWmlt function -function CVKWmlt(type_CVKWmlt) +// the vvvvvvy function +function vvvvvvy(type_vvvvvvy) { // set the function logic - if (type_CVKWmlt == 2) + if (type_vvvvvvy == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_CVKWmltbch_required) + if (jform_vvvvvvyvwj_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_CVKWmltbch_required = false; + jform_vvvvvvyvwj_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_CVKWmltbch_required) + if (!jform_vvvvvvyvwj_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_CVKWmltbch_required = true; + jform_vvvvvvyvwj_required = true; } } } -// the WXlltJD function -function WXlltJD(type_WXlltJD) +// the vvvvvvz function +function vvvvvvz(type_vvvvvvz) { // set the function logic - if (type_WXlltJD == 1) + if (type_vvvvvvz == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } @@ -78,55 +78,55 @@ function WXlltJD(type_WXlltJD) } } -// the uvfXsGA function -function uvfXsGA(company_uvfXsGA) +// the vvvvvwa function +function vvvvvwa(company_vvvvvwa) { - if (isSet(company_uvfXsGA) && company_uvfXsGA.constructor !== Array) + if (isSet(company_vvvvvwa) && company_vvvvvwa.constructor !== Array) { - var temp_uvfXsGA = company_uvfXsGA; - var company_uvfXsGA = []; - company_uvfXsGA.push(temp_uvfXsGA); + var temp_vvvvvwa = company_vvvvvwa; + var company_vvvvvwa = []; + company_vvvvvwa.push(temp_vvvvvwa); } - else if (!isSet(company_uvfXsGA)) + else if (!isSet(company_vvvvvwa)) { - var company_uvfXsGA = []; + var company_vvvvvwa = []; } - var company = company_uvfXsGA.some(company_uvfXsGA_SomeFunc); + var company = company_vvvvvwa.some(company_vvvvvwa_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_uvfXsGAdeB_required) + if (jform_vvvvvwavwk_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_uvfXsGAdeB_required = false; + jform_vvvvvwavwk_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_uvfXsGAdeB_required) + if (!jform_vvvvvwavwk_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_uvfXsGAdeB_required = true; + jform_vvvvvwavwk_required = true; } } } -// the uvfXsGA Some function -function company_uvfXsGA_SomeFunc(company_uvfXsGA) +// the vvvvvwa Some function +function company_vvvvvwa_SomeFunc(company_vvvvvwa) { // set the function logic - if (company_uvfXsGA == 0) + if (company_vvvvvwa == 0) { return true; } diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index b5c557e0..35d24a22 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -17,64 +17,64 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_SACPybdoDe_required = false; +jform_vvvvvvxvwi_required = false; // Initial Script jQuery(document).ready(function() { - var company_SACPybd = jQuery("#jform_company").val(); - SACPybd(company_SACPybd); + var company_vvvvvvx = jQuery("#jform_company").val(); + vvvvvvx(company_vvvvvvx); }); -// the SACPybd function -function SACPybd(company_SACPybd) +// the vvvvvvx function +function vvvvvvx(company_vvvvvvx) { - if (isSet(company_SACPybd) && company_SACPybd.constructor !== Array) + if (isSet(company_vvvvvvx) && company_vvvvvvx.constructor !== Array) { - var temp_SACPybd = company_SACPybd; - var company_SACPybd = []; - company_SACPybd.push(temp_SACPybd); + var temp_vvvvvvx = company_vvvvvvx; + var company_vvvvvvx = []; + company_vvvvvvx.push(temp_vvvvvvx); } - else if (!isSet(company_SACPybd)) + else if (!isSet(company_vvvvvvx)) { - var company_SACPybd = []; + var company_vvvvvvx = []; } - var company = company_SACPybd.some(company_SACPybd_SomeFunc); + var company = company_vvvvvvx.some(company_vvvvvvx_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_SACPybdoDe_required) + if (jform_vvvvvvxvwi_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_SACPybdoDe_required = false; + jform_vvvvvvxvwi_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_SACPybdoDe_required) + if (!jform_vvvvvvxvwi_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_SACPybdoDe_required = true; + jform_vvvvvvxvwi_required = true; } } } -// the SACPybd Some function -function company_SACPybd_SomeFunc(company_SACPybd) +// the vvvvvvx Some function +function company_vvvvvvx_SomeFunc(company_vvvvvvx) { // set the function logic - if (company_SACPybd == 0) + if (company_vvvvvvx == 0) { return true; } diff --git a/admin/models/health_data_sets.php b/admin/models/health_data_sets.php index 90eb25d5..dbee267f 100644 --- a/admin/models/health_data_sets.php +++ b/admin/models/health_data_sets.php @@ -142,7 +142,7 @@ class CostbenefitprojectionModelHealth_data_sets extends JModelList * * @return translatable string */ - protected function selectionTranslation($value,$name) + public function selectionTranslation($value,$name) { // Array of year language strings if ($name == 'year') diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 557e98e7..1b5432cd 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -172,7 +172,7 @@ class CostbenefitprojectionModelHelp_documents extends JModelList * * @return translatable string */ - protected function selectionTranslation($value,$name) + public function selectionTranslation($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/interventions.php b/admin/models/interventions.php index 6e020ba3..7a4cd070 100644 --- a/admin/models/interventions.php +++ b/admin/models/interventions.php @@ -167,7 +167,7 @@ class CostbenefitprojectionModelInterventions extends JModelList * * @return translatable string */ - protected function selectionTranslation($value,$name) + public function selectionTranslation($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 50348204..e97db9a5 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->service_providernibj = $item->id; + $this->service_providervvvx = $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 getSvucompanies() + public function getVwecompanies() { // Get the user object. $user = JFactory::getUser(); @@ -148,15 +148,15 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin $query->select($db->quoteName('i.user','service_provider_user')); $query->join('LEFT', $db->quoteName('#__costbenefitprojection_service_provider', 'i') . ' ON (' . $db->quoteName('a.service_provider') . ' = ' . $db->quoteName('i.id') . ')'); - // Filter by service_providernibj global. - $service_providernibj = $this->service_providernibj; - if (is_numeric($service_providernibj )) + // Filter by service_providervvvx global. + $service_providervvvx = $this->service_providervvvx; + if (is_numeric($service_providervvvx )) { - $query->where('a.service_provider = ' . (int) $service_providernibj ); + $query->where('a.service_provider = ' . (int) $service_providervvvx ); } - elseif (is_string($service_providernibj)) + elseif (is_string($service_providervvvx)) { - $query->where('a.service_provider = ' . $db->quote($service_providernibj)); + $query->where('a.service_provider = ' . $db->quote($service_providervvvx)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationSvucompanies($item->department, 'department'); + $item->department = $this->selectionTranslationVwecompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationSvucompanies($item->per, 'per'); + $item->per = $this->selectionTranslationVwecompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - protected function selectionTranslationSvucompanies($value,$name) + public function selectionTranslationVwecompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/views/companies/view.html.php b/admin/views/companies/view.html.php index 62e2d5a2..29b3c1d5 100644 --- a/admin/views/companies/view.html.php +++ b/admin/views/companies/view.html.php @@ -339,7 +339,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy ); } - public function getTheDepartmentSelections() + protected function getTheDepartmentSelections() { // Get a db connection. $db = JFactory::getDbo(); @@ -375,7 +375,7 @@ class CostbenefitprojectionViewCompanies extends JViewLegacy return false; } - public function getThePerSelections() + protected function getThePerSelections() { // Get a db connection. $db = JFactory::getDbo(); diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index 7e63d3d5..a4198f8b 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -141,33 +141,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');