Updated the the text fields for account mode due to request in issue #1 from Matthew

This commit is contained in:
Llewellyn van der Merwe 2016-03-11 18:24:14 +02:00
parent e10b35feed
commit bb8b46adc4
7 changed files with 16 additions and 16 deletions

View File

@ -186,6 +186,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_CAUSESRISKS="Causesrisks"
COM_COSTBENEFITPROJECTION_COMPANY_CAUSESRISKS_LABEL="Causes/Risks"
COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_DESCRIPTION="This feature is only available to the advanced department."
COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_LABEL="Cause/Risk Selection"
COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT="Company account"
COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY="Country"
COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_DESCRIPTION="List of available countries"
COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL="Country"
@ -231,7 +232,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_HINT="per/year"
COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_LABEL="Total Number Medical Turnovers Male"
COM_COSTBENEFITPROJECTION_COMPANY_MODE="Mode"
COM_COSTBENEFITPROJECTION_COMPANY_MODE_DESCRIPTION="Please tell us if this company is a real company or only for testing purposes."
COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL="Mode"
COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL="Account type"
COM_COSTBENEFITPROJECTION_COMPANY_NAME="Name"
COM_COSTBENEFITPROJECTION_COMPANY_NAME_DESCRIPTION="Enter Company Name Here"
COM_COSTBENEFITPROJECTION_COMPANY_NAME_HINT="Company Name Here"
@ -257,7 +258,6 @@ COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_DESCRIPTION="The interim n
COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_HINT="Between 0 and 1"
COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_LABEL="Medical Turnover Cost Factor"
COM_COSTBENEFITPROJECTION_COMPANY_PUBLISHING="Publishing"
COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY="Real company"
COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS="Company Results Access"
COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_DESC=" Allows the users in this group to access company results."
COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE="Company results (Site) Access"
@ -280,7 +280,6 @@ COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_HINT="per/year"
COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_LABEL="Total Number Sick Leave Days Males"
COM_COSTBENEFITPROJECTION_COMPANY_SIXTYSIXTY_FOUR="60-64"
COM_COSTBENEFITPROJECTION_COMPANY_STATUS="Status"
COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY="Testing company"
COM_COSTBENEFITPROJECTION_COMPANY_THIRTYTHIRTY_FOUR="30-34"
COM_COSTBENEFITPROJECTION_COMPANY_THIRTY_FIVETHIRTY_NINE="35-39"
COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_HEALTHCARE="Total Healthcare"
@ -291,6 +290,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY="Total Salary"
COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_DESCRIPTION="The total salary payed per/year"
COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_HINT="per/year"
COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_LABEL="Total Salary"
COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT="Training account"
COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT="Turnover Comment"
COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_DESCRIPTION="Here you can explain how many deaths your company has had over any given period. This will help us understand how you came to the numbers used above in the male and female medical turnovers."
COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_HINT="You can make a comment here to indicate how you arrived at the given numbers above for male and female medical turnovers."

View File

@ -181,8 +181,8 @@ class CostbenefitprojectionModelCompanies extends JModelList
if ($name == 'mode')
{
$modeArray = array(
1 => 'COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY',
2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY'
1 => 'COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT',
2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT'
);
// Now check if value is found in this array
if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value]))

View File

@ -479,8 +479,8 @@ class CostbenefitprojectionModelCountry extends JModelAdmin
if ($name == 'mode')
{
$modeArray = array(
1 => 'COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY',
2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY'
1 => 'COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT',
2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT'
);
// Now check if value is found in this array
if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value]))

View File

@ -170,9 +170,9 @@
required="true">
<!-- Option Set. -->
<option value="1">
COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY</option>
COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT</option>
<option value="2">
COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY</option>
COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT</option>
</field>
<!-- Per Field. Type: Radio. (joomla) -->
<field

View File

@ -248,8 +248,8 @@ class CostbenefitprojectionModelService_provider extends JModelAdmin
if ($name == 'mode')
{
$modeArray = array(
1 => 'COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY',
2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY'
1 => 'COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT',
2 => 'COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT'
);
// Now check if value is found in this array
if (isset($modeArray[$value]) && CostbenefitprojectionHelper::checkString($modeArray[$value]))

View File

@ -204,6 +204,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_CAUSESRISKS="Causesrisks"
COM_COSTBENEFITPROJECTION_COMPANY_CAUSESRISKS_LABEL="Causes/Risks"
COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_DESCRIPTION="This feature is only available to the advanced department."
COM_COSTBENEFITPROJECTION_COMPANY_CAUSE_RISK_SELECTION_NOTE_LABEL="Cause/Risk Selection"
COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT="Company account"
COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY="Country"
COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_DESCRIPTION="List of available countries"
COM_COSTBENEFITPROJECTION_COMPANY_COUNTRY_LABEL="Country"
@ -249,7 +250,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_HINT="per/year"
COM_COSTBENEFITPROJECTION_COMPANY_MEDICAL_TURNOVERS_MALES_LABEL="Total Number Medical Turnovers Male"
COM_COSTBENEFITPROJECTION_COMPANY_MODE="Mode"
COM_COSTBENEFITPROJECTION_COMPANY_MODE_DESCRIPTION="Please tell us if this company is a real company or only for testing purposes."
COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL="Mode"
COM_COSTBENEFITPROJECTION_COMPANY_MODE_LABEL="Account type"
COM_COSTBENEFITPROJECTION_COMPANY_NAME="Name"
COM_COSTBENEFITPROJECTION_COMPANY_NAME_DESCRIPTION="Enter Company Name Here"
COM_COSTBENEFITPROJECTION_COMPANY_NAME_HINT="Company Name Here"
@ -275,7 +276,6 @@ COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_DESCRIPTION="The interim n
COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_HINT="Between 0 and 1"
COM_COSTBENEFITPROJECTION_COMPANY_PRODUCTIVITY_LOSSES_LABEL="Medical Turnover Cost Factor"
COM_COSTBENEFITPROJECTION_COMPANY_PUBLISHING="Publishing"
COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY="Real company"
COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS="Company Results Access"
COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_DESC=" Allows the users in this group to access company results."
COM_COSTBENEFITPROJECTION_COMPANY_RESULTS_ACCESS_SITE="Company results (Site) Access"
@ -298,7 +298,6 @@ COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_HINT="per/year"
COM_COSTBENEFITPROJECTION_COMPANY_SICK_LEAVE_MALES_LABEL="Total Number Sick Leave Days Males"
COM_COSTBENEFITPROJECTION_COMPANY_SIXTYSIXTY_FOUR="60-64"
COM_COSTBENEFITPROJECTION_COMPANY_STATUS="Status"
COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY="Testing company"
COM_COSTBENEFITPROJECTION_COMPANY_THIRTYTHIRTY_FOUR="30-34"
COM_COSTBENEFITPROJECTION_COMPANY_THIRTY_FIVETHIRTY_NINE="35-39"
COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_HEALTHCARE="Total Healthcare"
@ -309,6 +308,7 @@ COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY="Total Salary"
COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_DESCRIPTION="The total salary payed per/year"
COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_HINT="per/year"
COM_COSTBENEFITPROJECTION_COMPANY_TOTAL_SALARY_LABEL="Total Salary"
COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT="Training account"
COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT="Turnover Comment"
COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_DESCRIPTION="Here you can explain how many deaths your company has had over any given period. This will help us understand how you came to the numbers used above in the male and female medical turnovers."
COM_COSTBENEFITPROJECTION_COMPANY_TURNOVER_COMMENT_HINT="You can make a comment here to indicate how you arrived at the given numbers above for male and female medical turnovers."

View File

@ -170,9 +170,9 @@
required="true">
<!-- Option Set. -->
<option value="1">
COM_COSTBENEFITPROJECTION_COMPANY_REAL_COMPANY</option>
COM_COSTBENEFITPROJECTION_COMPANY_COMPANY_ACCOUNT</option>
<option value="2">
COM_COSTBENEFITPROJECTION_COMPANY_TESTING_COMPANY</option>
COM_COSTBENEFITPROJECTION_COMPANY_TRAINING_ACCOUNT</option>
</field>
<!-- Per Field. Type: Radio. (joomla) -->
<field