Skip to content

P
PERFORMA_REPLICA
Commit a1e4b9ae by Nilu
Options

job details screen and requirements screen (J001 and J002)

parent 131621b9
Showing with 1853 additions and 231 deletions
cmsWebApp/sql/Job.xml
......@@ -21,14 +21,20 @@
<column name="last_status_change_date" type="Date" nullable="true"/>
<column name="remote" type="Boolean" nullable="true"/>
<column name="city" type="String" nullable="true" length="100"/>
<column name="postcode" type="String" nullable="true" length="100"/>
<column name="location_radius" type="String" nullable="true" length="200"/>
<column name="state" type="String" nullable="true" length="200"/>
<column name="country" type="String" nullable="true" length="200"/>
<column name="require_cv" type="Boolean" nullable="true"/>
<column name="manually_closed" type="Boolean" nullable="true"/>
<column name="last_edited" type="Date" nullable="true"/>
<column name="is_ppj" type="Boolean" nullable="true"/>
<column name="industry" type="String" nullable="true" length="200"/>
<column name="level_id" type="Long" length="11" nullable="true"/>
<column name="client_id" type="Long" length="11" nullable="true"/>
<column name="job_owner_id" type="Long" length="11" nullable="true"/>
<column name="company_user_id" type="Long" length="11" nullable="true"/>
<column name="hiring_team_id" type="Long" length="11" nullable="true"/>
<column name="shortened_url_id" type="Long" length="11" nullable="true"/>
</NODE>
......
cmsWebApp/sql/ms/Job.sql
......@@ -21,14 +21,20 @@ CREATE TABLE tl_job (
last_status_change_date datetime NULL,
remote char(1) NULL,
city varchar(100) NULL,
postcode varchar(100) NULL,
location_radius varchar(200) NULL,
state varchar(200) NULL,
country varchar(200) NULL,
require_cv char(1) NULL,
manually_closed char(1) NULL,
last_edited datetime NULL,
is_ppj char(1) NULL,
industry varchar(200) NULL,
level_id numeric(12) NULL,
client_id numeric(12) NULL,
job_owner_id numeric(12) NULL,
company_user_id numeric(12) NULL,
hiring_team_id numeric(12) NULL,
shortened_url_id numeric(12) NULL
);
......
cmsWebApp/sql/oracle/Job.sql
......@@ -22,14 +22,20 @@ CREATE TABLE tl_job (
last_status_change_date date NULL,
remote char(1) NULL,
city varchar2(100) NULL,
postcode varchar2(100) NULL,
location_radius varchar2(200) NULL,
state varchar2(200) NULL,
country varchar2(200) NULL,
require_cv char(1) NULL,
manually_closed char(1) NULL,
last_edited date NULL,
is_ppj char(1) NULL,
industry varchar2(200) NULL,
level_id number(12) NULL,
client_id number(12) NULL,
job_owner_id number(12) NULL,
company_user_id number(12) NULL,
hiring_team_id number(12) NULL,
shortened_url_id number(12) NULL
);
......
cmsWebApp/sql/postgres/Job.sql
......@@ -22,14 +22,20 @@ CREATE TABLE tl_job (
last_status_change_date timestamp NULL,
remote char(1) NULL,
city varchar(100) NULL,
postcode varchar(100) NULL,
location_radius varchar(200) NULL,
state varchar(200) NULL,
country varchar(200) NULL,
require_cv char(1) NULL,
manually_closed char(1) NULL,
last_edited timestamp NULL,
is_ppj char(1) NULL,
industry varchar(200) NULL,
level_id numeric(12) NULL,
client_id numeric(12) NULL,
job_owner_id numeric(12) NULL,
company_user_id numeric(12) NULL,
hiring_team_id numeric(12) NULL,
shortened_url_id numeric(12) NULL
);
......
cmsWebApp/src/performa/orm/BaseJob.java
This source diff could not be displayed because it is too large. You can view the blob instead.
cmsWebApp/src/performa/orm/Company.xml
......@@ -8,6 +8,7 @@
<IMPORT value="performa.orm.types.TimeZone"/>
<IMPORT value="oneit.business.shopping.orm.*"/>
<MULTIPLEREFERENCE name="Users" type="CompanyUser" backreferenceName="Company" />
<MULTIPLEREFERENCE name="Clients" type="Client" backreferenceName="Company" />
<MULTIPLEREFERENCE name="HiringTeams" type="HiringTeam" backreferenceName="Company" />
......
cmsWebApp/src/performa/orm/HiringTeam.java
package performa.orm;
import java.util.Set;
import oneit.logging.LoggingArea;
import oneit.objstore.ValidationContext;
import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.utils.StringUtils;
import oneit.utils.filter.Filter;
public class HiringTeam extends BaseHiringTeam
......@@ -38,4 +41,13 @@ public class HiringTeam extends BaseHiringTeam
{
return StringUtils.subNulls(getHiringTeamName(), super.getToString());
}
public Set<CompanyUser> getActiveTeammates()
{
Filter<CompanyUser> filter = CompanyUser.SearchByAll()
.andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE))
.andIsDisabled(new EqualsFilter<>(Boolean.FALSE));
return CompanyUserHiringTeamLink.pipesCompanyUserHiringTeamLink(getUsersSet()).toCompanyUser(filter).uniqueVals();
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/Job.java
......@@ -58,7 +58,7 @@ public class Job extends BaseJob
//TODO: verify
SecUser txUser = SecUser.getTXUser(getTransaction());
setCompanyUser(txUser.getExtension(CompanyUser.REFERENCE_CompanyUser));
setCreatedBy(txUser.getExtension(CompanyUser.REFERENCE_CompanyUser));
}
......@@ -410,9 +410,9 @@ public class Job extends BaseJob
{
title.append(getClient()).append(" - ");
}
else if(getCompanyUser() != null && getCompanyUser().getCompany() != null)
else if(getCreatedBy() != null && getCreatedBy().getCompany() != null)
{
title.append(getCompanyUser().getCompany()).append(" - ");
title.append(getCreatedBy().getCompany()).append(" - ");
}
title.append(getJobTitle()).append(" ");
......@@ -472,7 +472,7 @@ public class Job extends BaseJob
public Boolean isClientAvailable()
{
return getClient() != null && getCompanyUser() != null && isTrue(getCompanyUser().getCompany().getHasClientSupport());
return getClient() != null && getCreatedBy() != null && isTrue(getCreatedBy().getCompany().getHasClientSupport());
}
......@@ -482,9 +482,9 @@ public class Job extends BaseJob
{
return getClient().getClientLogo();
}
else if(getCompanyUser() != null)
else if(getCreatedBy() != null)
{
return getCompanyUser().getCompany().getCompanyLogo();
return getCreatedBy().getCompany().getCompanyLogo();
}
return null;
......
cmsWebApp/src/performa/orm/Job.xml
......@@ -44,16 +44,22 @@
<ATTRIB name="LastStatusChangeDate" type="Date" dbcol="last_status_change_date"/>
<ATTRIB name="Remote" type="Boolean" dbcol="remote" defaultValue="Boolean.FALSE"/>
<ATTRIB name="City" type="String" dbcol="city" length="100"/>
<ATTRIB name="PostCode" type="String" dbcol="postcode" length="100"/>
<ATTRIB name="ExpectedCandidateRadius" type="LocationRadius" dbcol="location_radius" attribHelper="EnumeratedAttributeHelper" />
<ATTRIB name="State" type="State" dbcol="state" defaultValue="State.WA" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="Country" type="Countries" dbcol="country" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="RequireCV" type="Boolean" dbcol="require_cv" defaultValue="Boolean.FALSE"/>
<ATTRIB name="IsManuallyClosed" type="Boolean" dbcol="manually_closed" defaultValue="Boolean.FALSE"/>
<ATTRIB name="LastEdited" type="Date" dbcol="last_edited" />
<ATTRIB name="IsPPJ" type="Boolean" dbcol="is_ppj" defaultValue="Boolean.FALSE"/>
<ATTRIB name="Industry" type="Industry" dbcol="industry" attribHelper="EnumeratedAttributeHelper"/>
<SINGLEREFERENCE name="Level" type="Level" dbcol="level_id" mandatory="false"/>
<SINGLEREFERENCE name="Client" type="Client" dbcol="client_id" backreferenceName="Jobs"/>
<SINGLEREFERENCE name="CompanyUser" type="CompanyUser" dbcol="company_user_id" />
<SINGLEREFERENCE name="ShortenedURL" type="ShortenedURL" dbcol="shortened_url_id" />
<SINGLEREFERENCE name="JobOwner" type="CompanyUser" dbcol="job_owner_id" />
<SINGLEREFERENCE name="CreatedBy" type="CompanyUser" dbcol="company_user_id" />
<SINGLEREFERENCE name="HiringTeam" type="HiringTeam" dbcol="hiring_team_id" />
<SINGLEREFERENCE name="ShortenedURL" type="ShortenedURL" dbcol="shortened_url_id" />
</TABLE>
......
cmsWebApp/src/performa/orm/JobPersistenceMgr.java
......@@ -42,11 +42,15 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
private Date dummyLastStatusChangeDate;
private Boolean dummyRemote;
private String dummyCity;
private String dummyPostCode;
private LocationRadius dummyExpectedCandidateRadius;
private State dummyState;
private Countries dummyCountry;
private Boolean dummyRequireCV;
private Boolean dummyIsManuallyClosed;
private Date dummyLastEdited;
private Boolean dummyIsPPJ;
private Industry dummyIndustry;
// Static constants corresponding to attribute helpers
......@@ -63,11 +67,15 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
private static final DefaultAttributeHelper HELPER_LastStatusChangeDate = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_Remote = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_City = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_PostCode = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper HELPER_ExpectedCandidateRadius = new EnumeratedAttributeHelper (LocationRadius.FACTORY_LocationRadius);
private static final EnumeratedAttributeHelper HELPER_State = new EnumeratedAttributeHelper (State.FACTORY_State);
private static final EnumeratedAttributeHelper HELPER_Country = new EnumeratedAttributeHelper (Countries.FACTORY_Countries);
private static final DefaultAttributeHelper HELPER_RequireCV = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_IsManuallyClosed = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_LastEdited = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_IsPPJ = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper HELPER_Industry = new EnumeratedAttributeHelper (Industry.FACTORY_Industry);
......@@ -87,15 +95,19 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
dummyLastStatusChangeDate = (Date)(HELPER_LastStatusChangeDate.initialise (dummyLastStatusChangeDate));
dummyRemote = (Boolean)(HELPER_Remote.initialise (dummyRemote));
dummyCity = (String)(HELPER_City.initialise (dummyCity));
dummyPostCode = (String)(HELPER_PostCode.initialise (dummyPostCode));
dummyExpectedCandidateRadius = (LocationRadius)(HELPER_ExpectedCandidateRadius.initialise (dummyExpectedCandidateRadius));
dummyState = (State)(HELPER_State.initialise (dummyState));
dummyCountry = (Countries)(HELPER_Country.initialise (dummyCountry));
dummyRequireCV = (Boolean)(HELPER_RequireCV.initialise (dummyRequireCV));
dummyIsManuallyClosed = (Boolean)(HELPER_IsManuallyClosed.initialise (dummyIsManuallyClosed));
dummyLastEdited = (Date)(HELPER_LastEdited.initialise (dummyLastEdited));
dummyIsPPJ = (Boolean)(HELPER_IsPPJ.initialise (dummyIsPPJ));
dummyIndustry = (Industry)(HELPER_Industry.initialise (dummyIndustry));
}
private String SELECT_COLUMNS = "{PREFIX}tl_job.object_id as id, {PREFIX}tl_job.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_job.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_job.job_title, {PREFIX}tl_job.job_description, {PREFIX}tl_job.job_status, {PREFIX}tl_job.open_date, {PREFIX}tl_job.apply_by, {PREFIX}tl_job.include_assessment_criteria, {PREFIX}tl_job.assessment_type, {PREFIX}tl_job.random_key, {PREFIX}tl_job.job_type, {PREFIX}tl_job.ref_number, {PREFIX}tl_job.last_status_change_date, {PREFIX}tl_job.remote, {PREFIX}tl_job.city, {PREFIX}tl_job.state, {PREFIX}tl_job.country, {PREFIX}tl_job.manually_closed, {PREFIX}tl_job.last_edited, {PREFIX}tl_job.is_ppj, {PREFIX}tl_job.level_id, {PREFIX}tl_job.client_id, {PREFIX}tl_job.company_user_id, {PREFIX}tl_job.shortened_url_id, 1 AS commasafe ";
private String SELECT_COLUMNS = "{PREFIX}tl_job.object_id as id, {PREFIX}tl_job.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_job.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_job.job_title, {PREFIX}tl_job.job_description, {PREFIX}tl_job.job_status, {PREFIX}tl_job.open_date, {PREFIX}tl_job.apply_by, {PREFIX}tl_job.include_assessment_criteria, {PREFIX}tl_job.assessment_type, {PREFIX}tl_job.random_key, {PREFIX}tl_job.job_type, {PREFIX}tl_job.ref_number, {PREFIX}tl_job.last_status_change_date, {PREFIX}tl_job.remote, {PREFIX}tl_job.city, {PREFIX}tl_job.postcode, {PREFIX}tl_job.location_radius, {PREFIX}tl_job.state, {PREFIX}tl_job.country, {PREFIX}tl_job.require_cv, {PREFIX}tl_job.manually_closed, {PREFIX}tl_job.last_edited, {PREFIX}tl_job.is_ppj, {PREFIX}tl_job.industry, {PREFIX}tl_job.level_id, {PREFIX}tl_job.client_id, {PREFIX}tl_job.job_owner_id, {PREFIX}tl_job.company_user_id, {PREFIX}tl_job.hiring_team_id, {PREFIX}tl_job.shortened_url_id, 1 AS commasafe ";
private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
......@@ -159,14 +171,20 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
!tl_jobPSet.containsAttrib(Job.FIELD_LastStatusChangeDate)||
!tl_jobPSet.containsAttrib(Job.FIELD_Remote)||
!tl_jobPSet.containsAttrib(Job.FIELD_City)||
!tl_jobPSet.containsAttrib(Job.FIELD_PostCode)||
!tl_jobPSet.containsAttrib(Job.FIELD_ExpectedCandidateRadius)||
!tl_jobPSet.containsAttrib(Job.FIELD_State)||
!tl_jobPSet.containsAttrib(Job.FIELD_Country)||
!tl_jobPSet.containsAttrib(Job.FIELD_RequireCV)||
!tl_jobPSet.containsAttrib(Job.FIELD_IsManuallyClosed)||
!tl_jobPSet.containsAttrib(Job.FIELD_LastEdited)||
!tl_jobPSet.containsAttrib(Job.FIELD_IsPPJ)||
!tl_jobPSet.containsAttrib(Job.FIELD_Industry)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_Level)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_Client)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_CompanyUser)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_JobOwner)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_CreatedBy)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_HiringTeam)||
!tl_jobPSet.containsAttrib(Job.SINGLEREFERENCE_ShortenedURL))
{
// We will need to retrieve it
......@@ -247,10 +265,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
{
int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}tl_job " +
"SET job_title = ?, job_description = ?, job_status = ?, open_date = ?, apply_by = ?, include_assessment_criteria = ?, assessment_type = ?, random_key = ?, job_type = ?, ref_number = ?, last_status_change_date = ?, remote = ?, city = ?, state = ?, country = ?, manually_closed = ?, last_edited = ?, is_ppj = ?, level_id = ? , client_id = ? , company_user_id = ? , shortened_url_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"SET job_title = ?, job_description = ?, job_status = ?, open_date = ?, apply_by = ?, include_assessment_criteria = ?, assessment_type = ?, random_key = ?, job_type = ?, ref_number = ?, last_status_change_date = ?, remote = ?, city = ?, postcode = ?, location_radius = ?, state = ?, country = ?, require_cv = ?, manually_closed = ?, last_edited = ?, is_ppj = ?, industry = ?, level_id = ? , client_id = ? , job_owner_id = ? , company_user_id = ? , hiring_team_id = ? , shortened_url_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE tl_job.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_OpenDate.getForSQL(dummyOpenDate, tl_jobPSet.getAttrib (Job.FIELD_OpenDate))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (HELPER_ReferenceNumber.getForSQL(dummyReferenceNumber, tl_jobPSet.getAttrib (Job.FIELD_ReferenceNumber))).listEntry (HELPER_LastStatusChangeDate.getForSQL(dummyLastStatusChangeDate, tl_jobPSet.getAttrib (Job.FIELD_LastStatusChangeDate))).listEntry (HELPER_Remote.getForSQL(dummyRemote, tl_jobPSet.getAttrib (Job.FIELD_Remote))).listEntry (HELPER_City.getForSQL(dummyCity, tl_jobPSet.getAttrib (Job.FIELD_City))).listEntry (HELPER_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_jobPSet.getAttrib (Job.FIELD_IsPPJ))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Client)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_CompanyUser)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_OpenDate.getForSQL(dummyOpenDate, tl_jobPSet.getAttrib (Job.FIELD_OpenDate))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (HELPER_ReferenceNumber.getForSQL(dummyReferenceNumber, tl_jobPSet.getAttrib (Job.FIELD_ReferenceNumber))).listEntry (HELPER_LastStatusChangeDate.getForSQL(dummyLastStatusChangeDate, tl_jobPSet.getAttrib (Job.FIELD_LastStatusChangeDate))).listEntry (HELPER_Remote.getForSQL(dummyRemote, tl_jobPSet.getAttrib (Job.FIELD_Remote))).listEntry (HELPER_City.getForSQL(dummyCity, tl_jobPSet.getAttrib (Job.FIELD_City))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_jobPSet.getAttrib (Job.FIELD_PostCode))).listEntry (HELPER_ExpectedCandidateRadius.getForSQL(dummyExpectedCandidateRadius, tl_jobPSet.getAttrib (Job.FIELD_ExpectedCandidateRadius))).listEntry (HELPER_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_RequireCV.getForSQL(dummyRequireCV, tl_jobPSet.getAttrib (Job.FIELD_RequireCV))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_jobPSet.getAttrib (Job.FIELD_IsPPJ))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_jobPSet.getAttrib (Job.FIELD_Industry))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Client)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_JobOwner)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_CreatedBy)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1)
{
......@@ -629,15 +647,21 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
tl_jobPSet.setAttrib(Job.FIELD_LastStatusChangeDate, HELPER_LastStatusChangeDate.getFromRS(dummyLastStatusChangeDate, r, "last_status_change_date"));
tl_jobPSet.setAttrib(Job.FIELD_Remote, HELPER_Remote.getFromRS(dummyRemote, r, "remote"));
tl_jobPSet.setAttrib(Job.FIELD_City, HELPER_City.getFromRS(dummyCity, r, "city"));
tl_jobPSet.setAttrib(Job.FIELD_PostCode, HELPER_PostCode.getFromRS(dummyPostCode, r, "postcode"));
tl_jobPSet.setAttrib(Job.FIELD_ExpectedCandidateRadius, HELPER_ExpectedCandidateRadius.getFromRS(dummyExpectedCandidateRadius, r, "location_radius"));
tl_jobPSet.setAttrib(Job.FIELD_State, HELPER_State.getFromRS(dummyState, r, "state"));
tl_jobPSet.setAttrib(Job.FIELD_Country, HELPER_Country.getFromRS(dummyCountry, r, "country"));
tl_jobPSet.setAttrib(Job.FIELD_RequireCV, HELPER_RequireCV.getFromRS(dummyRequireCV, r, "require_cv"));
tl_jobPSet.setAttrib(Job.FIELD_IsManuallyClosed, HELPER_IsManuallyClosed.getFromRS(dummyIsManuallyClosed, r, "manually_closed"));
tl_jobPSet.setAttrib(Job.FIELD_LastEdited, HELPER_LastEdited.getFromRS(dummyLastEdited, r, "last_edited"));
tl_jobPSet.setAttrib(Job.FIELD_IsPPJ, HELPER_IsPPJ.getFromRS(dummyIsPPJ, r, "is_ppj"));
tl_jobPSet.setAttrib(Job.FIELD_Industry, HELPER_Industry.getFromRS(dummyIndustry, r, "industry"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_Level, r.getObject ("level_id"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_Client, r.getObject ("client_id"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_CompanyUser, r.getObject ("company_user_id"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_JobOwner, r.getObject ("job_owner_id"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_CreatedBy, r.getObject ("company_user_id"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_HiringTeam, r.getObject ("hiring_team_id"));
tl_jobPSet.setAttrib(Job.SINGLEREFERENCE_ShortenedURL, r.getObject ("shortened_url_id"));
}
......@@ -655,10 +679,10 @@ public class JobPersistenceMgr extends ObjectPersistenceMgr
{
executeStatement (sqlMgr,
"INSERT INTO {PREFIX}tl_job " +
" (job_title, job_description, job_status, open_date, apply_by, include_assessment_criteria, assessment_type, random_key, job_type, ref_number, last_status_change_date, remote, city, state, country, manually_closed, last_edited, is_ppj, level_id, client_id, company_user_id, shortened_url_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
" (job_title, job_description, job_status, open_date, apply_by, include_assessment_criteria, assessment_type, random_key, job_type, ref_number, last_status_change_date, remote, city, postcode, location_radius, state, country, require_cv, manually_closed, last_edited, is_ppj, industry, level_id, client_id, job_owner_id, company_user_id, hiring_team_id, shortened_url_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_OpenDate.getForSQL(dummyOpenDate, tl_jobPSet.getAttrib (Job.FIELD_OpenDate))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (HELPER_ReferenceNumber.getForSQL(dummyReferenceNumber, tl_jobPSet.getAttrib (Job.FIELD_ReferenceNumber))).listEntry (HELPER_LastStatusChangeDate.getForSQL(dummyLastStatusChangeDate, tl_jobPSet.getAttrib (Job.FIELD_LastStatusChangeDate))).listEntry (HELPER_Remote.getForSQL(dummyRemote, tl_jobPSet.getAttrib (Job.FIELD_Remote))).listEntry (HELPER_City.getForSQL(dummyCity, tl_jobPSet.getAttrib (Job.FIELD_City))).listEntry (HELPER_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_jobPSet.getAttrib (Job.FIELD_IsPPJ))) .listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Client)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_CompanyUser)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))) .listEntry (objectID.longID ()).toList().toArray());
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_JobTitle.getForSQL(dummyJobTitle, tl_jobPSet.getAttrib (Job.FIELD_JobTitle))).listEntry (HELPER_JobDescription.getForSQL(dummyJobDescription, tl_jobPSet.getAttrib (Job.FIELD_JobDescription))).listEntry (HELPER_JobStatus.getForSQL(dummyJobStatus, tl_jobPSet.getAttrib (Job.FIELD_JobStatus))).listEntry (HELPER_OpenDate.getForSQL(dummyOpenDate, tl_jobPSet.getAttrib (Job.FIELD_OpenDate))).listEntry (HELPER_ApplyBy.getForSQL(dummyApplyBy, tl_jobPSet.getAttrib (Job.FIELD_ApplyBy))).listEntry (HELPER_IncludeAssessmentCriteria.getForSQL(dummyIncludeAssessmentCriteria, tl_jobPSet.getAttrib (Job.FIELD_IncludeAssessmentCriteria))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_jobPSet.getAttrib (Job.FIELD_AssessmentType))).listEntry (HELPER_RandomKey.getForSQL(dummyRandomKey, tl_jobPSet.getAttrib (Job.FIELD_RandomKey))).listEntry (HELPER_JobType.getForSQL(dummyJobType, tl_jobPSet.getAttrib (Job.FIELD_JobType))).listEntry (HELPER_ReferenceNumber.getForSQL(dummyReferenceNumber, tl_jobPSet.getAttrib (Job.FIELD_ReferenceNumber))).listEntry (HELPER_LastStatusChangeDate.getForSQL(dummyLastStatusChangeDate, tl_jobPSet.getAttrib (Job.FIELD_LastStatusChangeDate))).listEntry (HELPER_Remote.getForSQL(dummyRemote, tl_jobPSet.getAttrib (Job.FIELD_Remote))).listEntry (HELPER_City.getForSQL(dummyCity, tl_jobPSet.getAttrib (Job.FIELD_City))).listEntry (HELPER_PostCode.getForSQL(dummyPostCode, tl_jobPSet.getAttrib (Job.FIELD_PostCode))).listEntry (HELPER_ExpectedCandidateRadius.getForSQL(dummyExpectedCandidateRadius, tl_jobPSet.getAttrib (Job.FIELD_ExpectedCandidateRadius))).listEntry (HELPER_State.getForSQL(dummyState, tl_jobPSet.getAttrib (Job.FIELD_State))).listEntry (HELPER_Country.getForSQL(dummyCountry, tl_jobPSet.getAttrib (Job.FIELD_Country))).listEntry (HELPER_RequireCV.getForSQL(dummyRequireCV, tl_jobPSet.getAttrib (Job.FIELD_RequireCV))).listEntry (HELPER_IsManuallyClosed.getForSQL(dummyIsManuallyClosed, tl_jobPSet.getAttrib (Job.FIELD_IsManuallyClosed))).listEntry (HELPER_LastEdited.getForSQL(dummyLastEdited, tl_jobPSet.getAttrib (Job.FIELD_LastEdited))).listEntry (HELPER_IsPPJ.getForSQL(dummyIsPPJ, tl_jobPSet.getAttrib (Job.FIELD_IsPPJ))).listEntry (HELPER_Industry.getForSQL(dummyIndustry, tl_jobPSet.getAttrib (Job.FIELD_Industry))) .listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_Client)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_JobOwner)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_CreatedBy)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_HiringTeam)))).listEntry (SQLManager.CheckNull((Long)(tl_jobPSet.getAttrib (Job.SINGLEREFERENCE_ShortenedURL)))) .listEntry (objectID.longID ()).toList().toArray());
tl_jobPSet.setStatus (PersistentSetStatus.PROCESSED);
}
......
cmsWebApp/src/performa/orm/types/CultureClass.java
......@@ -35,10 +35,17 @@ public class CultureClass extends AbstractEnumerated
return allCultureClasss;
}
private transient String ClassDescription;
private CultureClass (String name, String value, String description, boolean disabled)
{
super (name, value, description, disabled);
}
public String getClassDescription()
{
return ClassDescription;
}
public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allCultureClasss);
......@@ -107,6 +114,9 @@ public class CultureClass extends AbstractEnumerated
public static void defineAdditionalData ()
{
BELONGING.ClassDescription = "Belonging is a sense of fitting in or feeling like you are an important member of a group. A tight-knit organisation gives each of its members a strong sense of belonging.";
CLIMATE.ClassDescription = "The prevailing conditions and general culture of the organisation.";
PERFORMANCE.ClassDescription = "The extent to which there is emphasis within the organisation on performance via outcomes and productivity.";
}
......@@ -134,6 +144,7 @@ public class CultureClass extends AbstractEnumerated
{
Map attribs = new HashMap ();
attribs.put ("ClassDescription", ArrayFormatter.toObject(getClassDescription()));
return attribs;
}
......
cmsWebApp/src/performa/orm/types/CultureClass.xml
......@@ -3,9 +3,11 @@
<ROOT>
<CONSTANT package="performa.orm.types" name="CultureClass">
<VALUE name="BELONGING" description="Belonging" />
<VALUE name="CLIMATE" description="Climate" />
<VALUE name="PERFORMANCE" description="Performance"/>
<DATA name="ClassDescription" type="String"/>
<VALUE name="BELONGING" description="Belonging" ClassDescription='"Belonging is a sense of fitting in or feeling like you are an important member of a group. A tight-knit organisation gives each of its members a strong sense of belonging."'/>
<VALUE name="CLIMATE" description="Climate" ClassDescription='"The prevailing conditions and general culture of the organisation."'/>
<VALUE name="PERFORMANCE" description="Performance" ClassDescription='"The extent to which there is emphasis within the organisation on performance via outcomes and productivity."'/>
</CONSTANT>
</ROOT>
\ No newline at end of file
cmsWebApp/src/performa/orm/types/LocationRadius.java 0 → 100644
package performa.orm.types;
import java.util.*;
import oneit.utils.*;
/**
* This class was generated using constGen.bat.
* DO NOT MODIFY THIS CODE.
* Edit the associated .xml file, and regenerate this file
* constGen (directory) (file minus extension)
* e.g. constGen C:\...\sql FieldType
*/
public class LocationRadius extends AbstractEnumerated
{
public static final EnumeratedFactory FACTORY_LocationRadius = new LocationRadiusFactory();
public static final LocationRadius KM100 = new LocationRadius ("KM100", "KM100", "100 km", false);
private static final LocationRadius[] allLocationRadiuss =
new LocationRadius[] { KM100};
private static LocationRadius[] getAllLocationRadiuss ()
{
return allLocationRadiuss;
}
private LocationRadius (String name, String value, String description, boolean disabled)
{
super (name, value, description, disabled);
}
public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allLocationRadiuss);
static
{
defineAdditionalData ();
}
public boolean isEqual (LocationRadius other)
{
return this.name.equals (other.name);
}
public Enumeration getAllInstances ()
{
return LocationRadius.getAll ();
}
private Object readResolve() throws java.io.ObjectStreamException
{
return LocationRadius.forName (this.name);
}
public EnumeratedFactory getFactory ()
{
return FACTORY_LocationRadius;
}
public static LocationRadius forName (String name)
{
if (name == null) { return null; }
LocationRadius[] all = getAllLocationRadiuss();
int enumIndex = AbstractEnumerated.getIndexForName (all, name);
return all[enumIndex];
}
public static LocationRadius forValue (String value)
{
if (value == null) { return null; }
LocationRadius[] all = getAllLocationRadiuss();
int enumIndex = AbstractEnumerated.getIndexForValue (getAllLocationRadiuss (), value);
return all[enumIndex];
}
public static java.util.Enumeration getAll ()
{
return AbstractEnumerated.getAll (getAllLocationRadiuss());
}
public static LocationRadius[] getLocationRadiusArray ()
{
return (LocationRadius[])getAllLocationRadiuss().clone ();
}
public static void defineAdditionalData ()
{
}
static class LocationRadiusFactory implements EnumeratedFactory
{
public AbstractEnumerated getForName (String name)
{
return LocationRadius.forName (name);
}
public AbstractEnumerated getForValue (String name)
{
return LocationRadius.forValue (name);
}
public Enumeration getAll ()
{
return LocationRadius.getAll ();
}
}
public Map getAdditionalAttributes ()
{
Map attribs = new HashMap ();
return attribs;
}
}
cmsWebApp/src/performa/orm/types/LocationRadius.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<ROOT>
<CONSTANT package="performa.orm.types" name="LocationRadius">
<VALUE name="KM100" value="KM100" description="100 km"/>
</CONSTANT>
</ROOT>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
......@@ -7,7 +7,8 @@
<%
Job job = (Job) process.getAttribute("Job");
String samePage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
// String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String jobPage = WebUtils.getSamePageInRenderMode(request, "Page");
Debug.assertion(job != null, "Job is null in admin portal create job");
......@@ -68,7 +69,7 @@
<h1 class="page-title">Create a job</h1>
<oneit:dynInclude page="/extensions/adminportal/inc/job_main_tabs.jsp" PageNumber="4" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<oneit:dynInclude page="/extensions/adminportal/inc/job_main_tabs.jsp" PageNumber="2" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
job.setCompletedRequirements(Boolean.TRUE);
......@@ -189,7 +190,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/>
<oneit:button value="Review Details" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
<oneit:button value="Proceed to Culture" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" />
......
cmsWebApp/webroot/extensions/adminportal/billing.jsp
......@@ -18,7 +18,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/card_payment.jsp
......@@ -18,7 +18,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/edit_card.jsp
......@@ -17,7 +17,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/edit_card_payment.jsp
......@@ -18,7 +18,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
......@@ -27,7 +27,7 @@
<script>
$(document).ready(function()
{
recalcFunction = setupRecalc ($("editClient"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#editClient"), {'recalcOnError':true});
$("#upload").change(function(){
readURL(this);
......
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
......@@ -40,8 +40,14 @@
<label><oneit:label GUIName="Job Type" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="JobType" cssClass="form-control"/>
</div>
<div class="optional-title">OPTIONAL</div>
<!--<div class="optional-title">OPTIONAL</div>-->
<div class="row">
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:label GUIName="Client"/></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/>
</div>
</div>
<%
SecUser txUser = SecUser.getTXUser(process.getTransaction());
CompanyUser companyUser = txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
......
cmsWebApp/webroot/extensions/adminportal/forgot_password.jsp
......@@ -10,7 +10,7 @@
<script type="text/javascript">
$(document).ready(function() {
recalcFunction = setupRecalc ($("forgotPassword"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#forgotPassword"), {'recalcOnError':true});
$('input[type="text"]').keyup(function() {
$(this).change();
......
cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp
......@@ -8,12 +8,12 @@
Job job = (Job) process.getAttribute("Job");
String pageNumber = (String) getData(request, "PageNumber");
String firstPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB);
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String fourthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String fifthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
boolean savedJob = job.getStatus() != ObjectStatus.NEW;
boolean fromJobMatch = pageNumber == "2";
boolean fromJobMatch = pageNumber == "1";
%>
<oneit:dynIncluded>
......@@ -30,14 +30,14 @@
Job Detail
</oneit:button>
</li>
<li class="<%= pageNumber == "2" ? "active" : CollectionUtils.equals(job.getCompletedAssessmentType(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<li class="<%= pageNumber == "2" ? "active" : CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="processCulture" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.mapEntry("fromJobMatch", fromJobMatch)
.toMap() %>">
<span><%= CollectionUtils.equals(job.getCompletedAssessmentType(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Role
<span><%= CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Requirements
</oneit:button>
</li>
<li class="<%= pageNumber == "3" ? "active" : CollectionUtils.equals(job.getCompletedCulture(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
......@@ -50,16 +50,6 @@
Culture
</oneit:button>
</li>
<li class="<%= pageNumber == "4" ? "active" : CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="processCulture" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.mapEntry("fromJobMatch", fromJobMatch)
.toMap() %>">
<span><%= CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span>
Requirements
</oneit:button>
</li>
<li class="<%= pageNumber == "5" ? "active" : ""%>">
<oneit:button value=" " name="processCulture" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fifthPage)
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
......@@ -17,12 +17,20 @@
%><%@include file="/saferedirect.jsp" %><%
}
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);
SecUser txUser = SecUser.getTXUser(process.getTransaction());
CompanyUser companyUser = txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
Job[] jobs = Job.SearchByCompany().byCompany(companyUser.getCompany()).search(transaction);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
job.setHiringTeam(companyUser.getSelectedTeam());
job.setJobOwner(companyUser);
%>
<script type="text/javascript">
$(document).ready(function()
{
setupRecalc ($("form#editJob"), {'recalcOnError':true});
$("select[name$='JobTemplate']").change(function()
{
$("button[name$='loadJobFromTemplate']").click();
......@@ -30,7 +38,6 @@
});
</script>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
<div class="container-fluid">
......@@ -47,10 +54,6 @@
<div class="form-page-area">
<div class="create-job">
<%
SecUser txUser = SecUser.getTXUser(process.getTransaction());
CompanyUser companyUser = txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
Job[] jobs = Job.SearchByCompany().byCompany(companyUser.getCompany()).search(transaction);
if(jobs.length > 0)
{
%>
......@@ -66,49 +69,210 @@
<%
}
%>
<div class="form-group">
<label><oneit:label GUIName="Job Title" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="JobTitle" cssClass="form-control" />
<div class="form-group row">
<div class="col-md-8">
<label><oneit:label GUIName="Job Title" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="JobTitle" cssClass="form-control" />
</div>
<div class="col-md-4">
<label><oneit:label GUIName="Reference Number" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="ReferenceNumber" cssClass="form-control" />
</div>
</div>
<div class="form-group">
<label><oneit:label GUIName="Job Description" /></label>
<oneit:ormtextarea obj="<%= job %>" attributeName="JobDescription" cssClass="form-control textarea-box"/>
<div class="form-group row">
<div class="col-md-12">
<label><oneit:label GUIName="About the Job" /></label>
<oneit:ormtextarea obj="<%= job %>" attributeName="JobDescription" cssClass="form-control textarea-box"/>
</div>
</div>
<div class="form-group">
<label><oneit:label GUIName="Job Type" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="JobType" cssClass="form-control"/>
<div class="form-group row">
<div class="col-md-6">
<label><oneit:label GUIName="Job Owner"/></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="JobOwner" options="<%= job.getHiringTeam().getActiveTeammates().toArray(new CompanyUser[0]) %>"/>
</div>
</div>
<%
if(job.getHiringTeam().showHasClientSupport())
{
%>
<div class="col-sm-6 col-xs-12">
<label><oneit:label GUIName="Client "/><span>(Optional)</span></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/>
</div>
</div>
<%
}
%>
</div>
<div class="form-brack-line"></div>
<div class="">
<div class="optional-title">OPTIONAL</div>
<div class="row">
<div class="form-group row">
<div class="col-md-12">
<label class="label-16">Job Location</label>
</div>
</div>
<div class="form-group row">
<div class="col-md-6">
<label><oneit:ormlabel obj="<%= job %>" field="Country" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="Country" cssClass="form-control"/>
</div>
<div class="col-md-6">
<label><oneit:label GUIName="State or Province"/></label>
<oneit:ormEnum obj="<%= job %>" attributeName="State" cssClass="form-control"/>
</div>
</div>
<div class="form-group row">
<div class="col-md-4">
<label><oneit:label GUIName="City or Town"/></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="City" cssClass="form-control" />
</div>
<div class="col-md-4">
<label><oneit:label GUIName="Zip / Post Code"/></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="PostCode" cssClass="form-control" />
</div>
<div class="col-md-4">
<label><oneit:label GUIName="Expected Candidate Radius"/></label>
<oneit:ormEnum obj="<%= job %>" attributeName="ExpectedCandidateRadius" cssClass="form-control"/>
</div>
</div>
<div class="form-group row">
<div class="col-md-4">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="is-remote" attributeName="Remote" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.getRemote() != null && job.getRemote() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="is-remote">
<oneit:label GUIName="Working remotely is an option" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
</div>
<div class="form-brack-line"></div>
<div class="form-group row">
<div class="col-md-12">
<label><oneit:label GUIName="Job Type" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="JobType" cssClass="form-control"/>
</div>
</div>
<div class="form-group row">
<div class="col-md-6">
<label><oneit:label GUIName="Industry Classification" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="Industry" cssClass="form-control"/>
</div>
<div class="col-md-6">
<label><oneit:label GUIName="Job Occupation Classification" /></label>
</div>
</div>
<div class="form-group row">
<div class="col-md-12">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="require-cv" attributeName="RequireCV" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.getRequireCV() != null && job.getRequireCV() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="require-cv">
<oneit:label GUIName="Require CV and Cover Letter from Candidate" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
</div>
<div class="form-group row">
<div class="col-md-12">
<label class="label-16">Select your assessment type</label>
</div>
</div>
<%
FormTag jobForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = jobForm.getFormBuilder();
String assessmentTypeKey = WebUtils.getInputKey(request, job, Job.FIELD_AssessmentType);
String assessmentTypeValue = formBuilder.fieldValue (assessmentTypeKey, job.getAssessmentType() == null ? "" : job.getAssessmentType().getName());
for(AssessmentType assessmentType : AssessmentType.getAssessmentTypeArray())
{
String assessmentTypeId = assessmentType.getName();
String selectedStr = CollectionUtils.equals(assessmentTypeValue, assessmentTypeId) ? "checked" : "";
String levelKey = WebUtils.getRadioSingleAssocKey(request, job, Job.SINGLEREFERENCE_Level);
String levelValue = formBuilder.fieldValue (levelKey, job.getLevel() == null ? "" : String.valueOf(job.getLevelID()));
%>
<div class="radio radio-primary job-match-radio">
<input type="radio" name="<%= assessmentTypeKey %>" id="<%= assessmentTypeId %>" class="type_radio" value="<%= assessmentType.getName() %>" <%= selectedStr %>/>
<label for="<%= assessmentTypeId %>">
<span class="label-title"><oneit:toString value="<%= assessmentType %>" mode="EscapeHTML" /></span>
<oneit:toString value="<%= assessmentType.getQuestionDetails() %>" mode="EscapeHTML"/><br />
</label>
</div>
<oneit:recalcClass htmlTag="div" classScript="job.getAssessmentType() == assessmentType ? 'main-pack-type' : '' " job="<%= job %>" assessmentType="<%= assessmentType %>">
<ul>
<%
if(companyUser.getCompany().showHasClientSupport())
for(Level level : Level.getAllLevelsforAssessmentType(transaction, assessmentType))
{
String levelId = String.valueOf(level.getID().longID());
boolean isSelected = CollectionUtils.equals(levelId, levelValue);
String selected = isSelected ? "checked" : "";
%>
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:label GUIName="Client"/></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/>
</div>
</div>
<oneit:recalcClass htmlTag="li" classScript="job.getLevelClass(level)" job="<%= job %>" level="<%= level %>">
<a href="javascript:void(0)">
<input type="radio" name="<%= levelKey %>" id="<%= levelId %>" class="level_radio" value="<%= levelId %>" <%= selected %>/>
<label for="<%= levelId %>">
<span class="talen">Talentology</span>
<span class="pack-type"><oneit:toString value="<%= level %>" mode="EscapeHTML" /></span>
<span class="pack-img <%= level.getCSSClass() %>"></span>
</label>
</a>
</oneit:recalcClass>
<%
}
%>
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="ReferenceNumber" cssClass="form-control" />
</div>
</ul>
</oneit:recalcClass>
<div class="clearfix"></div>
<%
}
String levelKey = WebUtils.getRadioSingleAssocKey(request, job, Job.SINGLEREFERENCE_Level);
String levelValue = formBuilder.fieldValue (levelKey, job.getLevel() == null ? "" : String.valueOf(job.getLevelID()));
%>
<div class="form-brack-line"></div>
<div class="form-group row">
<div class="col-md-12">
<label class="label-16">Applicant Workflow</label>
</div>
</div>
<div class="form-group row">
<div class="col-md-12">
Please define your applicant approval/refinement workflow and tabs below. We have nominated some defaults to help you get started. You are allowed up to 9 different steps, and can drag to re-order using the handle on the left.
</div>
</div>
<div class="form-brack-line"></div>
<div class="text-center">
<div class="form-group row">
<div class="col-md-12">
Job Templates include both Job Details and Requirements.
</div>
<div class="col-md-12">
Saving a new Job Template a can be completed on the next step.
</div>
</div>
<oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary largeBtn greyBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/>
<oneit:button value="Proceed to Role" name="gotoPage" cssClass="btn btn-primary largeBtn"
<oneit:button value="Proceed to Requirements" name="processCulture" cssClass="btn btn-primary largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.mapEntry("fromJobMatch", true)
.toMap() %>"/>
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp
......@@ -13,7 +13,7 @@
%>
<script>
$(document).ready(function(){
setupRecalc ($("editJob"), {'recalcOnError':true});
setupRecalc ($("form#editJob"), {'recalcOnError':true});
});
</script>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
......
cmsWebApp/webroot/extensions/adminportal/job_payment.jsp
......@@ -36,7 +36,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#editJob"), {'recalcOnError':true});
addPostRecalcHandler(function ($fieldThatChanged) {
if (! $fieldThatChanged) {
......
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
......@@ -33,7 +33,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("editCompany"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#editCompany"), {'recalcOnError':true});
$("#upload").change(function(){
readURL(this);
......
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
......@@ -115,7 +115,7 @@
<div class="dash-count c-gray">
<%
Job[] filledJobs = Job.SearchByAll().andJobStatus(new EqualsFilter<>(JobStatus.FILLED))
.andCompanyUser(new EqualsFilter<>(secUser.getExtension(CompanyUser.REFERENCE_CompanyUser)))
.andCreatedBy(new EqualsFilter<>(secUser.getExtension(CompanyUser.REFERENCE_CompanyUser)))
.search(transaction);
int filledCount = filledJobs != null ? filledJobs.length : 0;
......
cmsWebApp/webroot/extensions/adminportal/replace_card.jsp
......@@ -17,7 +17,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/replace_card_payment.jsp
......@@ -17,7 +17,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20181006_alter_Job.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_job</tableName>
<column name="job_owner_id" type="Long" length="11" nullable="true"/>
<column name="hiring_team_id" type="Long" length="11" nullable="true"/>
<column name="postcode" type="String" nullable="true" length="100"/>
<column name="location_radius" type="String" nullable="true" length="200"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20181008_Alter_Job.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_job</tableName>
<column name="require_cv" type="Boolean" nullable="true"/>
<column name="industry" type="String" nullable="true" length="200"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist.jsp
......@@ -47,7 +47,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#viewApplicants"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp
......@@ -84,7 +84,7 @@
]
});
recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#viewApplicants"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_unsuitable.jsp
......@@ -52,7 +52,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#viewApplicants"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicantss_grid.jsp
......@@ -87,7 +87,7 @@
]
});
recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#viewApplicants"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
......@@ -38,7 +38,7 @@
$(document).ready(function(){
recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#editJob"), {'recalcOnError':true});
$(".importance_radio").change(function(){
enableElementRating(this);
......@@ -102,36 +102,7 @@
<%
}
%>
<div class="form-group row">
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= job %>" field="Country" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="Country" cssClass="form-control"/>
</div>
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= job %>" field="State" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="State" cssClass="form-control"/>
</div>
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= job %>" field="City" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="City" cssClass="form-control" />
</div>
</div>
<div class="form-group row">
<div class="col-md-4">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="is-remote" attributeName="Remote" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.getRemote() != null && job.getRemote() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="is-remote">
<oneit:label GUIName="Working remotely is an option" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
</div>
<div class="form-brack-line-sub"></div>
<%
FormTag jobForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = jobForm.getFormBuilder();
......@@ -145,6 +116,7 @@
<div class="work-belonging">
<oneit:toString value="<%= cultureClass %>" mode="EscapeHTML"/>
</div>
<div><%= cultureClass.getClassDescription()%></div>
<%
for(CultureCriteria criteria : job.getCultureCriteriasForClass(cultureClass))
{
......
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