diff --git a/README.md b/README.md index 2c965e97..29deb37e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ max_input_vars = 5000 + *Version*: 3.3.0 + *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*: **80999** ++ *Line count*: **81000** + *File count*: **542** + *Folder count*: **101** diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index 097a5e85..4dcebaeb 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->zqbinterventions; +$items = $displayData->nfuinterventions; $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 d150425a..a8aceefc 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->xpxscaling_factors; +$items = $displayData->sgvscaling_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 8aa2ef7f..940c6c3c 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->wxrcompanies; +$items = $displayData->dovcompanies; $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 21cf9913..cac87120 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->byginterventions; +$items = $displayData->mmxinterventions; $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 b2ca7e60..db3132ce 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->tzvservice_providers; +$items = $displayData->oasservice_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 981a39fd..6948b002 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->cllcompanies; +$items = $displayData->rxhcompanies; $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 7bc1ca3b..365ff545 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->companygfcf = $item->id; - $this->companydzoi = $item->id; + $this->companypizd = $item->id; + $this->companyrmmb = $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 getXpxscaling_factors() + public function getSgvscaling_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 companygfcf global. - $companygfcf = $this->companygfcf; - if (is_numeric($companygfcf )) + // Filter by companypizd global. + $companypizd = $this->companypizd; + if (is_numeric($companypizd )) { - $query->where('a.company = ' . (int) $companygfcf ); + $query->where('a.company = ' . (int) $companypizd ); } - elseif (is_string($companygfcf)) + elseif (is_string($companypizd)) { - $query->where('a.company = ' . $db->quote($companygfcf)); + $query->where('a.company = ' . $db->quote($companypizd)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getZqbinterventions() + public function getNfuinterventions() { // 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 companydzoi global. - $companydzoi = $this->companydzoi; - if (is_numeric($companydzoi )) + // Filter by companyrmmb global. + $companyrmmb = $this->companyrmmb; + if (is_numeric($companyrmmb )) { - $query->where('a.company = ' . (int) $companydzoi ); + $query->where('a.company = ' . (int) $companyrmmb ); } - elseif (is_string($companydzoi)) + elseif (is_string($companyrmmb)) { - $query->where('a.company = ' . $db->quote($companydzoi)); + $query->where('a.company = ' . $db->quote($companyrmmb)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationZqbinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationNfuinterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - public function selectionTranslationZqbinterventions($value,$name) + public function selectionTranslationNfuinterventions($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/country.php b/admin/models/country.php index d607c306..fc436f10 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->countryddfw = $item->id; - $this->countrynvrl = $item->id; - $this->countrydeug = $item->id; + $this->countrytuta = $item->id; + $this->countryiyua = $item->id; + $this->countrynhus = $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 getByginterventions() + public function getMmxinterventions() { // 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 countryddfw global. - $countryddfw = $this->countryddfw; - if (is_numeric($countryddfw )) + // Filter by countrytuta global. + $countrytuta = $this->countrytuta; + if (is_numeric($countrytuta )) { - $query->where('a.country = ' . (int) $countryddfw ); + $query->where('a.country = ' . (int) $countrytuta ); } - elseif (is_string($countryddfw)) + elseif (is_string($countrytuta)) { - $query->where('a.country = ' . $db->quote($countryddfw)); + $query->where('a.country = ' . $db->quote($countrytuta)); } else { @@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationByginterventions($item->type, 'type'); + $item->type = $this->selectionTranslationMmxinterventions($item->type, 'type'); } } @@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationByginterventions($value,$name) + public function selectionTranslationMmxinterventions($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 getTzvservice_providers() + public function getOasservice_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 countrynvrl global. - $countrynvrl = $this->countrynvrl; - if (is_numeric($countrynvrl )) + // Filter by countryiyua global. + $countryiyua = $this->countryiyua; + if (is_numeric($countryiyua )) { - $query->where('a.country = ' . (int) $countrynvrl ); + $query->where('a.country = ' . (int) $countryiyua ); } - elseif (is_string($countrynvrl)) + elseif (is_string($countryiyua)) { - $query->where('a.country = ' . $db->quote($countrynvrl)); + $query->where('a.country = ' . $db->quote($countryiyua)); } else { @@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getWxrcompanies() + public function getDovcompanies() { // Get the user object. $user = JFactory::getUser(); @@ -379,15 +379,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') . ')'); - // Filter by countrydeug global. - $countrydeug = $this->countrydeug; - if (is_numeric($countrydeug )) + // Filter by countrynhus global. + $countrynhus = $this->countrynhus; + if (is_numeric($countrynhus )) { - $query->where('a.country = ' . (int) $countrydeug ); + $query->where('a.country = ' . (int) $countrynhus ); } - elseif (is_string($countrydeug)) + elseif (is_string($countrynhus)) { - $query->where('a.country = ' . $db->quote($countrydeug)); + $query->where('a.country = ' . $db->quote($countrynhus)); } else { @@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationWxrcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationDovcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationWxrcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationDovcompanies($item->per, 'per'); } } @@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationWxrcompanies($value,$name) + public function selectionTranslationDovcompanies($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 05720af2..6b22a2b5 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_rVlgHfNvak_required = false; -jform_rVlgHfNCAd_required = false; -jform_rVlgHfNZmt_required = false; -jform_rVlgHfNraQ_required = false; -jform_rVlgHfNByX_required = false; -jform_rVlgHfNMir_required = false; -jform_rVlgHfNlaW_required = false; +jform_zSMjEtHAYG_required = false; +jform_zSMjEtHKsI_required = false; +jform_zSMjEtHnnN_required = false; +jform_zSMjEtHehV_required = false; +jform_zSMjEtHIVb_required = false; +jform_zSMjEtHJLR_required = false; +jform_zSMjEtHCkO_required = false; // Initial Script jQuery(document).ready(function() { - var department_rVlgHfN = jQuery("#jform_department input[type='radio']:checked").val(); - rVlgHfN(department_rVlgHfN); + var department_zSMjEtH = jQuery("#jform_department input[type='radio']:checked").val(); + zSMjEtH(department_zSMjEtH); - var department_otRDwfE = jQuery("#jform_department input[type='radio']:checked").val(); - otRDwfE(department_otRDwfE); + var department_JQxbLpj = jQuery("#jform_department input[type='radio']:checked").val(); + JQxbLpj(department_JQxbLpj); }); -// the rVlgHfN function -function rVlgHfN(department_rVlgHfN) +// the zSMjEtH function +function zSMjEtH(department_zSMjEtH) { // set the function logic - if (department_rVlgHfN == 2) + if (department_zSMjEtH == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_rVlgHfNvak_required) + if (jform_zSMjEtHAYG_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_rVlgHfNvak_required = false; + jform_zSMjEtHAYG_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_rVlgHfNCAd_required) + if (jform_zSMjEtHKsI_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_rVlgHfNCAd_required = false; + jform_zSMjEtHKsI_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_rVlgHfNZmt_required) + if (jform_zSMjEtHnnN_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_rVlgHfNZmt_required = false; + jform_zSMjEtHnnN_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_rVlgHfNraQ_required) + if (jform_zSMjEtHehV_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_rVlgHfNraQ_required = false; + jform_zSMjEtHehV_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_rVlgHfNByX_required) + if (jform_zSMjEtHIVb_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_rVlgHfNByX_required = false; + jform_zSMjEtHIVb_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_rVlgHfNMir_required) + if (jform_zSMjEtHJLR_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_rVlgHfNMir_required = false; + jform_zSMjEtHJLR_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_rVlgHfNlaW_required) + if (jform_zSMjEtHCkO_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_rVlgHfNlaW_required = false; + jform_zSMjEtHCkO_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_rVlgHfNvak_required) + if (!jform_zSMjEtHAYG_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_rVlgHfNvak_required = true; + jform_zSMjEtHAYG_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_rVlgHfNCAd_required) + if (!jform_zSMjEtHKsI_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_rVlgHfNCAd_required = true; + jform_zSMjEtHKsI_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_rVlgHfNZmt_required) + if (!jform_zSMjEtHnnN_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_rVlgHfNZmt_required = true; + jform_zSMjEtHnnN_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_rVlgHfNraQ_required) + if (!jform_zSMjEtHehV_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_rVlgHfNraQ_required = true; + jform_zSMjEtHehV_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_rVlgHfNByX_required) + if (!jform_zSMjEtHIVb_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_rVlgHfNByX_required = true; + jform_zSMjEtHIVb_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_rVlgHfNMir_required) + if (!jform_zSMjEtHJLR_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_rVlgHfNMir_required = true; + jform_zSMjEtHJLR_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_rVlgHfNlaW_required) + if (!jform_zSMjEtHCkO_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_rVlgHfNlaW_required = true; + jform_zSMjEtHCkO_required = true; } } } -// the otRDwfE function -function otRDwfE(department_otRDwfE) +// the JQxbLpj function +function JQxbLpj(department_JQxbLpj) { // set the function logic - if (department_otRDwfE == 1) + if (department_JQxbLpj == 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 2eecece6..d2b178fa 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_WGaqBqHysB_required = false; -jform_plZzXlEQEW_required = false; -jform_mxsaRmrcUb_required = false; -jform_fQAidiyFNO_required = false; +jform_TOXvRExNHV_required = false; +jform_yNpeHRjZzq_required = false; +jform_LICWaSFazo_required = false; +jform_gtffPVJpEk_required = false; // Initial Script jQuery(document).ready(function() { - var location_RymCTCN = jQuery("#jform_location input[type='radio']:checked").val(); - RymCTCN(location_RymCTCN); + var location_mBfGmql = jQuery("#jform_location input[type='radio']:checked").val(); + mBfGmql(location_mBfGmql); - var location_uTrizCf = jQuery("#jform_location input[type='radio']:checked").val(); - uTrizCf(location_uTrizCf); + var location_mjJaAFh = jQuery("#jform_location input[type='radio']:checked").val(); + mjJaAFh(location_mjJaAFh); - var type_WGaqBqH = jQuery("#jform_type").val(); - WGaqBqH(type_WGaqBqH); + var type_TOXvREx = jQuery("#jform_type").val(); + TOXvREx(type_TOXvREx); - var type_plZzXlE = jQuery("#jform_type").val(); - plZzXlE(type_plZzXlE); + var type_yNpeHRj = jQuery("#jform_type").val(); + yNpeHRj(type_yNpeHRj); - var type_mxsaRmr = jQuery("#jform_type").val(); - mxsaRmr(type_mxsaRmr); + var type_LICWaSF = jQuery("#jform_type").val(); + LICWaSF(type_LICWaSF); - var target_fQAidiy = jQuery("#jform_target input[type='radio']:checked").val(); - fQAidiy(target_fQAidiy); + var target_gtffPVJ = jQuery("#jform_target input[type='radio']:checked").val(); + gtffPVJ(target_gtffPVJ); }); -// the RymCTCN function -function RymCTCN(location_RymCTCN) +// the mBfGmql function +function mBfGmql(location_mBfGmql) { // set the function logic - if (location_RymCTCN == 1) + if (location_mBfGmql == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function RymCTCN(location_RymCTCN) } } -// the uTrizCf function -function uTrizCf(location_uTrizCf) +// the mjJaAFh function +function mjJaAFh(location_mjJaAFh) { // set the function logic - if (location_uTrizCf == 2) + if (location_mjJaAFh == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function uTrizCf(location_uTrizCf) } } -// the WGaqBqH function -function WGaqBqH(type_WGaqBqH) +// the TOXvREx function +function TOXvREx(type_TOXvREx) { - if (isSet(type_WGaqBqH) && type_WGaqBqH.constructor !== Array) + if (isSet(type_TOXvREx) && type_TOXvREx.constructor !== Array) { - var temp_WGaqBqH = type_WGaqBqH; - var type_WGaqBqH = []; - type_WGaqBqH.push(temp_WGaqBqH); + var temp_TOXvREx = type_TOXvREx; + var type_TOXvREx = []; + type_TOXvREx.push(temp_TOXvREx); } - else if (!isSet(type_WGaqBqH)) + else if (!isSet(type_TOXvREx)) { - var type_WGaqBqH = []; + var type_TOXvREx = []; } - var type = type_WGaqBqH.some(type_WGaqBqH_SomeFunc); + var type = type_TOXvREx.some(type_TOXvREx_SomeFunc); // set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_WGaqBqHysB_required) + if (jform_TOXvRExNHV_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_WGaqBqHysB_required = false; + jform_TOXvRExNHV_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_WGaqBqHysB_required) + if (!jform_TOXvRExNHV_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_WGaqBqHysB_required = true; + jform_TOXvRExNHV_required = true; } } } -// the WGaqBqH Some function -function type_WGaqBqH_SomeFunc(type_WGaqBqH) +// the TOXvREx Some function +function type_TOXvREx_SomeFunc(type_TOXvREx) { // set the function logic - if (type_WGaqBqH == 3) + if (type_TOXvREx == 3) { return true; } return false; } -// the plZzXlE function -function plZzXlE(type_plZzXlE) +// the yNpeHRj function +function yNpeHRj(type_yNpeHRj) { - if (isSet(type_plZzXlE) && type_plZzXlE.constructor !== Array) + if (isSet(type_yNpeHRj) && type_yNpeHRj.constructor !== Array) { - var temp_plZzXlE = type_plZzXlE; - var type_plZzXlE = []; - type_plZzXlE.push(temp_plZzXlE); + var temp_yNpeHRj = type_yNpeHRj; + var type_yNpeHRj = []; + type_yNpeHRj.push(temp_yNpeHRj); } - else if (!isSet(type_plZzXlE)) + else if (!isSet(type_yNpeHRj)) { - var type_plZzXlE = []; + var type_yNpeHRj = []; } - var type = type_plZzXlE.some(type_plZzXlE_SomeFunc); + var type = type_yNpeHRj.some(type_yNpeHRj_SomeFunc); // set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_plZzXlEQEW_required) + if (jform_yNpeHRjZzq_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_plZzXlEQEW_required = false; + jform_yNpeHRjZzq_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_plZzXlEQEW_required) + if (!jform_yNpeHRjZzq_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_plZzXlEQEW_required = true; + jform_yNpeHRjZzq_required = true; } } } -// the plZzXlE Some function -function type_plZzXlE_SomeFunc(type_plZzXlE) +// the yNpeHRj Some function +function type_yNpeHRj_SomeFunc(type_yNpeHRj) { // set the function logic - if (type_plZzXlE == 1) + if (type_yNpeHRj == 1) { return true; } return false; } -// the mxsaRmr function -function mxsaRmr(type_mxsaRmr) +// the LICWaSF function +function LICWaSF(type_LICWaSF) { - if (isSet(type_mxsaRmr) && type_mxsaRmr.constructor !== Array) + if (isSet(type_LICWaSF) && type_LICWaSF.constructor !== Array) { - var temp_mxsaRmr = type_mxsaRmr; - var type_mxsaRmr = []; - type_mxsaRmr.push(temp_mxsaRmr); + var temp_LICWaSF = type_LICWaSF; + var type_LICWaSF = []; + type_LICWaSF.push(temp_LICWaSF); } - else if (!isSet(type_mxsaRmr)) + else if (!isSet(type_LICWaSF)) { - var type_mxsaRmr = []; + var type_LICWaSF = []; } - var type = type_mxsaRmr.some(type_mxsaRmr_SomeFunc); + var type = type_LICWaSF.some(type_LICWaSF_SomeFunc); // set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_mxsaRmrcUb_required) + if (jform_LICWaSFazo_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_mxsaRmrcUb_required = false; + jform_LICWaSFazo_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_mxsaRmrcUb_required) + if (!jform_LICWaSFazo_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_mxsaRmrcUb_required = true; + jform_LICWaSFazo_required = true; } } } -// the mxsaRmr Some function -function type_mxsaRmr_SomeFunc(type_mxsaRmr) +// the LICWaSF Some function +function type_LICWaSF_SomeFunc(type_LICWaSF) { // set the function logic - if (type_mxsaRmr == 2) + if (type_LICWaSF == 2) { return true; } return false; } -// the fQAidiy function -function fQAidiy(target_fQAidiy) +// the gtffPVJ function +function gtffPVJ(target_gtffPVJ) { // set the function logic - if (target_fQAidiy == 1) + if (target_gtffPVJ == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_fQAidiyFNO_required) + if (jform_gtffPVJpEk_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_fQAidiyFNO_required = false; + jform_gtffPVJpEk_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_fQAidiyFNO_required) + if (!jform_gtffPVJpEk_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_fQAidiyFNO_required = true; + jform_gtffPVJpEk_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index 77ff7bde..91699c59 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -17,58 +17,58 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_viqBsKTGpV_required = false; -jform_XhROPycIll_required = false; +jform_GmAZQCMxWg_required = false; +jform_UepRipzWGd_required = false; // Initial Script jQuery(document).ready(function() { - var type_viqBsKT = jQuery("#jform_type input[type='radio']:checked").val(); - viqBsKT(type_viqBsKT); + var type_GmAZQCM = jQuery("#jform_type input[type='radio']:checked").val(); + GmAZQCM(type_GmAZQCM); - var type_wWWuclt = jQuery("#jform_type input[type='radio']:checked").val(); - wWWuclt(type_wWWuclt); + var type_teRAcAb = jQuery("#jform_type input[type='radio']:checked").val(); + teRAcAb(type_teRAcAb); - var company_XhROPyc = jQuery("#jform_company").val(); - XhROPyc(company_XhROPyc); + var company_UepRipz = jQuery("#jform_company").val(); + UepRipz(company_UepRipz); }); -// the viqBsKT function -function viqBsKT(type_viqBsKT) +// the GmAZQCM function +function GmAZQCM(type_GmAZQCM) { // set the function logic - if (type_viqBsKT == 2) + if (type_GmAZQCM == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_viqBsKTGpV_required) + if (jform_GmAZQCMxWg_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_viqBsKTGpV_required = false; + jform_GmAZQCMxWg_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_viqBsKTGpV_required) + if (!jform_GmAZQCMxWg_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_viqBsKTGpV_required = true; + jform_GmAZQCMxWg_required = true; } } } -// the wWWuclt function -function wWWuclt(type_wWWuclt) +// the teRAcAb function +function teRAcAb(type_teRAcAb) { // set the function logic - if (type_wWWuclt == 1) + if (type_teRAcAb == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } @@ -78,55 +78,55 @@ function wWWuclt(type_wWWuclt) } } -// the XhROPyc function -function XhROPyc(company_XhROPyc) +// the UepRipz function +function UepRipz(company_UepRipz) { - if (isSet(company_XhROPyc) && company_XhROPyc.constructor !== Array) + if (isSet(company_UepRipz) && company_UepRipz.constructor !== Array) { - var temp_XhROPyc = company_XhROPyc; - var company_XhROPyc = []; - company_XhROPyc.push(temp_XhROPyc); + var temp_UepRipz = company_UepRipz; + var company_UepRipz = []; + company_UepRipz.push(temp_UepRipz); } - else if (!isSet(company_XhROPyc)) + else if (!isSet(company_UepRipz)) { - var company_XhROPyc = []; + var company_UepRipz = []; } - var company = company_XhROPyc.some(company_XhROPyc_SomeFunc); + var company = company_UepRipz.some(company_UepRipz_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_XhROPycIll_required) + if (jform_UepRipzWGd_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_XhROPycIll_required = false; + jform_UepRipzWGd_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_XhROPycIll_required) + if (!jform_UepRipzWGd_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_XhROPycIll_required = true; + jform_UepRipzWGd_required = true; } } } -// the XhROPyc Some function -function company_XhROPyc_SomeFunc(company_XhROPyc) +// the UepRipz Some function +function company_UepRipz_SomeFunc(company_UepRipz) { // set the function logic - if (company_XhROPyc == 0) + if (company_UepRipz == 0) { return true; } diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index 95e9a27e..db7575ea 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -17,64 +17,64 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_KGlUHkhgcJ_required = false; +jform_fZNNjvpbby_required = false; // Initial Script jQuery(document).ready(function() { - var company_KGlUHkh = jQuery("#jform_company").val(); - KGlUHkh(company_KGlUHkh); + var company_fZNNjvp = jQuery("#jform_company").val(); + fZNNjvp(company_fZNNjvp); }); -// the KGlUHkh function -function KGlUHkh(company_KGlUHkh) +// the fZNNjvp function +function fZNNjvp(company_fZNNjvp) { - if (isSet(company_KGlUHkh) && company_KGlUHkh.constructor !== Array) + if (isSet(company_fZNNjvp) && company_fZNNjvp.constructor !== Array) { - var temp_KGlUHkh = company_KGlUHkh; - var company_KGlUHkh = []; - company_KGlUHkh.push(temp_KGlUHkh); + var temp_fZNNjvp = company_fZNNjvp; + var company_fZNNjvp = []; + company_fZNNjvp.push(temp_fZNNjvp); } - else if (!isSet(company_KGlUHkh)) + else if (!isSet(company_fZNNjvp)) { - var company_KGlUHkh = []; + var company_fZNNjvp = []; } - var company = company_KGlUHkh.some(company_KGlUHkh_SomeFunc); + var company = company_fZNNjvp.some(company_fZNNjvp_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_KGlUHkhgcJ_required) + if (jform_fZNNjvpbby_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_KGlUHkhgcJ_required = false; + jform_fZNNjvpbby_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_KGlUHkhgcJ_required) + if (!jform_fZNNjvpbby_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_KGlUHkhgcJ_required = true; + jform_fZNNjvpbby_required = true; } } } -// the KGlUHkh Some function -function company_KGlUHkh_SomeFunc(company_KGlUHkh) +// the fZNNjvp Some function +function company_fZNNjvp_SomeFunc(company_fZNNjvp) { // set the function logic - if (company_KGlUHkh == 0) + if (company_fZNNjvp == 0) { return true; } diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 7151c710..ea9979db 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->serviceproviderqyde = $item->id; + $this->serviceproviderhimx = $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 getCllcompanies() + public function getRxhcompanies() { // 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') . ')'); - // Filter by serviceproviderqyde global. - $serviceproviderqyde = $this->serviceproviderqyde; - if (is_numeric($serviceproviderqyde )) + // Filter by serviceproviderhimx global. + $serviceproviderhimx = $this->serviceproviderhimx; + if (is_numeric($serviceproviderhimx )) { - $query->where('a.serviceprovider = ' . (int) $serviceproviderqyde ); + $query->where('a.serviceprovider = ' . (int) $serviceproviderhimx ); } - elseif (is_string($serviceproviderqyde)) + elseif (is_string($serviceproviderhimx)) { - $query->where('a.serviceprovider = ' . $db->quote($serviceproviderqyde)); + $query->where('a.serviceprovider = ' . $db->quote($serviceproviderhimx)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationCllcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationRxhcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationCllcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationRxhcompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - public function selectionTranslationCllcompanies($value,$name) + public function selectionTranslationRxhcompanies($value,$name) { // Array of department language strings if ($name == 'department') diff --git a/admin/sql/updates/mysql/3.2.0.sql b/admin/sql/updates/mysql/3.2.0.sql index e5823667..f22ec6af 100644 --- a/admin/sql/updates/mysql/3.2.0.sql +++ b/admin/sql/updates/mysql/3.2.0.sql @@ -1,4 +1,4 @@ ALTER TABLE `#__costbenefitprojection_intervention` -ADD `country` INT(11) NOT NULL DEFAULT '0' +ADD `country` INT(11) NOT NULL DEFAULT '0'; ALTER TABLE `#__costbenefitprojection_scaling_factor` -ADD `country` INT(11) NOT NULL DEFAULT '0' +ADD `country` INT(11) NOT NULL DEFAULT '0'; diff --git a/admin/views/company/tmpl/edit.php b/admin/views/company/tmpl/edit.php index af6ea0be..cdd293f4 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -135,33 +135,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');