diff --git a/README.md b/README.md index df8d529e..33bc1681 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ max_input_vars = 5000 + *Version*: 3.3.7 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **83758** ++ *Line count*: **83757** + *File count*: **553** + *Folder count*: **101** diff --git a/admin/helpers/costbenefitprojection.php b/admin/helpers/costbenefitprojection.php index 49cc6a29..faee0d52 100644 --- a/admin/helpers/costbenefitprojection.php +++ b/admin/helpers/costbenefitprojection.php @@ -619,13 +619,12 @@ abstract class CostbenefitprojectionHelper 3 => array( 'path' => JPATH_ADMINISTRATOR . '/components/com_users/views/users/view.html.php', 'replace' => array( - "if (\$canDo->get('core.create'))" => "if (\$canDo->get('core.create') && \$user->authorise('core.admin', 'com_costbenefitprojection'))", - "if (\$user->authorise('core.create', 'com_users') - && \$user->authorise('core.edit', 'com_users') - && \$user->authorise('core.edit.state', 'com_users'))" => "if (\$user->authorise('core.create', 'com_users') - && \$user->authorise('core.edit', 'com_users') - && \$user->authorise('core.edit.state', 'com_users') - && \$user->authorise('core.admin', 'com_costbenefitprojection'))") + "if (\$canDo->get('core.create'))" => "if (\$canDo->get('core.create') && \$user->authorise('core.admin', 'com_costbenefitprojection'))") + ), + 4 => array( + 'path' => JPATH_ADMINISTRATOR . '/components/com_users/views/users/view.html.php', + 'replace' => array( + "// Add a batch button\n\t\tif (\$user->authorise('core.create', 'com_users')" => "// Add a batch button only if user also has admin right in com_costbenefitprojection\n\t\tif (\$user->authorise('core.create', 'com_users')\n\t\t\t&& \$user->authorise('core.admin', 'com_costbenefitprojection')") ) ); // check if hack is still set diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index 3a465dae..34742501 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->dghinterventions; +$items = $displayData->ledinterventions; $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 f6d9380f..85929827 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->vqpscaling_factors; +$items = $displayData->obqscaling_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 e538ecf4..a16cc027 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->odrcompanies; +$items = $displayData->vrvcompanies; $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 1f955a16..c128dc65 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->phminterventions; +$items = $displayData->eyjinterventions; $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 c1233d09..502abc22 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->dxrservice_providers; +$items = $displayData->iqaservice_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 bf933d6f..358a2bfa 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->yvacompanies; +$items = $displayData->tvocompanies; $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 d98a66ea..61046319 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->companyumdn = $item->id; - $this->companynige = $item->id; + $this->companybxoc = $item->id; + $this->companyhojs = $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 getVqpscaling_factors() + public function getObqscaling_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 companyumdn global. - $companyumdn = $this->companyumdn; - if (is_numeric($companyumdn )) + // Filter by companybxoc global. + $companybxoc = $this->companybxoc; + if (is_numeric($companybxoc )) { - $query->where('a.company = ' . (int) $companyumdn ); + $query->where('a.company = ' . (int) $companybxoc ); } - elseif (is_string($companyumdn)) + elseif (is_string($companybxoc)) { - $query->where('a.company = ' . $db->quote($companyumdn)); + $query->where('a.company = ' . $db->quote($companybxoc)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getDghinterventions() + public function getLedinterventions() { // 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 companynige global. - $companynige = $this->companynige; - if (is_numeric($companynige )) + // Filter by companyhojs global. + $companyhojs = $this->companyhojs; + if (is_numeric($companyhojs )) { - $query->where('a.company = ' . (int) $companynige ); + $query->where('a.company = ' . (int) $companyhojs ); } - elseif (is_string($companynige)) + elseif (is_string($companyhojs)) { - $query->where('a.company = ' . $db->quote($companynige)); + $query->where('a.company = ' . $db->quote($companyhojs)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationDghinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationLedinterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - public function selectionTranslationDghinterventions($value,$name) + public function selectionTranslationLedinterventions($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/country.php b/admin/models/country.php index 9ccbf4ca..8ee7cbe8 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->countryxzpg = $item->id; - $this->countrygbit = $item->id; - $this->countrylyqz = $item->id; + $this->countryeizm = $item->id; + $this->countrylfvx = $item->id; + $this->countrybpba = $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 getPhminterventions() + public function getEyjinterventions() { // 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 countryxzpg global. - $countryxzpg = $this->countryxzpg; - if (is_numeric($countryxzpg )) + // Filter by countryeizm global. + $countryeizm = $this->countryeizm; + if (is_numeric($countryeizm )) { - $query->where('a.country = ' . (int) $countryxzpg ); + $query->where('a.country = ' . (int) $countryeizm ); } - elseif (is_string($countryxzpg)) + elseif (is_string($countryeizm)) { - $query->where('a.country = ' . $db->quote($countryxzpg)); + $query->where('a.country = ' . $db->quote($countryeizm)); } else { @@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationPhminterventions($item->type, 'type'); + $item->type = $this->selectionTranslationEyjinterventions($item->type, 'type'); } } @@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationPhminterventions($value,$name) + public function selectionTranslationEyjinterventions($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 getDxrservice_providers() + public function getIqaservice_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 countrygbit global. - $countrygbit = $this->countrygbit; - if (is_numeric($countrygbit )) + // Filter by countrylfvx global. + $countrylfvx = $this->countrylfvx; + if (is_numeric($countrylfvx )) { - $query->where('a.country = ' . (int) $countrygbit ); + $query->where('a.country = ' . (int) $countrylfvx ); } - elseif (is_string($countrygbit)) + elseif (is_string($countrylfvx)) { - $query->where('a.country = ' . $db->quote($countrygbit)); + $query->where('a.country = ' . $db->quote($countrylfvx)); } else { @@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getOdrcompanies() + public function getVrvcompanies() { // 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 countrylyqz global. - $countrylyqz = $this->countrylyqz; - if (is_numeric($countrylyqz )) + // Filter by countrybpba global. + $countrybpba = $this->countrybpba; + if (is_numeric($countrybpba )) { - $query->where('a.country = ' . (int) $countrylyqz ); + $query->where('a.country = ' . (int) $countrybpba ); } - elseif (is_string($countrylyqz)) + elseif (is_string($countrybpba)) { - $query->where('a.country = ' . $db->quote($countrylyqz)); + $query->where('a.country = ' . $db->quote($countrybpba)); } else { @@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationOdrcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationVrvcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationOdrcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationVrvcompanies($item->per, 'per'); } } @@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationOdrcompanies($value,$name) + public function selectionTranslationVrvcompanies($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 f59a8297..f25d8ef0 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_mKGkOJKBNP_required = false; -jform_mKGkOJKvVz_required = false; -jform_mKGkOJKrGI_required = false; -jform_mKGkOJKIOZ_required = false; -jform_mKGkOJKqxA_required = false; -jform_mKGkOJKwZw_required = false; -jform_mKGkOJKutU_required = false; +jform_kZREHRfabo_required = false; +jform_kZREHRfdSJ_required = false; +jform_kZREHRfowX_required = false; +jform_kZREHRfiYR_required = false; +jform_kZREHRfNDv_required = false; +jform_kZREHRfNHz_required = false; +jform_kZREHRfEcd_required = false; // Initial Script jQuery(document).ready(function() { - var department_mKGkOJK = jQuery("#jform_department input[type='radio']:checked").val(); - mKGkOJK(department_mKGkOJK); + var department_kZREHRf = jQuery("#jform_department input[type='radio']:checked").val(); + kZREHRf(department_kZREHRf); - var department_kvzvhgM = jQuery("#jform_department input[type='radio']:checked").val(); - kvzvhgM(department_kvzvhgM); + var department_qFovEif = jQuery("#jform_department input[type='radio']:checked").val(); + qFovEif(department_qFovEif); }); -// the mKGkOJK function -function mKGkOJK(department_mKGkOJK) +// the kZREHRf function +function kZREHRf(department_kZREHRf) { // set the function logic - if (department_mKGkOJK == 2) + if (department_kZREHRf == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_mKGkOJKBNP_required) + if (jform_kZREHRfabo_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_mKGkOJKBNP_required = false; + jform_kZREHRfabo_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_mKGkOJKvVz_required) + if (jform_kZREHRfdSJ_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_mKGkOJKvVz_required = false; + jform_kZREHRfdSJ_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_mKGkOJKrGI_required) + if (jform_kZREHRfowX_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_mKGkOJKrGI_required = false; + jform_kZREHRfowX_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_mKGkOJKIOZ_required) + if (jform_kZREHRfiYR_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_mKGkOJKIOZ_required = false; + jform_kZREHRfiYR_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_mKGkOJKqxA_required) + if (jform_kZREHRfNDv_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_mKGkOJKqxA_required = false; + jform_kZREHRfNDv_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_mKGkOJKwZw_required) + if (jform_kZREHRfNHz_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_mKGkOJKwZw_required = false; + jform_kZREHRfNHz_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_mKGkOJKutU_required) + if (jform_kZREHRfEcd_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_mKGkOJKutU_required = false; + jform_kZREHRfEcd_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_mKGkOJKBNP_required) + if (!jform_kZREHRfabo_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_mKGkOJKBNP_required = true; + jform_kZREHRfabo_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_mKGkOJKvVz_required) + if (!jform_kZREHRfdSJ_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_mKGkOJKvVz_required = true; + jform_kZREHRfdSJ_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_mKGkOJKrGI_required) + if (!jform_kZREHRfowX_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_mKGkOJKrGI_required = true; + jform_kZREHRfowX_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_mKGkOJKIOZ_required) + if (!jform_kZREHRfiYR_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_mKGkOJKIOZ_required = true; + jform_kZREHRfiYR_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_mKGkOJKqxA_required) + if (!jform_kZREHRfNDv_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_mKGkOJKqxA_required = true; + jform_kZREHRfNDv_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_mKGkOJKwZw_required) + if (!jform_kZREHRfNHz_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_mKGkOJKwZw_required = true; + jform_kZREHRfNHz_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_mKGkOJKutU_required) + if (!jform_kZREHRfEcd_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_mKGkOJKutU_required = true; + jform_kZREHRfEcd_required = true; } } } -// the kvzvhgM function -function kvzvhgM(department_kvzvhgM) +// the qFovEif function +function qFovEif(department_qFovEif) { // set the function logic - if (department_kvzvhgM == 1) + if (department_qFovEif == 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 e91e7673..7c757d8d 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_CXVoNoaTUi_required = false; -jform_RlScCywppj_required = false; -jform_GRMmOLOHJk_required = false; -jform_lqhjMXyMSm_required = false; +jform_PBsVlipavG_required = false; +jform_sdAEsHfPfg_required = false; +jform_LwKoEeFnqw_required = false; +jform_wfYKZjPwkr_required = false; // Initial Script jQuery(document).ready(function() { - var location_JYStDvN = jQuery("#jform_location input[type='radio']:checked").val(); - JYStDvN(location_JYStDvN); + var location_qtYTlEy = jQuery("#jform_location input[type='radio']:checked").val(); + qtYTlEy(location_qtYTlEy); - var location_VZDPdtL = jQuery("#jform_location input[type='radio']:checked").val(); - VZDPdtL(location_VZDPdtL); + var location_mpuFgRj = jQuery("#jform_location input[type='radio']:checked").val(); + mpuFgRj(location_mpuFgRj); - var type_CXVoNoa = jQuery("#jform_type").val(); - CXVoNoa(type_CXVoNoa); + var type_PBsVlip = jQuery("#jform_type").val(); + PBsVlip(type_PBsVlip); - var type_RlScCyw = jQuery("#jform_type").val(); - RlScCyw(type_RlScCyw); + var type_sdAEsHf = jQuery("#jform_type").val(); + sdAEsHf(type_sdAEsHf); - var type_GRMmOLO = jQuery("#jform_type").val(); - GRMmOLO(type_GRMmOLO); + var type_LwKoEeF = jQuery("#jform_type").val(); + LwKoEeF(type_LwKoEeF); - var target_lqhjMXy = jQuery("#jform_target input[type='radio']:checked").val(); - lqhjMXy(target_lqhjMXy); + var target_wfYKZjP = jQuery("#jform_target input[type='radio']:checked").val(); + wfYKZjP(target_wfYKZjP); }); -// the JYStDvN function -function JYStDvN(location_JYStDvN) +// the qtYTlEy function +function qtYTlEy(location_qtYTlEy) { // set the function logic - if (location_JYStDvN == 1) + if (location_qtYTlEy == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function JYStDvN(location_JYStDvN) } } -// the VZDPdtL function -function VZDPdtL(location_VZDPdtL) +// the mpuFgRj function +function mpuFgRj(location_mpuFgRj) { // set the function logic - if (location_VZDPdtL == 2) + if (location_mpuFgRj == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function VZDPdtL(location_VZDPdtL) } } -// the CXVoNoa function -function CXVoNoa(type_CXVoNoa) +// the PBsVlip function +function PBsVlip(type_PBsVlip) { - if (isSet(type_CXVoNoa) && type_CXVoNoa.constructor !== Array) + if (isSet(type_PBsVlip) && type_PBsVlip.constructor !== Array) { - var temp_CXVoNoa = type_CXVoNoa; - var type_CXVoNoa = []; - type_CXVoNoa.push(temp_CXVoNoa); + var temp_PBsVlip = type_PBsVlip; + var type_PBsVlip = []; + type_PBsVlip.push(temp_PBsVlip); } - else if (!isSet(type_CXVoNoa)) + else if (!isSet(type_PBsVlip)) { - var type_CXVoNoa = []; + var type_PBsVlip = []; } - var type = type_CXVoNoa.some(type_CXVoNoa_SomeFunc); + var type = type_PBsVlip.some(type_PBsVlip_SomeFunc); // set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_CXVoNoaTUi_required) + if (jform_PBsVlipavG_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_CXVoNoaTUi_required = false; + jform_PBsVlipavG_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_CXVoNoaTUi_required) + if (!jform_PBsVlipavG_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_CXVoNoaTUi_required = true; + jform_PBsVlipavG_required = true; } } } -// the CXVoNoa Some function -function type_CXVoNoa_SomeFunc(type_CXVoNoa) +// the PBsVlip Some function +function type_PBsVlip_SomeFunc(type_PBsVlip) { // set the function logic - if (type_CXVoNoa == 3) + if (type_PBsVlip == 3) { return true; } return false; } -// the RlScCyw function -function RlScCyw(type_RlScCyw) +// the sdAEsHf function +function sdAEsHf(type_sdAEsHf) { - if (isSet(type_RlScCyw) && type_RlScCyw.constructor !== Array) + if (isSet(type_sdAEsHf) && type_sdAEsHf.constructor !== Array) { - var temp_RlScCyw = type_RlScCyw; - var type_RlScCyw = []; - type_RlScCyw.push(temp_RlScCyw); + var temp_sdAEsHf = type_sdAEsHf; + var type_sdAEsHf = []; + type_sdAEsHf.push(temp_sdAEsHf); } - else if (!isSet(type_RlScCyw)) + else if (!isSet(type_sdAEsHf)) { - var type_RlScCyw = []; + var type_sdAEsHf = []; } - var type = type_RlScCyw.some(type_RlScCyw_SomeFunc); + var type = type_sdAEsHf.some(type_sdAEsHf_SomeFunc); // set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_RlScCywppj_required) + if (jform_sdAEsHfPfg_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_RlScCywppj_required = false; + jform_sdAEsHfPfg_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_RlScCywppj_required) + if (!jform_sdAEsHfPfg_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_RlScCywppj_required = true; + jform_sdAEsHfPfg_required = true; } } } -// the RlScCyw Some function -function type_RlScCyw_SomeFunc(type_RlScCyw) +// the sdAEsHf Some function +function type_sdAEsHf_SomeFunc(type_sdAEsHf) { // set the function logic - if (type_RlScCyw == 1) + if (type_sdAEsHf == 1) { return true; } return false; } -// the GRMmOLO function -function GRMmOLO(type_GRMmOLO) +// the LwKoEeF function +function LwKoEeF(type_LwKoEeF) { - if (isSet(type_GRMmOLO) && type_GRMmOLO.constructor !== Array) + if (isSet(type_LwKoEeF) && type_LwKoEeF.constructor !== Array) { - var temp_GRMmOLO = type_GRMmOLO; - var type_GRMmOLO = []; - type_GRMmOLO.push(temp_GRMmOLO); + var temp_LwKoEeF = type_LwKoEeF; + var type_LwKoEeF = []; + type_LwKoEeF.push(temp_LwKoEeF); } - else if (!isSet(type_GRMmOLO)) + else if (!isSet(type_LwKoEeF)) { - var type_GRMmOLO = []; + var type_LwKoEeF = []; } - var type = type_GRMmOLO.some(type_GRMmOLO_SomeFunc); + var type = type_LwKoEeF.some(type_LwKoEeF_SomeFunc); // set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_GRMmOLOHJk_required) + if (jform_LwKoEeFnqw_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_GRMmOLOHJk_required = false; + jform_LwKoEeFnqw_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_GRMmOLOHJk_required) + if (!jform_LwKoEeFnqw_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_GRMmOLOHJk_required = true; + jform_LwKoEeFnqw_required = true; } } } -// the GRMmOLO Some function -function type_GRMmOLO_SomeFunc(type_GRMmOLO) +// the LwKoEeF Some function +function type_LwKoEeF_SomeFunc(type_LwKoEeF) { // set the function logic - if (type_GRMmOLO == 2) + if (type_LwKoEeF == 2) { return true; } return false; } -// the lqhjMXy function -function lqhjMXy(target_lqhjMXy) +// the wfYKZjP function +function wfYKZjP(target_wfYKZjP) { // set the function logic - if (target_lqhjMXy == 1) + if (target_wfYKZjP == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_lqhjMXyMSm_required) + if (jform_wfYKZjPwkr_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_lqhjMXyMSm_required = false; + jform_wfYKZjPwkr_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_lqhjMXyMSm_required) + if (!jform_wfYKZjPwkr_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_lqhjMXyMSm_required = true; + jform_wfYKZjPwkr_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index 41d284a8..fa702f63 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -17,58 +17,58 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_xKzzDKVdWU_required = false; -jform_gLhYwEkyzs_required = false; +jform_PLEbHUmNyB_required = false; +jform_PotrAOoulv_required = false; // Initial Script jQuery(document).ready(function() { - var type_xKzzDKV = jQuery("#jform_type input[type='radio']:checked").val(); - xKzzDKV(type_xKzzDKV); + var type_PLEbHUm = jQuery("#jform_type input[type='radio']:checked").val(); + PLEbHUm(type_PLEbHUm); - var type_FEoIPnL = jQuery("#jform_type input[type='radio']:checked").val(); - FEoIPnL(type_FEoIPnL); + var type_LIidPRB = jQuery("#jform_type input[type='radio']:checked").val(); + LIidPRB(type_LIidPRB); - var company_gLhYwEk = jQuery("#jform_company").val(); - gLhYwEk(company_gLhYwEk); + var company_PotrAOo = jQuery("#jform_company").val(); + PotrAOo(company_PotrAOo); }); -// the xKzzDKV function -function xKzzDKV(type_xKzzDKV) +// the PLEbHUm function +function PLEbHUm(type_PLEbHUm) { // set the function logic - if (type_xKzzDKV == 2) + if (type_PLEbHUm == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_xKzzDKVdWU_required) + if (jform_PLEbHUmNyB_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_xKzzDKVdWU_required = false; + jform_PLEbHUmNyB_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_xKzzDKVdWU_required) + if (!jform_PLEbHUmNyB_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_xKzzDKVdWU_required = true; + jform_PLEbHUmNyB_required = true; } } } -// the FEoIPnL function -function FEoIPnL(type_FEoIPnL) +// the LIidPRB function +function LIidPRB(type_LIidPRB) { // set the function logic - if (type_FEoIPnL == 1) + if (type_LIidPRB == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } @@ -78,55 +78,55 @@ function FEoIPnL(type_FEoIPnL) } } -// the gLhYwEk function -function gLhYwEk(company_gLhYwEk) +// the PotrAOo function +function PotrAOo(company_PotrAOo) { - if (isSet(company_gLhYwEk) && company_gLhYwEk.constructor !== Array) + if (isSet(company_PotrAOo) && company_PotrAOo.constructor !== Array) { - var temp_gLhYwEk = company_gLhYwEk; - var company_gLhYwEk = []; - company_gLhYwEk.push(temp_gLhYwEk); + var temp_PotrAOo = company_PotrAOo; + var company_PotrAOo = []; + company_PotrAOo.push(temp_PotrAOo); } - else if (!isSet(company_gLhYwEk)) + else if (!isSet(company_PotrAOo)) { - var company_gLhYwEk = []; + var company_PotrAOo = []; } - var company = company_gLhYwEk.some(company_gLhYwEk_SomeFunc); + var company = company_PotrAOo.some(company_PotrAOo_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_gLhYwEkyzs_required) + if (jform_PotrAOoulv_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_gLhYwEkyzs_required = false; + jform_PotrAOoulv_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_gLhYwEkyzs_required) + if (!jform_PotrAOoulv_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_gLhYwEkyzs_required = true; + jform_PotrAOoulv_required = true; } } } -// the gLhYwEk Some function -function company_gLhYwEk_SomeFunc(company_gLhYwEk) +// the PotrAOo Some function +function company_PotrAOo_SomeFunc(company_PotrAOo) { // set the function logic - if (company_gLhYwEk == 0) + if (company_PotrAOo == 0) { return true; } diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index 0c1fbdaa..636da4ab 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -17,64 +17,64 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_HCncUhorFH_required = false; +jform_pBdODibjvD_required = false; // Initial Script jQuery(document).ready(function() { - var company_HCncUho = jQuery("#jform_company").val(); - HCncUho(company_HCncUho); + var company_pBdODib = jQuery("#jform_company").val(); + pBdODib(company_pBdODib); }); -// the HCncUho function -function HCncUho(company_HCncUho) +// the pBdODib function +function pBdODib(company_pBdODib) { - if (isSet(company_HCncUho) && company_HCncUho.constructor !== Array) + if (isSet(company_pBdODib) && company_pBdODib.constructor !== Array) { - var temp_HCncUho = company_HCncUho; - var company_HCncUho = []; - company_HCncUho.push(temp_HCncUho); + var temp_pBdODib = company_pBdODib; + var company_pBdODib = []; + company_pBdODib.push(temp_pBdODib); } - else if (!isSet(company_HCncUho)) + else if (!isSet(company_pBdODib)) { - var company_HCncUho = []; + var company_pBdODib = []; } - var company = company_HCncUho.some(company_HCncUho_SomeFunc); + var company = company_pBdODib.some(company_pBdODib_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_HCncUhorFH_required) + if (jform_pBdODibjvD_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_HCncUhorFH_required = false; + jform_pBdODibjvD_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_HCncUhorFH_required) + if (!jform_pBdODibjvD_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_HCncUhorFH_required = true; + jform_pBdODibjvD_required = true; } } } -// the HCncUho Some function -function company_HCncUho_SomeFunc(company_HCncUho) +// the pBdODib Some function +function company_pBdODib_SomeFunc(company_pBdODib) { // set the function logic - if (company_HCncUho == 0) + if (company_pBdODib == 0) { return true; } diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 0f5bc013..33660413 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_providerxdsw = $item->id; + $this->service_providerxmyn = $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 getYvacompanies() + public function getTvocompanies() { // 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_providerxdsw global. - $service_providerxdsw = $this->service_providerxdsw; - if (is_numeric($service_providerxdsw )) + // Filter by service_providerxmyn global. + $service_providerxmyn = $this->service_providerxmyn; + if (is_numeric($service_providerxmyn )) { - $query->where('a.service_provider = ' . (int) $service_providerxdsw ); + $query->where('a.service_provider = ' . (int) $service_providerxmyn ); } - elseif (is_string($service_providerxdsw)) + elseif (is_string($service_providerxmyn)) { - $query->where('a.service_provider = ' . $db->quote($service_providerxdsw)); + $query->where('a.service_provider = ' . $db->quote($service_providerxmyn)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationYvacompanies($item->department, 'department'); + $item->department = $this->selectionTranslationTvocompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationYvacompanies($item->per, 'per'); + $item->per = $this->selectionTranslationTvocompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - public function selectionTranslationYvacompanies($value,$name) + public function selectionTranslationTvocompanies($value,$name) { // 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 f84a32c8..ae1f1081 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -141,33 +141,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');