Skip to content

P
PERFORMA_REPLICA
Commit ec7973df by Nilu
Options

S32486373 # Client - Incoming Issues (raised by Client) #Industry should be mandatory 

S32486540 # Client - Incoming Issues (raised by Client) #Location should be mandatory
parent e36a3ac4
Showing with 28 additions and 15 deletions
cmsWebApp/sql/AssessmentCriteriaTemplate.xml
......@@ -12,11 +12,11 @@
<column name="job_title" type="String" nullable="false" length="30"/>
<column name="job_description" type="CLOB" nullable="false"/>
<column name="ref_number" type="String" nullable="true" length="10"/>
<column name="google_address_text" type="String" nullable="true" length="300"/>
<column name="google_address_text" type="String" nullable="false" length="300"/>
<column name="location_radius" type="String" nullable="false" length="200"/>
<column name="remote" type="Boolean" nullable="true"/>
<column name="job_type" type="String" nullable="false" length="200"/>
<column name="industry" type="String" nullable="true" length="200"/>
<column name="industry" type="String" nullable="false" length="200"/>
<column name="require_cv" type="Boolean" nullable="true"/>
<column name="assessment_type" type="String" nullable="false" length="200"/>
<column name="include_assessment_criteria" type="Boolean" nullable="false"/>
......
cmsWebApp/sql/ms/AssessmentCriteriaTemplate.sql
......@@ -12,11 +12,11 @@ CREATE TABLE tl_assessment_template (
job_title varchar(30) NOT NULL,
job_description text NOT NULL,
ref_number varchar(10) NULL,
google_address_text varchar(300) NULL,
google_address_text varchar(300) NOT NULL,
location_radius varchar(200) NOT NULL,
remote char(1) NULL,
job_type varchar(200) NOT NULL,
industry varchar(200) NULL,
industry varchar(200) NOT NULL,
require_cv char(1) NULL,
assessment_type varchar(200) NOT NULL,
include_assessment_criteria char(1) NOT NULL,
......
cmsWebApp/sql/oracle/AssessmentCriteriaTemplate.sql
......@@ -13,11 +13,11 @@ CREATE TABLE tl_assessment_template (
job_title varchar2(30) NOT NULL,
job_description clob NOT NULL,
ref_number varchar2(10) NULL,
google_address_text varchar2(300) NULL,
google_address_text varchar2(300) NOT NULL,
location_radius varchar2(200) NOT NULL,
remote char(1) NULL,
job_type varchar2(200) NOT NULL,
industry varchar2(200) NULL,
industry varchar2(200) NOT NULL,
require_cv char(1) NULL,
assessment_type varchar2(200) NOT NULL,
include_assessment_criteria char(1) NOT NULL,
......
cmsWebApp/sql/postgres/AssessmentCriteriaTemplate.sql
......@@ -13,11 +13,11 @@ CREATE TABLE tl_assessment_template (
job_title varchar(30) NOT NULL,
job_description text NOT NULL,
ref_number varchar(10) NULL,
google_address_text varchar(300) NULL,
google_address_text varchar(300) NOT NULL,
location_radius varchar(200) NOT NULL,
remote char(1) NULL,
job_type varchar(200) NOT NULL,
industry varchar(200) NULL,
industry varchar(200) NOT NULL,
require_cv char(1) NULL,
assessment_type varchar(200) NOT NULL,
include_assessment_criteria char(1) NOT NULL,
......
cmsWebApp/src/performa/orm/AssessmentCriteriaTemplate.xml
......@@ -16,11 +16,11 @@
<ATTRIB name="JobTitle" type="String" dbcol="job_title" length="30" mandatory="true"/>
<ATTRIB name="JobDescription" type="String" dbcol="job_description" mandatory="true"/>
<ATTRIB name="ReferenceNumber" type="String" dbcol="ref_number" length="10"/>
<ATTRIB name="GoogleAddressText" type="String" dbcol="google_address_text" length="300" />
<ATTRIB name="GoogleAddressText" type="String" dbcol="google_address_text" mandatory="true" length="300" />
<ATTRIB name="ExpectedCandidateRadius" type="LocationRadius" dbcol="location_radius" defaultValue="LocationRadius.KM100" attribHelper="EnumeratedAttributeHelper" mandatory="true"/>
<ATTRIB name="Remote" type="Boolean" dbcol="remote" defaultValue="Boolean.FALSE"/>
<ATTRIB name="JobType" type="JobType" dbcol="job_type" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="JobType.FULL_TIME"/>
<ATTRIB name="Industry" type="Industry" dbcol="industry" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="Industry" type="Industry" dbcol="industry" mandatory="true" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="RequireCV" type="Boolean" dbcol="require_cv" defaultValue="Boolean.FALSE"/>
<ATTRIB name="AssessmentType" type="AssessmentType" dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="AssessmentType.COMPREHENSIVE"/>
<ATTRIB name="IncludeAssessmentCriteria" type="Boolean" dbcol="include_assessment_criteria" mandatory="true" defaultValue="Boolean.TRUE"/>
......
cmsWebApp/src/performa/orm/BaseAssessmentCriteriaTemplate.java
......@@ -414,6 +414,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
metaInfo.put ("dbcol", "google_address_text");
metaInfo.put ("length", "300");
metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "GoogleAddressText");
metaInfo.put ("type", "String");
......@@ -494,6 +495,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
metaInfo.put ("dbcol", "industry");
metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "Industry");
metaInfo.put ("type", "Industry");
......@@ -1101,6 +1103,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
oldAndNewIdentical = HELPER_GoogleAddressText.compare (_GoogleAddressText, newGoogleAddressText);
}
BusinessObjectParser.assertFieldCondition (newGoogleAddressText != null, this, FIELD_GoogleAddressText, "mandatory");
if (FIELD_GoogleAddressText_Validators.length > 0)
......@@ -1495,6 +1498,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
oldAndNewIdentical = HELPER_Industry.compare (_Industry, newIndustry);
}
BusinessObjectParser.assertFieldCondition (newIndustry != null, this, FIELD_Industry, "mandatory");
if (FIELD_Industry_Validators.length > 0)
......@@ -4384,11 +4388,11 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
result.add(HELPER_JobTitle.getAttribObject (getClass (), _JobTitle, true, FIELD_JobTitle));
result.add(HELPER_JobDescription.getAttribObject (getClass (), _JobDescription, true, FIELD_JobDescription));
result.add(HELPER_ReferenceNumber.getAttribObject (getClass (), _ReferenceNumber, false, FIELD_ReferenceNumber));
result.add(HELPER_GoogleAddressText.getAttribObject (getClass (), _GoogleAddressText, false, FIELD_GoogleAddressText));
result.add(HELPER_GoogleAddressText.getAttribObject (getClass (), _GoogleAddressText, true, FIELD_GoogleAddressText));
result.add(HELPER_ExpectedCandidateRadius.getAttribObject (getClass (), _ExpectedCandidateRadius, true, FIELD_ExpectedCandidateRadius));
result.add(HELPER_Remote.getAttribObject (getClass (), _Remote, false, FIELD_Remote));
result.add(HELPER_JobType.getAttribObject (getClass (), _JobType, true, FIELD_JobType));
result.add(HELPER_Industry.getAttribObject (getClass (), _Industry, false, FIELD_Industry));
result.add(HELPER_Industry.getAttribObject (getClass (), _Industry, true, FIELD_Industry));
result.add(HELPER_RequireCV.getAttribObject (getClass (), _RequireCV, false, FIELD_RequireCV));
result.add(HELPER_AssessmentType.getAttribObject (getClass (), _AssessmentType, true, FIELD_AssessmentType));
result.add(HELPER_IncludeAssessmentCriteria.getAttribObject (getClass (), _IncludeAssessmentCriteria, true, FIELD_IncludeAssessmentCriteria));
......
cmsWebApp/webroot/extensions/adminportal/job_start_point.jsp
......@@ -27,8 +27,16 @@
job.setHiringTeam(hiringTeam);
job.setJobOwner(companyUser);
job.setIndustry(hiringTeam.getIndustry());
job.setGoogleAddressText(hiringTeam.getGoogleAddressText());
if(hiringTeam.getIndustry() != null)
{
job.setIndustry(hiringTeam.getIndustry());
}
if(hiringTeam.getGoogleAddressText() != null)
{
job.setGoogleAddressText(hiringTeam.getGoogleAddressText());
}
%>
<style>
.rectangle-4.special{
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
......@@ -17,7 +17,8 @@ Job.AssessmentTemplate = Template
CultureCriteria.Importance = Rate Importance
CultureCriteria.CultureElementRating = Rating
AssessmentCriteriaTemplate.TemplateName = Template Name
AssessmentCriteriaTemplate.TemplateName = Template Name
AssessmentCriteriaTemplate.GoogleAddressText = Google Location
CultureCriteriaTemplate.TemplateName = Template Name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment