From e493b19debc8230267dd6ca6056988b230f2c658 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Sun, 31 Jan 2016 22:28:30 +0200 Subject: [PATCH] Component image link fixed in readme. All other changes are only random variable name and date changes (due to automation) --- README.md | 2 +- .../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/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/service_provider.php | 22 +-- admin/views/company/tmpl/edit.php | 20 +-- admin/views/company/view.html.php | 4 +- admin/views/country/view.html.php | 6 +- admin/views/help_document/tmpl/edit.php | 60 +++---- admin/views/intervention/tmpl/edit.php | 30 ++-- 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 +- 31 files changed, 456 insertions(+), 456 deletions(-) diff --git a/README.md b/README.md index 7de4fdc9..7777aaf6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is a [Joomla 3.x] (http://www.joomla.org/) component. - ![Cost Benefit Projection image] (https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.png "The Cost Benefit Projection") + ![Cost Benefit Projection image] (https://raw.githubusercontent.com/namibia/CBP-Joomla-3-Component/master/admin/assets/images/component-300.png "The Cost Benefit Projection") [Create Epidemiological Profiles] (https://www.staffhealthcbp.com/) for diseases and risks affecting your company. Detailed information on projected work days lost and costs. Create and edit activities and wellness responses for your workplace. Access to Small Business Modelling. Results displayed by gender. Network with other companies and wellness professionals. diff --git a/admin/layouts/company/interventions_fullwidth.php b/admin/layouts/company/interventions_fullwidth.php index 4c53eae5..48449eb2 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->vvpinterventions; +$items = $displayData->guxinterventions; $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 d02a12f0..03eb08eb 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->pfxscaling_factors; +$items = $displayData->aukscaling_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 16484c81..372a2a4a 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->yqpcompanies; +$items = $displayData->npocompanies; $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 c6e0dcbf..a22c8962 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->sykinterventions; +$items = $displayData->ovwinterventions; $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 2434329d..6329e43e 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->nxaservice_providers; +$items = $displayData->fgfservice_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 66ac0a0e..80bccb3e 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->uuccompanies; +$items = $displayData->kjhcompanies; $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 745cf533..8bd7ece0 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->companybauh = $item->id; - $this->companyrobh = $item->id; + $this->companyjytq = $item->id; + $this->companyyjxa = $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 getPfxscaling_factors() + public function getAukscaling_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 companybauh global. - $companybauh = $this->companybauh; - if (is_numeric($companybauh )) + // Filter by companyjytq global. + $companyjytq = $this->companyjytq; + if (is_numeric($companyjytq )) { - $query->where('a.company = ' . (int) $companybauh ); + $query->where('a.company = ' . (int) $companyjytq ); } - elseif (is_string($companybauh)) + elseif (is_string($companyjytq)) { - $query->where('a.company = ' . $db->quote($companybauh)); + $query->where('a.company = ' . $db->quote($companyjytq)); } else { @@ -255,7 +255,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVvpinterventions() + public function getGuxinterventions() { // 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 companyrobh global. - $companyrobh = $this->companyrobh; - if (is_numeric($companyrobh )) + // Filter by companyyjxa global. + $companyyjxa = $this->companyyjxa; + if (is_numeric($companyyjxa )) { - $query->where('a.company = ' . (int) $companyrobh ); + $query->where('a.company = ' . (int) $companyyjxa ); } - elseif (is_string($companyrobh)) + elseif (is_string($companyyjxa)) { - $query->where('a.company = ' . $db->quote($companyrobh)); + $query->where('a.company = ' . $db->quote($companyyjxa)); } else { @@ -351,7 +351,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationVvpinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationGuxinterventions($item->type, 'type'); } } @@ -365,7 +365,7 @@ class CostbenefitprojectionModelCompany extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVvpinterventions($value,$name) + public function selectionTranslationGuxinterventions($value,$name) { // Array of type language strings if ($name == 'type') diff --git a/admin/models/country.php b/admin/models/country.php index 1045ae18..569a1047 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->countrymubx = $item->id; - $this->countryeooh = $item->id; - $this->countrykrhb = $item->id; + $this->countryvwpa = $item->id; + $this->countryswwz = $item->id; + $this->countrymnhi = $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 getSykinterventions() + public function getOvwinterventions() { // 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 countrymubx global. - $countrymubx = $this->countrymubx; - if (is_numeric($countrymubx )) + // Filter by countryvwpa global. + $countryvwpa = $this->countryvwpa; + if (is_numeric($countryvwpa )) { - $query->where('a.country = ' . (int) $countrymubx ); + $query->where('a.country = ' . (int) $countryvwpa ); } - elseif (is_string($countrymubx)) + elseif (is_string($countryvwpa)) { - $query->where('a.country = ' . $db->quote($countrymubx)); + $query->where('a.country = ' . $db->quote($countryvwpa)); } else { @@ -209,7 +209,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert type - $item->type = $this->selectionTranslationSykinterventions($item->type, 'type'); + $item->type = $this->selectionTranslationOvwinterventions($item->type, 'type'); } } @@ -223,7 +223,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationSykinterventions($value,$name) + public function selectionTranslationOvwinterventions($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 getNxaservice_providers() + public function getFgfservice_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 countryeooh global. - $countryeooh = $this->countryeooh; - if (is_numeric($countryeooh )) + // Filter by countryswwz global. + $countryswwz = $this->countryswwz; + if (is_numeric($countryswwz )) { - $query->where('a.country = ' . (int) $countryeooh ); + $query->where('a.country = ' . (int) $countryswwz ); } - elseif (is_string($countryeooh)) + elseif (is_string($countryswwz)) { - $query->where('a.country = ' . $db->quote($countryeooh)); + $query->where('a.country = ' . $db->quote($countryswwz)); } else { @@ -336,7 +336,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getYqpcompanies() + public function getNpocompanies() { // 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 countrykrhb global. - $countrykrhb = $this->countrykrhb; - if (is_numeric($countrykrhb )) + // Filter by countrymnhi global. + $countrymnhi = $this->countrymnhi; + if (is_numeric($countrymnhi )) { - $query->where('a.country = ' . (int) $countrykrhb ); + $query->where('a.country = ' . (int) $countrymnhi ); } - elseif (is_string($countrykrhb)) + elseif (is_string($countrymnhi)) { - $query->where('a.country = ' . $db->quote($countrykrhb)); + $query->where('a.country = ' . $db->quote($countrymnhi)); } else { @@ -442,9 +442,9 @@ class CostbenefitprojectionModelCountry extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationYqpcompanies($item->department, 'department'); + $item->department = $this->selectionTranslationNpocompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationYqpcompanies($item->per, 'per'); + $item->per = $this->selectionTranslationNpocompanies($item->per, 'per'); } } @@ -458,7 +458,7 @@ class CostbenefitprojectionModelCountry extends JModelAdmin * * @return translatable string */ - public function selectionTranslationYqpcompanies($value,$name) + public function selectionTranslationNpocompanies($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 b6772e8c..7ea72357 100644 --- a/admin/models/forms/company.js +++ b/admin/models/forms/company.js @@ -17,178 +17,178 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_npxAdRNdNu_required = false; -jform_npxAdRNGXo_required = false; -jform_npxAdRNAgi_required = false; -jform_npxAdRNuZR_required = false; -jform_npxAdRNdVw_required = false; -jform_npxAdRNECo_required = false; -jform_npxAdRNIVH_required = false; +jform_pqrUsDgGzN_required = false; +jform_pqrUsDgYmc_required = false; +jform_pqrUsDgzqW_required = false; +jform_pqrUsDgVKC_required = false; +jform_pqrUsDgdIC_required = false; +jform_pqrUsDgbLw_required = false; +jform_pqrUsDgsQo_required = false; // Initial Script jQuery(document).ready(function() { - var department_npxAdRN = jQuery("#jform_department input[type='radio']:checked").val(); - npxAdRN(department_npxAdRN); + var department_pqrUsDg = jQuery("#jform_department input[type='radio']:checked").val(); + pqrUsDg(department_pqrUsDg); - var department_aDPjNtE = jQuery("#jform_department input[type='radio']:checked").val(); - aDPjNtE(department_aDPjNtE); + var department_yuyJIQE = jQuery("#jform_department input[type='radio']:checked").val(); + yuyJIQE(department_yuyJIQE); }); -// the npxAdRN function -function npxAdRN(department_npxAdRN) +// the pqrUsDg function +function pqrUsDg(department_pqrUsDg) { // set the function logic - if (department_npxAdRN == 2) + if (department_pqrUsDg == 2) { jQuery('#jform_causesrisks').closest('.control-group').show(); - if (jform_npxAdRNdNu_required) + if (jform_pqrUsDgGzN_required) { updateFieldRequired('causesrisks',0); jQuery('#jform_causesrisks').prop('required','required'); jQuery('#jform_causesrisks').attr('aria-required',true); jQuery('#jform_causesrisks').addClass('required'); - jform_npxAdRNdNu_required = false; + jform_pqrUsDgGzN_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_npxAdRNGXo_required) + if (jform_pqrUsDgYmc_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_npxAdRNGXo_required = false; + jform_pqrUsDgYmc_required = false; } jQuery('#jform_medical_turnovers_females').closest('.control-group').show(); - if (jform_npxAdRNAgi_required) + if (jform_pqrUsDgzqW_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_npxAdRNAgi_required = false; + jform_pqrUsDgzqW_required = false; } jQuery('#jform_medical_turnovers_males').closest('.control-group').show(); - if (jform_npxAdRNuZR_required) + if (jform_pqrUsDgVKC_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_npxAdRNuZR_required = false; + jform_pqrUsDgVKC_required = false; } jQuery('#jform_sick_leave_females').closest('.control-group').show(); - if (jform_npxAdRNdVw_required) + if (jform_pqrUsDgdIC_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_npxAdRNdVw_required = false; + jform_pqrUsDgdIC_required = false; } jQuery('#jform_sick_leave_males').closest('.control-group').show(); - if (jform_npxAdRNECo_required) + if (jform_pqrUsDgbLw_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_npxAdRNECo_required = false; + jform_pqrUsDgbLw_required = false; } jQuery('#jform_total_healthcare').closest('.control-group').show(); - if (jform_npxAdRNIVH_required) + if (jform_pqrUsDgsQo_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_npxAdRNIVH_required = false; + jform_pqrUsDgsQo_required = false; } } else { jQuery('#jform_causesrisks').closest('.control-group').hide(); - if (!jform_npxAdRNdNu_required) + if (!jform_pqrUsDgGzN_required) { updateFieldRequired('causesrisks',1); jQuery('#jform_causesrisks').removeAttr('required'); jQuery('#jform_causesrisks').removeAttr('aria-required'); jQuery('#jform_causesrisks').removeClass('required'); - jform_npxAdRNdNu_required = true; + jform_pqrUsDgGzN_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_npxAdRNGXo_required) + if (!jform_pqrUsDgYmc_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_npxAdRNGXo_required = true; + jform_pqrUsDgYmc_required = true; } jQuery('#jform_medical_turnovers_females').closest('.control-group').hide(); - if (!jform_npxAdRNAgi_required) + if (!jform_pqrUsDgzqW_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_npxAdRNAgi_required = true; + jform_pqrUsDgzqW_required = true; } jQuery('#jform_medical_turnovers_males').closest('.control-group').hide(); - if (!jform_npxAdRNuZR_required) + if (!jform_pqrUsDgVKC_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_npxAdRNuZR_required = true; + jform_pqrUsDgVKC_required = true; } jQuery('#jform_sick_leave_females').closest('.control-group').hide(); - if (!jform_npxAdRNdVw_required) + if (!jform_pqrUsDgdIC_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_npxAdRNdVw_required = true; + jform_pqrUsDgdIC_required = true; } jQuery('#jform_sick_leave_males').closest('.control-group').hide(); - if (!jform_npxAdRNECo_required) + if (!jform_pqrUsDgbLw_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_npxAdRNECo_required = true; + jform_pqrUsDgbLw_required = true; } jQuery('#jform_total_healthcare').closest('.control-group').hide(); - if (!jform_npxAdRNIVH_required) + if (!jform_pqrUsDgsQo_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_npxAdRNIVH_required = true; + jform_pqrUsDgsQo_required = true; } } } -// the aDPjNtE function -function aDPjNtE(department_aDPjNtE) +// the yuyJIQE function +function yuyJIQE(department_yuyJIQE) { // set the function logic - if (department_aDPjNtE == 1) + if (department_yuyJIQE == 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 52033f4d..9d3c5ae0 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -17,38 +17,38 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_HuySipbXMd_required = false; -jform_fXzTOAQdkV_required = false; -jform_gwsGpjJmDB_required = false; -jform_ceQBWWOXTD_required = false; +jform_cxrSpAJsEA_required = false; +jform_agEZjiCoqY_required = false; +jform_qIpBDXfuLw_required = false; +jform_RMTlzlGmyo_required = false; // Initial Script jQuery(document).ready(function() { - var location_uJceost = jQuery("#jform_location input[type='radio']:checked").val(); - uJceost(location_uJceost); + var location_ihDVuyo = jQuery("#jform_location input[type='radio']:checked").val(); + ihDVuyo(location_ihDVuyo); - var location_NVhbnMP = jQuery("#jform_location input[type='radio']:checked").val(); - NVhbnMP(location_NVhbnMP); + var location_QHxQMlw = jQuery("#jform_location input[type='radio']:checked").val(); + QHxQMlw(location_QHxQMlw); - var type_HuySipb = jQuery("#jform_type").val(); - HuySipb(type_HuySipb); + var type_cxrSpAJ = jQuery("#jform_type").val(); + cxrSpAJ(type_cxrSpAJ); - var type_fXzTOAQ = jQuery("#jform_type").val(); - fXzTOAQ(type_fXzTOAQ); + var type_agEZjiC = jQuery("#jform_type").val(); + agEZjiC(type_agEZjiC); - var type_gwsGpjJ = jQuery("#jform_type").val(); - gwsGpjJ(type_gwsGpjJ); + var type_qIpBDXf = jQuery("#jform_type").val(); + qIpBDXf(type_qIpBDXf); - var target_ceQBWWO = jQuery("#jform_target input[type='radio']:checked").val(); - ceQBWWO(target_ceQBWWO); + var target_RMTlzlG = jQuery("#jform_target input[type='radio']:checked").val(); + RMTlzlG(target_RMTlzlG); }); -// the uJceost function -function uJceost(location_uJceost) +// the ihDVuyo function +function ihDVuyo(location_ihDVuyo) { // set the function logic - if (location_uJceost == 1) + if (location_ihDVuyo == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -58,11 +58,11 @@ function uJceost(location_uJceost) } } -// the NVhbnMP function -function NVhbnMP(location_NVhbnMP) +// the QHxQMlw function +function QHxQMlw(location_QHxQMlw) { // set the function logic - if (location_NVhbnMP == 2) + if (location_QHxQMlw == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -72,198 +72,198 @@ function NVhbnMP(location_NVhbnMP) } } -// the HuySipb function -function HuySipb(type_HuySipb) +// the cxrSpAJ function +function cxrSpAJ(type_cxrSpAJ) { - if (isSet(type_HuySipb) && type_HuySipb.constructor !== Array) + if (isSet(type_cxrSpAJ) && type_cxrSpAJ.constructor !== Array) { - var temp_HuySipb = type_HuySipb; - var type_HuySipb = []; - type_HuySipb.push(temp_HuySipb); + var temp_cxrSpAJ = type_cxrSpAJ; + var type_cxrSpAJ = []; + type_cxrSpAJ.push(temp_cxrSpAJ); } - else if (!isSet(type_HuySipb)) + else if (!isSet(type_cxrSpAJ)) { - var type_HuySipb = []; + var type_cxrSpAJ = []; } - var type = type_HuySipb.some(type_HuySipb_SomeFunc); + var type = type_cxrSpAJ.some(type_cxrSpAJ_SomeFunc); // set this function logic if (type) { jQuery('#jform_url').closest('.control-group').show(); - if (jform_HuySipbXMd_required) + if (jform_cxrSpAJsEA_required) { updateFieldRequired('url',0); jQuery('#jform_url').prop('required','required'); jQuery('#jform_url').attr('aria-required',true); jQuery('#jform_url').addClass('required'); - jform_HuySipbXMd_required = false; + jform_cxrSpAJsEA_required = false; } } else { jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_HuySipbXMd_required) + if (!jform_cxrSpAJsEA_required) { updateFieldRequired('url',1); jQuery('#jform_url').removeAttr('required'); jQuery('#jform_url').removeAttr('aria-required'); jQuery('#jform_url').removeClass('required'); - jform_HuySipbXMd_required = true; + jform_cxrSpAJsEA_required = true; } } } -// the HuySipb Some function -function type_HuySipb_SomeFunc(type_HuySipb) +// the cxrSpAJ Some function +function type_cxrSpAJ_SomeFunc(type_cxrSpAJ) { // set the function logic - if (type_HuySipb == 3) + if (type_cxrSpAJ == 3) { return true; } return false; } -// the fXzTOAQ function -function fXzTOAQ(type_fXzTOAQ) +// the agEZjiC function +function agEZjiC(type_agEZjiC) { - if (isSet(type_fXzTOAQ) && type_fXzTOAQ.constructor !== Array) + if (isSet(type_agEZjiC) && type_agEZjiC.constructor !== Array) { - var temp_fXzTOAQ = type_fXzTOAQ; - var type_fXzTOAQ = []; - type_fXzTOAQ.push(temp_fXzTOAQ); + var temp_agEZjiC = type_agEZjiC; + var type_agEZjiC = []; + type_agEZjiC.push(temp_agEZjiC); } - else if (!isSet(type_fXzTOAQ)) + else if (!isSet(type_agEZjiC)) { - var type_fXzTOAQ = []; + var type_agEZjiC = []; } - var type = type_fXzTOAQ.some(type_fXzTOAQ_SomeFunc); + var type = type_agEZjiC.some(type_agEZjiC_SomeFunc); // set this function logic if (type) { jQuery('#jform_article').closest('.control-group').show(); - if (jform_fXzTOAQdkV_required) + if (jform_agEZjiCoqY_required) { updateFieldRequired('article',0); jQuery('#jform_article').prop('required','required'); jQuery('#jform_article').attr('aria-required',true); jQuery('#jform_article').addClass('required'); - jform_fXzTOAQdkV_required = false; + jform_agEZjiCoqY_required = false; } } else { jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_fXzTOAQdkV_required) + if (!jform_agEZjiCoqY_required) { updateFieldRequired('article',1); jQuery('#jform_article').removeAttr('required'); jQuery('#jform_article').removeAttr('aria-required'); jQuery('#jform_article').removeClass('required'); - jform_fXzTOAQdkV_required = true; + jform_agEZjiCoqY_required = true; } } } -// the fXzTOAQ Some function -function type_fXzTOAQ_SomeFunc(type_fXzTOAQ) +// the agEZjiC Some function +function type_agEZjiC_SomeFunc(type_agEZjiC) { // set the function logic - if (type_fXzTOAQ == 1) + if (type_agEZjiC == 1) { return true; } return false; } -// the gwsGpjJ function -function gwsGpjJ(type_gwsGpjJ) +// the qIpBDXf function +function qIpBDXf(type_qIpBDXf) { - if (isSet(type_gwsGpjJ) && type_gwsGpjJ.constructor !== Array) + if (isSet(type_qIpBDXf) && type_qIpBDXf.constructor !== Array) { - var temp_gwsGpjJ = type_gwsGpjJ; - var type_gwsGpjJ = []; - type_gwsGpjJ.push(temp_gwsGpjJ); + var temp_qIpBDXf = type_qIpBDXf; + var type_qIpBDXf = []; + type_qIpBDXf.push(temp_qIpBDXf); } - else if (!isSet(type_gwsGpjJ)) + else if (!isSet(type_qIpBDXf)) { - var type_gwsGpjJ = []; + var type_qIpBDXf = []; } - var type = type_gwsGpjJ.some(type_gwsGpjJ_SomeFunc); + var type = type_qIpBDXf.some(type_qIpBDXf_SomeFunc); // set this function logic if (type) { jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_gwsGpjJmDB_required) + if (jform_qIpBDXfuLw_required) { updateFieldRequired('content',0); jQuery('#jform_content').prop('required','required'); jQuery('#jform_content').attr('aria-required',true); jQuery('#jform_content').addClass('required'); - jform_gwsGpjJmDB_required = false; + jform_qIpBDXfuLw_required = false; } } else { jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_gwsGpjJmDB_required) + if (!jform_qIpBDXfuLw_required) { updateFieldRequired('content',1); jQuery('#jform_content').removeAttr('required'); jQuery('#jform_content').removeAttr('aria-required'); jQuery('#jform_content').removeClass('required'); - jform_gwsGpjJmDB_required = true; + jform_qIpBDXfuLw_required = true; } } } -// the gwsGpjJ Some function -function type_gwsGpjJ_SomeFunc(type_gwsGpjJ) +// the qIpBDXf Some function +function type_qIpBDXf_SomeFunc(type_qIpBDXf) { // set the function logic - if (type_gwsGpjJ == 2) + if (type_qIpBDXf == 2) { return true; } return false; } -// the ceQBWWO function -function ceQBWWO(target_ceQBWWO) +// the RMTlzlG function +function RMTlzlG(target_RMTlzlG) { // set the function logic - if (target_ceQBWWO == 1) + if (target_RMTlzlG == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_ceQBWWOXTD_required) + if (jform_RMTlzlGmyo_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_ceQBWWOXTD_required = false; + jform_RMTlzlGmyo_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_ceQBWWOXTD_required) + if (!jform_RMTlzlGmyo_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_ceQBWWOXTD_required = true; + jform_RMTlzlGmyo_required = true; } } } diff --git a/admin/models/forms/intervention.js b/admin/models/forms/intervention.js index 32d0b6a5..24d8d838 100644 --- a/admin/models/forms/intervention.js +++ b/admin/models/forms/intervention.js @@ -17,58 +17,58 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_AwqsvJszzJ_required = false; -jform_RobjqDIOUZ_required = false; +jform_oSAonkbhIG_required = false; +jform_XkMHBjZeDC_required = false; // Initial Script jQuery(document).ready(function() { - var type_AwqsvJs = jQuery("#jform_type input[type='radio']:checked").val(); - AwqsvJs(type_AwqsvJs); + var type_oSAonkb = jQuery("#jform_type input[type='radio']:checked").val(); + oSAonkb(type_oSAonkb); - var type_mBCpOXj = jQuery("#jform_type input[type='radio']:checked").val(); - mBCpOXj(type_mBCpOXj); + var type_osTQPbV = jQuery("#jform_type input[type='radio']:checked").val(); + osTQPbV(type_osTQPbV); - var company_RobjqDI = jQuery("#jform_company").val(); - RobjqDI(company_RobjqDI); + var company_XkMHBjZ = jQuery("#jform_company").val(); + XkMHBjZ(company_XkMHBjZ); }); -// the AwqsvJs function -function AwqsvJs(type_AwqsvJs) +// the oSAonkb function +function oSAonkb(type_oSAonkb) { // set the function logic - if (type_AwqsvJs == 2) + if (type_oSAonkb == 2) { jQuery('#jform_interventions').closest('.control-group').show(); - if (jform_AwqsvJszzJ_required) + if (jform_oSAonkbhIG_required) { updateFieldRequired('interventions',0); jQuery('#jform_interventions').prop('required','required'); jQuery('#jform_interventions').attr('aria-required',true); jQuery('#jform_interventions').addClass('required'); - jform_AwqsvJszzJ_required = false; + jform_oSAonkbhIG_required = false; } } else { jQuery('#jform_interventions').closest('.control-group').hide(); - if (!jform_AwqsvJszzJ_required) + if (!jform_oSAonkbhIG_required) { updateFieldRequired('interventions',1); jQuery('#jform_interventions').removeAttr('required'); jQuery('#jform_interventions').removeAttr('aria-required'); jQuery('#jform_interventions').removeClass('required'); - jform_AwqsvJszzJ_required = true; + jform_oSAonkbhIG_required = true; } } } -// the mBCpOXj function -function mBCpOXj(type_mBCpOXj) +// the osTQPbV function +function osTQPbV(type_osTQPbV) { // set the function logic - if (type_mBCpOXj == 1) + if (type_osTQPbV == 1) { jQuery('#jform_intervention').closest('.control-group').show(); } @@ -78,55 +78,55 @@ function mBCpOXj(type_mBCpOXj) } } -// the RobjqDI function -function RobjqDI(company_RobjqDI) +// the XkMHBjZ function +function XkMHBjZ(company_XkMHBjZ) { - if (isSet(company_RobjqDI) && company_RobjqDI.constructor !== Array) + if (isSet(company_XkMHBjZ) && company_XkMHBjZ.constructor !== Array) { - var temp_RobjqDI = company_RobjqDI; - var company_RobjqDI = []; - company_RobjqDI.push(temp_RobjqDI); + var temp_XkMHBjZ = company_XkMHBjZ; + var company_XkMHBjZ = []; + company_XkMHBjZ.push(temp_XkMHBjZ); } - else if (!isSet(company_RobjqDI)) + else if (!isSet(company_XkMHBjZ)) { - var company_RobjqDI = []; + var company_XkMHBjZ = []; } - var company = company_RobjqDI.some(company_RobjqDI_SomeFunc); + var company = company_XkMHBjZ.some(company_XkMHBjZ_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_RobjqDIOUZ_required) + if (jform_XkMHBjZeDC_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_RobjqDIOUZ_required = false; + jform_XkMHBjZeDC_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_RobjqDIOUZ_required) + if (!jform_XkMHBjZeDC_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_RobjqDIOUZ_required = true; + jform_XkMHBjZeDC_required = true; } } } -// the RobjqDI Some function -function company_RobjqDI_SomeFunc(company_RobjqDI) +// the XkMHBjZ Some function +function company_XkMHBjZ_SomeFunc(company_XkMHBjZ) { // set the function logic - if (company_RobjqDI == 0) + if (company_XkMHBjZ == 0) { return true; } diff --git a/admin/models/forms/scaling_factor.js b/admin/models/forms/scaling_factor.js index 98827460..5b1c064e 100644 --- a/admin/models/forms/scaling_factor.js +++ b/admin/models/forms/scaling_factor.js @@ -17,64 +17,64 @@ /------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_VvzxxlETcI_required = false; +jform_kDrKmDcCcP_required = false; // Initial Script jQuery(document).ready(function() { - var company_VvzxxlE = jQuery("#jform_company").val(); - VvzxxlE(company_VvzxxlE); + var company_kDrKmDc = jQuery("#jform_company").val(); + kDrKmDc(company_kDrKmDc); }); -// the VvzxxlE function -function VvzxxlE(company_VvzxxlE) +// the kDrKmDc function +function kDrKmDc(company_kDrKmDc) { - if (isSet(company_VvzxxlE) && company_VvzxxlE.constructor !== Array) + if (isSet(company_kDrKmDc) && company_kDrKmDc.constructor !== Array) { - var temp_VvzxxlE = company_VvzxxlE; - var company_VvzxxlE = []; - company_VvzxxlE.push(temp_VvzxxlE); + var temp_kDrKmDc = company_kDrKmDc; + var company_kDrKmDc = []; + company_kDrKmDc.push(temp_kDrKmDc); } - else if (!isSet(company_VvzxxlE)) + else if (!isSet(company_kDrKmDc)) { - var company_VvzxxlE = []; + var company_kDrKmDc = []; } - var company = company_VvzxxlE.some(company_VvzxxlE_SomeFunc); + var company = company_kDrKmDc.some(company_kDrKmDc_SomeFunc); // set this function logic if (company) { jQuery('#jform_country').closest('.control-group').show(); - if (jform_VvzxxlETcI_required) + if (jform_kDrKmDcCcP_required) { updateFieldRequired('country',0); jQuery('#jform_country').prop('required','required'); jQuery('#jform_country').attr('aria-required',true); jQuery('#jform_country').addClass('required'); - jform_VvzxxlETcI_required = false; + jform_kDrKmDcCcP_required = false; } } else { jQuery('#jform_country').closest('.control-group').hide(); - if (!jform_VvzxxlETcI_required) + if (!jform_kDrKmDcCcP_required) { updateFieldRequired('country',1); jQuery('#jform_country').removeAttr('required'); jQuery('#jform_country').removeAttr('aria-required'); jQuery('#jform_country').removeClass('required'); - jform_VvzxxlETcI_required = true; + jform_kDrKmDcCcP_required = true; } } } -// the VvzxxlE Some function -function company_VvzxxlE_SomeFunc(company_VvzxxlE) +// the kDrKmDc Some function +function company_kDrKmDc_SomeFunc(company_kDrKmDc) { // set the function logic - if (company_VvzxxlE == 0) + if (company_kDrKmDc == 0) { return true; } diff --git a/admin/models/service_provider.php b/admin/models/service_provider.php index 3ba122b2..f1d564b6 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->serviceprovidermjhb = $item->id; + $this->serviceproviderynzo = $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 getUuccompanies() + public function getKjhcompanies() { // 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 serviceprovidermjhb global. - $serviceprovidermjhb = $this->serviceprovidermjhb; - if (is_numeric($serviceprovidermjhb )) + // Filter by serviceproviderynzo global. + $serviceproviderynzo = $this->serviceproviderynzo; + if (is_numeric($serviceproviderynzo )) { - $query->where('a.serviceprovider = ' . (int) $serviceprovidermjhb ); + $query->where('a.serviceprovider = ' . (int) $serviceproviderynzo ); } - elseif (is_string($serviceprovidermjhb)) + elseif (is_string($serviceproviderynzo)) { - $query->where('a.serviceprovider = ' . $db->quote($serviceprovidermjhb)); + $query->where('a.serviceprovider = ' . $db->quote($serviceproviderynzo)); } else { @@ -211,9 +211,9 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin foreach ($items as $nr => &$item) { // convert department - $item->department = $this->selectionTranslationUuccompanies($item->department, 'department'); + $item->department = $this->selectionTranslationKjhcompanies($item->department, 'department'); // convert per - $item->per = $this->selectionTranslationUuccompanies($item->per, 'per'); + $item->per = $this->selectionTranslationKjhcompanies($item->per, 'per'); } } @@ -227,7 +227,7 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin * * @return translatable string */ - public function selectionTranslationUuccompanies($value,$name) + public function selectionTranslationKjhcompanies($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 91e15f50..14a84024 100644 --- a/admin/views/company/tmpl/edit.php +++ b/admin/views/company/tmpl/edit.php @@ -135,33 +135,33 @@ $componentParams = JComponentHelper::getParams('com_costbenefitprojection');