Skip to content

P
PERFORMA_REPLICA
Commit 1c6c25b3 by Nilu
Options

S32578221 # Client - Incoming Issues (raised by Client) #Formatting of error

parent ec7973df
Showing with 43 additions and 39 deletions
cmsWebApp/sql/AssessmentCriteriaTemplate.xml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<column name="client_id" type="Long" length="11" nullable="true"/> <column name="client_id" type="Long" length="11" nullable="true"/>
<column name="hiring_team_id" type="Long" length="11" nullable="true"/> <column name="hiring_team_id" type="Long" length="11" nullable="true"/>
<column name="company_user_id" type="Long" length="11" nullable="true"/> <column name="company_user_id" type="Long" length="11" nullable="true"/>
<column name="job_title_id" type="Long" length="11" nullable="true"/> <column name="job_title_id" type="Long" length="11" nullable="false"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_assessment_template" indexName="idx_tl_assessment_template_TemplateID" isUnique="true"><column name="template_name"/><column name="hiring_team_id"/><column name="company_user_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_assessment_template" indexName="idx_tl_assessment_template_TemplateID" isUnique="true"><column name="template_name"/><column name="hiring_team_id"/><column name="company_user_id"/></NODE>
......
cmsWebApp/sql/Job.xml
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<column name="occupation_id" type="Long" length="11" nullable="false"/> <column name="occupation_id" type="Long" length="11" nullable="false"/>
<column name="shortened_url_id" type="Long" length="11" nullable="true"/> <column name="shortened_url_id" type="Long" length="11" nullable="true"/>
<column name="template_id" type="Long" length="11" nullable="true"/> <column name="template_id" type="Long" length="11" nullable="true"/>
<column name="job_title_id" type="Long" length="11" nullable="true"/> <column name="job_title_id" type="Long" length="11" nullable="false"/>
</NODE> </NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_job" indexName="idx_tl_job_client_id" isUnique="false"><column name="client_id"/></NODE> <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_job" indexName="idx_tl_job_client_id" isUnique="false"><column name="client_id"/></NODE>
......
cmsWebApp/sql/ms/AssessmentCriteriaTemplate.sql
...@@ -27,7 +27,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -27,7 +27,7 @@ CREATE TABLE tl_assessment_template (
client_id numeric(12) NULL, client_id numeric(12) NULL,
hiring_team_id numeric(12) NULL, hiring_team_id numeric(12) NULL,
company_user_id numeric(12) NULL, company_user_id numeric(12) NULL,
job_title_id numeric(12) NULL job_title_id numeric(12) NOT NULL
); );
......
cmsWebApp/sql/ms/Job.sql
...@@ -41,7 +41,7 @@ CREATE TABLE tl_job ( ...@@ -41,7 +41,7 @@ CREATE TABLE tl_job (
occupation_id numeric(12) NOT NULL, occupation_id numeric(12) NOT NULL,
shortened_url_id numeric(12) NULL, shortened_url_id numeric(12) NULL,
template_id numeric(12) NULL, template_id numeric(12) NULL,
job_title_id numeric(12) NULL job_title_id numeric(12) NOT NULL
); );
......
cmsWebApp/sql/oracle/AssessmentCriteriaTemplate.sql
...@@ -28,7 +28,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -28,7 +28,7 @@ CREATE TABLE tl_assessment_template (
client_id number(12) NULL, client_id number(12) NULL,
hiring_team_id number(12) NULL, hiring_team_id number(12) NULL,
company_user_id number(12) NULL, company_user_id number(12) NULL,
job_title_id number(12) NULL job_title_id number(12) NOT NULL
); );
......
cmsWebApp/sql/oracle/Job.sql
...@@ -42,7 +42,7 @@ CREATE TABLE tl_job ( ...@@ -42,7 +42,7 @@ CREATE TABLE tl_job (
occupation_id number(12) NOT NULL, occupation_id number(12) NOT NULL,
shortened_url_id number(12) NULL, shortened_url_id number(12) NULL,
template_id number(12) NULL, template_id number(12) NULL,
job_title_id number(12) NULL job_title_id number(12) NOT NULL
); );
......
cmsWebApp/sql/postgres/AssessmentCriteriaTemplate.sql
...@@ -28,7 +28,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -28,7 +28,7 @@ CREATE TABLE tl_assessment_template (
client_id numeric(12) NULL, client_id numeric(12) NULL,
hiring_team_id numeric(12) NULL, hiring_team_id numeric(12) NULL,
company_user_id numeric(12) NULL, company_user_id numeric(12) NULL,
job_title_id numeric(12) NULL job_title_id numeric(12) NOT NULL
); );
......
cmsWebApp/sql/postgres/Job.sql
...@@ -42,7 +42,7 @@ CREATE TABLE tl_job ( ...@@ -42,7 +42,7 @@ CREATE TABLE tl_job (
occupation_id numeric(12) NOT NULL, occupation_id numeric(12) NOT NULL,
shortened_url_id numeric(12) NULL, shortened_url_id numeric(12) NULL,
template_id numeric(12) NULL, template_id numeric(12) NULL,
job_title_id numeric(12) NULL job_title_id numeric(12) NOT NULL
); );
......
cmsWebApp/src/performa/form/ProcessCultureFP.java
...@@ -30,18 +30,11 @@ public class ProcessCultureFP extends SaveFP ...@@ -30,18 +30,11 @@ public class ProcessCultureFP extends SaveFP
HttpServletRequest request = submission.getRequest(); HttpServletRequest request = submission.getRequest();
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
boolean fromJobMatch = request.getAttribute("fromJobMatch") != null ? (boolean) request.getAttribute("fromJobMatch"): false;
boolean fromCulture = request.getAttribute("fromCulture") != null ? (boolean) request.getAttribute("fromCulture"): false; boolean fromCulture = request.getAttribute("fromCulture") != null ? (boolean) request.getAttribute("fromCulture"): false;
boolean fromAssessment = request.getAttribute("fromAssessment") != null ? (boolean) request.getAttribute("fromAssessment"): false; boolean fromAssessment = request.getAttribute("fromAssessment") != null ? (boolean) request.getAttribute("fromAssessment"): false;
Debug.assertion(job != null, "No job found . Call from " + getClass().getName()); Debug.assertion(job != null, "No job found . Call from " + getClass().getName());
if(fromJobMatch)
{
BusinessObjectParser.assertFieldCondition(job.getILOJobTitle() != null, job , Job.SINGLEREFERENCE_ILOJobTitle, "mandatory", exceptions, true, request);
}
if(fromCulture) if(fromCulture)
{ {
for(CultureCriteria criteria: job.getCultureCriteriasSet()) for(CultureCriteria criteria: job.getCultureCriteriasSet())
......
cmsWebApp/src/performa/form/SaveJobFP.java
...@@ -101,8 +101,6 @@ public class SaveJobFP extends SaveFP ...@@ -101,8 +101,6 @@ public class SaveJobFP extends SaveFP
// } // }
// } // }
BusinessObjectParser.assertFieldCondition(job.getILOJobTitle() != null , job, Job.SINGLEREFERENCE_ILOJobTitle, "mandatory", exceptions, true, request);
if(status != null && status == JobStatus.OPEN) if(status != null && status == JobStatus.OPEN)
{ {
BusinessObjectParser.assertFieldCondition(billingTeam.getCardID() != null , billingTeam, HiringTeam.FIELD_CardID, "mandatoryCardDetails", exceptions, true, request); BusinessObjectParser.assertFieldCondition(billingTeam.getCardID() != null , billingTeam, HiringTeam.FIELD_CardID, "mandatoryCardDetails", exceptions, true, request);
......
cmsWebApp/src/performa/orm/AssessmentCriteriaTemplate.xml
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<SINGLEREFERENCE name="Client" type="Client" dbcol="client_id" /> <SINGLEREFERENCE name="Client" type="Client" dbcol="client_id" />
<SINGLEREFERENCE name="HiringTeam" type="HiringTeam" dbcol="hiring_team_id" uniqueGroup="TemplateID"/> <SINGLEREFERENCE name="HiringTeam" type="HiringTeam" dbcol="hiring_team_id" uniqueGroup="TemplateID"/>
<SINGLEREFERENCE name="CompanyUser" type="CompanyUser" dbcol="company_user_id" uniqueGroup="TemplateID"/> <SINGLEREFERENCE name="CompanyUser" type="CompanyUser" dbcol="company_user_id" uniqueGroup="TemplateID"/>
<SINGLEREFERENCE name="ILOJobTitle" type="ILOJobTitle" dbcol="job_title_id" mandatory="false"/> <SINGLEREFERENCE name="ILOJobTitle" type="ILOJobTitle" dbcol="job_title_id" mandatory="true"/>
</TABLE> </TABLE>
......
cmsWebApp/src/performa/orm/BaseAssessmentCriteriaTemplate.java
...@@ -320,7 +320,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass ...@@ -320,7 +320,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "job_title_id"); metaInfo.put ("dbcol", "job_title_id");
metaInfo.put ("mandatory", "false"); metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "ILOJobTitle"); metaInfo.put ("name", "ILOJobTitle");
metaInfo.put ("type", "ILOJobTitle"); metaInfo.put ("type", "ILOJobTitle");
...@@ -2834,6 +2834,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass ...@@ -2834,6 +2834,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
*/ */
public void setILOJobTitle (ILOJobTitle newILOJobTitle) throws StorageException, FieldException public void setILOJobTitle (ILOJobTitle newILOJobTitle) throws StorageException, FieldException
{ {
BusinessObjectParser.assertFieldCondition (newILOJobTitle != null, this, SINGLEREFERENCE_ILOJobTitle, "mandatory");
if (_ILOJobTitle.wouldReferencedChange (newILOJobTitle)) if (_ILOJobTitle.wouldReferencedChange (newILOJobTitle))
...@@ -3508,6 +3509,8 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass ...@@ -3508,6 +3509,8 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
context.check (getOccupationID() != null, this, SINGLEREFERENCE_Occupation, "mandatory"); context.check (getOccupationID() != null, this, SINGLEREFERENCE_Occupation, "mandatory");
context.check (getILOJobTitleID() != null, this, SINGLEREFERENCE_ILOJobTitle, "mandatory");
} }
......
cmsWebApp/src/performa/orm/BaseJob.java
...@@ -562,6 +562,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -562,6 +562,7 @@ public abstract class BaseJob extends BaseBusinessClass
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "job_title_id"); metaInfo.put ("dbcol", "job_title_id");
metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "ILOJobTitle"); metaInfo.put ("name", "ILOJobTitle");
metaInfo.put ("type", "ILOJobTitle"); metaInfo.put ("type", "ILOJobTitle");
...@@ -6713,6 +6714,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -6713,6 +6714,7 @@ public abstract class BaseJob extends BaseBusinessClass
*/ */
public void setILOJobTitle (ILOJobTitle newILOJobTitle) throws StorageException, FieldException public void setILOJobTitle (ILOJobTitle newILOJobTitle) throws StorageException, FieldException
{ {
BusinessObjectParser.assertFieldCondition (newILOJobTitle != null, this, SINGLEREFERENCE_ILOJobTitle, "mandatory");
if (_ILOJobTitle.wouldReferencedChange (newILOJobTitle)) if (_ILOJobTitle.wouldReferencedChange (newILOJobTitle))
...@@ -7823,6 +7825,8 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -7823,6 +7825,8 @@ public abstract class BaseJob extends BaseBusinessClass
context.check (getOccupationID() != null, this, SINGLEREFERENCE_Occupation, "mandatory"); context.check (getOccupationID() != null, this, SINGLEREFERENCE_Occupation, "mandatory");
context.check (getILOJobTitleID() != null, this, SINGLEREFERENCE_ILOJobTitle, "mandatory");
} }
......
cmsWebApp/src/performa/orm/Job.java
...@@ -71,10 +71,23 @@ public class Job extends BaseJob ...@@ -71,10 +71,23 @@ public class Job extends BaseJob
{ {
setRandomKey(RandomStringGen.getRandomStringGen().generateAlphaNum(4)); setRandomKey(RandomStringGen.getRandomStringGen().generateAlphaNum(4));
//TODO: verify SecUser txUser = SecUser.getTXUser(getTransaction());
SecUser txUser = SecUser.getTXUser(getTransaction()); CompanyUser companyUser = txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
HiringTeam hiringTeam = companyUser.getSelectedTeam();
setCreatedBy(txUser.getExtension(CompanyUser.REFERENCE_CompanyUser)); setCreatedBy(companyUser);
setHiringTeam(hiringTeam);
setJobOwner(companyUser);
if(hiringTeam.getIndustry() != null)
{
setIndustry(hiringTeam.getIndustry());
}
if(hiringTeam.getGoogleAddressText() != null)
{
setGoogleAddressText(hiringTeam.getGoogleAddressText());
}
} }
......
cmsWebApp/src/performa/orm/Job.xml
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<SINGLEREFERENCE name="Occupation" type="Occupation" dbcol="occupation_id" mandatory="true"/> <SINGLEREFERENCE name="Occupation" type="Occupation" dbcol="occupation_id" mandatory="true"/>
<SINGLEREFERENCE name="ShortenedURL" type="ShortenedURL" dbcol="shortened_url_id" /> <SINGLEREFERENCE name="ShortenedURL" type="ShortenedURL" dbcol="shortened_url_id" />
<SINGLEREFERENCE name="AssessmentTemplate" type="AssessmentCriteriaTemplate" dbcol="template_id" /> <SINGLEREFERENCE name="AssessmentTemplate" type="AssessmentCriteriaTemplate" dbcol="template_id" />
<SINGLEREFERENCE name="ILOJobTitle" type="ILOJobTitle" dbcol="job_title_id" /> <SINGLEREFERENCE name="ILOJobTitle" type="ILOJobTitle" dbcol="job_title_id" mandatory="true"/>
</TABLE> </TABLE>
......
cmsWebApp/webroot/css/common.css
...@@ -5065,7 +5065,7 @@ span.right-img { ...@@ -5065,7 +5065,7 @@ span.right-img {
.success-message{background-color: #67b413;box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.15);} .success-message{background-color: #67b413;box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.15);}
/*.error-message{background-color: #f9513d;box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.15);}*/ /*.error-message{background-color: #f9513d;box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.15);}*/
.error-message { .error-message {
height: 109px; /*height: 109px;*/
border-radius: 2px; border-radius: 2px;
background-color: #F9623D; background-color: #F9623D;
box-shadow: 0 3px 5px 0 rgba(0,0,0,0.02); box-shadow: 0 3px 5px 0 rgba(0,0,0,0.02);
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
...@@ -151,7 +151,11 @@ ...@@ -151,7 +151,11 @@
$(this).val(''); $(this).val('');
} }
}); });
if($('input[type="text"][id$="Industry"]').next().val() === ""){
$('input[type="text"][id$="Industry"]').val('');
}
$('input[type="text"][id$="Industry"]').attr('placeholder','Please select an Industry'); $('input[type="text"][id$="Industry"]').attr('placeholder','Please select an Industry');
$('input[type="text"][id$="ILOJobTitle_autocomplete"]').attr('placeholder','Please select a Job Title'); $('input[type="text"][id$="ILOJobTitle_autocomplete"]').attr('placeholder','Please select a Job Title');
......
cmsWebApp/webroot/extensions/adminportal/job_start_point.jsp
...@@ -24,19 +24,6 @@ ...@@ -24,19 +24,6 @@
.andHiringTeam(new EqualsFilter<>(hiringTeam)) .andHiringTeam(new EqualsFilter<>(hiringTeam))
.search(transaction); .search(transaction);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB); String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB);
job.setHiringTeam(hiringTeam);
job.setJobOwner(companyUser);
if(hiringTeam.getIndustry() != null)
{
job.setIndustry(hiringTeam.getIndustry());
}
if(hiringTeam.getGoogleAddressText() != null)
{
job.setGoogleAddressText(hiringTeam.getGoogleAddressText());
}
%> %>
<style> <style>
.rectangle-4.special{ .rectangle-4.special{
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
...@@ -13,6 +13,8 @@ Job.JobTemplate = Job Template ...@@ -13,6 +13,8 @@ Job.JobTemplate = Job Template
Job.Occupation = Job Occupation Classification Job.Occupation = Job Occupation Classification
Job.ExpectedCandidateRadius = Expected Candidate Radius Job.ExpectedCandidateRadius = Expected Candidate Radius
Job.AssessmentTemplate = Template Job.AssessmentTemplate = Template
Job.GoogleAddressText = Google Location
Job.ILOJobTitle = ILO Standard Job Title
CultureCriteria.Importance = Rate Importance CultureCriteria.Importance = Rate Importance
CultureCriteria.CultureElementRating = Rating CultureCriteria.CultureElementRating = Rating
......
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