Skip to content

P
PERFORMA_REPLICA
Commit 7a8d845f by Harsh Shah
Options

Finish Release-20190214

parents 092c61c1 30518306
Showing with 758 additions and 237 deletions
cmsWebApp/sql/Note.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.DefineTableOperation">
<tableName factory="String">tl_note</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="comment" type="String" nullable="false" length="1000"/>
<column name="created_user_id" type="Long" length="11" nullable="false"/>
<column name="job_application_id" type="Long" length="11" nullable="false"/>
</NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_note" indexName="idx_tl_note_job_application_id" isUnique="false"><column name="job_application_id"/></NODE>
</NODE></OBJECTS>
\ No newline at end of file
cmsWebApp/sql/Occupation.xml
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<column name="code" type="String" nullable="false" length="4"/> <column name="code" type="String" nullable="false" length="4"/>
<column name="name" type="String" nullable="false" length="250"/> <column name="name" type="String" nullable="false" length="250"/>
<column name="level" type="String" nullable="false" length="200"/> <column name="level" type="String" nullable="false" length="200"/>
<column name="assessment_type" type="String" nullable="true" length="200"/>
<column name="assessment_level_id" type="Long" length="11" nullable="true"/>
<column name="parent_occupation_id" type="Long" length="11" nullable="true"/> <column name="parent_occupation_id" type="Long" length="11" nullable="true"/>
</NODE> </NODE>
......
cmsWebApp/sql/ms/Note.sql 0 → 100644
-- DROP TABLE tl_note;
CREATE TABLE tl_note (
object_id int NOT NULL ,
object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL
,
comment varchar(1000) NOT NULL,
created_user_id numeric(12) NOT NULL,
job_application_id numeric(12) NOT NULL
);
ALTER TABLE tl_note ADD
CONSTRAINT PK_tl_note PRIMARY KEY
(
object_id
) ;
CREATE INDEX idx_tl_note_job_application_id
ON tl_note (job_application_id);
cmsWebApp/sql/ms/Occupation.sql
...@@ -11,6 +11,8 @@ CREATE TABLE tl_occupation ( ...@@ -11,6 +11,8 @@ CREATE TABLE tl_occupation (
code varchar(4) NOT NULL, code varchar(4) NOT NULL,
name varchar(250) NOT NULL, name varchar(250) NOT NULL,
level varchar(200) NOT NULL, level varchar(200) NOT NULL,
assessment_type varchar(200) NULL,
assessment_level_id numeric(12) NULL,
parent_occupation_id numeric(12) NULL parent_occupation_id numeric(12) NULL
); );
......
cmsWebApp/sql/oracle/Note.sql 0 → 100644
-- DROP TABLE tl_note;
CREATE TABLE tl_note (
object_id number(12) NOT NULL ,
object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL
,
comment varchar2(1000) NOT NULL,
created_user_id number(12) NOT NULL,
job_application_id number(12) NOT NULL
);
ALTER TABLE tl_note ADD
CONSTRAINT PK_tl_note PRIMARY KEY
(
object_id
) ;
CREATE INDEX idx_tl_note_job_application_id
ON tl_note (job_application_id);
cmsWebApp/sql/oracle/Occupation.sql
...@@ -12,6 +12,8 @@ CREATE TABLE tl_occupation ( ...@@ -12,6 +12,8 @@ CREATE TABLE tl_occupation (
code varchar2(4) NOT NULL, code varchar2(4) NOT NULL,
name varchar2(250) NOT NULL, name varchar2(250) NOT NULL,
level varchar2(200) NOT NULL, level varchar2(200) NOT NULL,
assessment_type varchar2(200) NULL,
assessment_level_id number(12) NULL,
parent_occupation_id number(12) NULL parent_occupation_id number(12) NULL
); );
......
cmsWebApp/sql/postgres/Note.sql 0 → 100644
-- @AutoRun
-- drop table tl_note;
CREATE TABLE tl_note (
object_id numeric(12) NOT NULL ,
object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL
,
comment varchar(1000) NOT NULL,
created_user_id numeric(12) NOT NULL,
job_application_id numeric(12) NOT NULL
);
ALTER TABLE tl_note ADD
CONSTRAINT pk_tl_note PRIMARY KEY
(
object_id
) ;
CREATE INDEX idx_tl_note_job_application_id
ON tl_note (job_application_id);
cmsWebApp/sql/postgres/Occupation.sql
...@@ -12,6 +12,8 @@ CREATE TABLE tl_occupation ( ...@@ -12,6 +12,8 @@ CREATE TABLE tl_occupation (
code varchar(4) NOT NULL, code varchar(4) NOT NULL,
name varchar(250) NOT NULL, name varchar(250) NOT NULL,
level varchar(200) NOT NULL, level varchar(200) NOT NULL,
assessment_type varchar(200) NULL,
assessment_level_id numeric(12) NULL,
parent_occupation_id numeric(12) NULL parent_occupation_id numeric(12) NULL
); );
......
cmsWebApp/src/performa/form/AddNoteFP.java 0 → 100644
package performa.form;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import oneit.logging.LogLevel;
import oneit.logging.LogMgr;
import oneit.logging.LoggingArea;
import oneit.objstore.ObjectTransaction;
import oneit.objstore.StorageException;
import oneit.objstore.parser.BusinessObjectParser;
import oneit.security.SecUser;
import oneit.servlets.forms.SubmissionDetails;
import oneit.servlets.forms.SuccessfulResult;
import oneit.servlets.process.ORMProcessState;
import oneit.servlets.process.SaveFP;
import oneit.utils.BusinessException;
import oneit.utils.MultiException;
import performa.orm.CompanyUser;
import performa.orm.JobApplication;
import performa.orm.Note;
public class AddNoteFP extends SaveFP
{
private static final LoggingArea LOG = LoggingArea.createLoggingArea("AddNoteFP");
@Override
public void validate(ORMProcessState process, SubmissionDetails submission, MultiException exceptions, Map params) throws StorageException
{
HttpServletRequest request = submission.getRequest();
JobApplication jobApplication = (JobApplication) request.getAttribute("JobApplication");
BusinessObjectParser.assertFieldCondition(jobApplication.getNote()!= null, jobApplication, JobApplication.FIELD_Note, "mandatory", exceptions, true, request);
super.validate(process, submission, exceptions, params);
}
@Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{
ObjectTransaction objTran = process.getTransaction();
HttpServletRequest request = submission.getRequest();
JobApplication jobApplication = (JobApplication) request.getAttribute("JobApplication");
LogMgr.log(LOG, LogLevel.PROCESSING1, "Adding note to job application : ", jobApplication);
Note note = Note.createNote(objTran);
SecUser secUser = SecUser.getTXUser(process.getTransaction());
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
note.setComment(jobApplication.getNote());
note.setCreatedUser(companyUser);
note.setJobApplication(jobApplication);
LogMgr.log(LOG, LogLevel.PROCESSING1, "New note added : ", note);
return super.processForm(process, submission, params);
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/CreatePlanFP.java
...@@ -2,7 +2,6 @@ package performa.form; ...@@ -2,7 +2,6 @@ package performa.form;
import com.stripe.Stripe; import com.stripe.Stripe;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import oneit.logging.LogLevel; import oneit.logging.LogLevel;
import oneit.logging.LogMgr; import oneit.logging.LogMgr;
import oneit.objstore.StorageException; import oneit.objstore.StorageException;
......
cmsWebApp/src/performa/form/ExtendJobFP.java 0 → 100644
package performa.form;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import oneit.logging.LogLevel;
import oneit.logging.LogMgr;
import oneit.logging.LoggingArea;
import oneit.objstore.StorageException;
import oneit.security.SecUser;
import oneit.servlets.forms.SubmissionDetails;
import oneit.servlets.forms.SuccessfulResult;
import oneit.servlets.process.ORMProcessState;
import oneit.servlets.process.SaveFP;
import oneit.utils.BusinessException;
import oneit.utils.DateDiff;
import oneit.utils.math.NullArith;
import performa.orm.CompanyUser;
import performa.orm.HiringTeam;
import performa.orm.Job;
import performa.utils.StripeUtils;
public class ExtendJobFP extends SaveFP
{
private static final LoggingArea LOG = LoggingArea.createLoggingArea("ExtendJobFP");
@Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{
HttpServletRequest request = submission.getRequest();
Job job = (Job) request.getAttribute("Job");
HiringTeam hiringTeam = job.getHiringTeam();
HiringTeam billingTeam = hiringTeam.getManageOwnBilling() ? hiringTeam : hiringTeam.getBilledByTeam();
SecUser secUser = SecUser.getTXUser(process.getTransaction());
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
LogMgr.log(LOG, LogLevel.PROCESSING1, "Start of Extend job : ", job);
job.setApplyBy(DateDiff.add(job.getApplyBy(), Calendar.DATE, 30));
job.setLastEdited(new Date());
if (billingTeam.canCreateJob())
{
billingTeam.setUsedCredits(NullArith.add(billingTeam.getUsedCredits(), 1).intValue());
if(billingTeam.getUsedCredits() > billingTeam.getAvailableCredits())
{
StripeUtils.recordUsage(billingTeam);
}
}
else if(billingTeam.getIsPPJ())
{
StripeUtils.makePayment(hiringTeam, job);
}
LogMgr.log(LOG, LogLevel.PROCESSING1, "Job Extended. Apply by date : ", job.getApplyBy());
return super.processForm(process, submission, params);
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/NavigateToCreateJobFP.java
...@@ -27,6 +27,11 @@ public class NavigateToCreateJobFP extends ORMProcessFormProcessor ...@@ -27,6 +27,11 @@ public class NavigateToCreateJobFP extends ORMProcessFormProcessor
if(job != null && job.isTrue(job.getFromTemplate())) if(job != null && job.isTrue(job.getFromTemplate()))
{ {
if(job.getHiringTeam().showHasClientSupport())
{
BusinessObjectParser.assertFieldCondition(job.getClient() != null , job, Job.SINGLEREFERENCE_Client, "mandatory", exceptions, true, request);
}
BusinessObjectParser.assertFieldCondition(job.getAssessmentTemplate() != null , job, Job.SINGLEREFERENCE_AssessmentTemplate, "mandatory", exceptions, true, request); BusinessObjectParser.assertFieldCondition(job.getAssessmentTemplate() != null , job, Job.SINGLEREFERENCE_AssessmentTemplate, "mandatory", exceptions, true, request);
} }
......
cmsWebApp/src/performa/form/ProcessCultureFP.java
...@@ -24,7 +24,11 @@ public class ProcessCultureFP extends SaveFP ...@@ -24,7 +24,11 @@ public class ProcessCultureFP extends SaveFP
if(job.getOccupationId() != null) if(job.getOccupationId() != null)
{ {
job.setOccupation(Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId()))); Occupation occupation = Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId()));
job.setOccupation(occupation);
job.setLevel(occupation.getAssessmentLevel());
job.setAssessmentType(occupation.getAssessmentType());
} }
return new ProcessRedirectResult((String) submission.getRequest().getAttribute("nextPage"), new String[0]); return new ProcessRedirectResult((String) submission.getRequest().getAttribute("nextPage"), new String[0]);
...@@ -52,12 +56,12 @@ public class ProcessCultureFP extends SaveFP ...@@ -52,12 +56,12 @@ public class ProcessCultureFP extends SaveFP
BusinessObjectParser.assertFieldCondition(job.getOccupation() != null, job , Job.SINGLEREFERENCE_Occupation, "mandatory", exceptions, true, request); BusinessObjectParser.assertFieldCondition(job.getOccupation() != null, job , Job.SINGLEREFERENCE_Occupation, "mandatory", exceptions, true, request);
} }
BusinessObjectParser.assertFieldCondition(job.getLevel()!= null, job , Job.SINGLEREFERENCE_Level, "mandatory", exceptions, true, request); // BusinessObjectParser.assertFieldCondition(job.getLevel()!= null, job , Job.SINGLEREFERENCE_Level, "mandatory", exceptions, true, request);
//
if(job.getLevel() != null) // if(job.getLevel() != null)
{ // {
BusinessObjectParser.assertFieldCondition(job.showLevelOption(job.getLevel()), job , Job.SINGLEREFERENCE_Level, "invalid", exceptions, true, request); // BusinessObjectParser.assertFieldCondition(job.showLevelOption(job.getLevel()), job , Job.SINGLEREFERENCE_Level, "invalid", exceptions, true, request);
} // }
} }
if(fromCulture) if(fromCulture)
......
cmsWebApp/src/performa/form/SaveJobFP.java
...@@ -83,7 +83,11 @@ public class SaveJobFP extends SaveFP ...@@ -83,7 +83,11 @@ public class SaveJobFP extends SaveFP
if(job.getOccupationId() != null) if(job.getOccupationId() != null)
{ {
job.setOccupation(Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId()))); Occupation occupation = Occupation.getOccupationByID(process.getTransaction(), Long.valueOf(job.getOccupationId()));
job.setOccupation(occupation);
job.setLevel(occupation.getAssessmentLevel());
job.setAssessmentType(occupation.getAssessmentType());
} }
// restarting process as custom attributes needs to be updated to intercom // restarting process as custom attributes needs to be updated to intercom
...@@ -106,20 +110,19 @@ public class SaveJobFP extends SaveFP ...@@ -106,20 +110,19 @@ public class SaveJobFP extends SaveFP
{ {
HttpServletRequest request = submission.getRequest(); HttpServletRequest request = submission.getRequest();
Job job = process.getAttribute("Job") != null ? (Job) process.getAttribute("Job") : (Job) request.getAttribute("Job"); Job job = process.getAttribute("Job") != null ? (Job) process.getAttribute("Job") : (Job) request.getAttribute("Job");
Boolean openJob = (Boolean) request.getAttribute("openJob");
JobStatus status = (JobStatus) request.getAttribute("JobStatus"); JobStatus status = (JobStatus) request.getAttribute("JobStatus");
HiringTeam hiringTeam = job.getHiringTeam(); HiringTeam hiringTeam = job.getHiringTeam();
HiringTeam billingTeam = hiringTeam.getManageOwnBilling() ? hiringTeam : hiringTeam.getBilledByTeam(); HiringTeam billingTeam = hiringTeam.getManageOwnBilling() ? hiringTeam : hiringTeam.getBilledByTeam();
if(job.getJobStatus() != JobStatus.DRAFT || openJob == Boolean.TRUE) // if(job.getJobStatus() != JobStatus.DRAFT || openJob == Boolean.TRUE)
{ // {
BusinessObjectParser.assertFieldCondition(job.getLevel() != null, job , Job.SINGLEREFERENCE_Level, "mandatory", exceptions, true, request); // BusinessObjectParser.assertFieldCondition(job.getLevel() != null, job , Job.SINGLEREFERENCE_Level, "mandatory", exceptions, true, request);
//
if(job.getLevel() != null) // if(job.getLevel() != null)
{ // {
BusinessObjectParser.assertFieldCondition(job.showLevelOption(job.getLevel()), job , Job.SINGLEREFERENCE_Level, "invalid", exceptions, true, request); // BusinessObjectParser.assertFieldCondition(job.showLevelOption(job.getLevel()), job , Job.SINGLEREFERENCE_Level, "invalid", exceptions, true, request);
} // }
} // }
if(status != null && status == JobStatus.OPEN) if(status != null && status == JobStatus.OPEN)
{ {
......
cmsWebApp/src/performa/form/SaveRequirementsTemplateFP.java
...@@ -71,13 +71,18 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor ...@@ -71,13 +71,18 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor
newTemplate.addToWorkFlows(workflowCopy); newTemplate.addToWorkFlows(workflowCopy);
} }
for (AssessmentCriteria criteria : job.getAssessmentCriteriasSet()) newTemplate.setIncludeAssessmentCriteria(job.getIncludeAssessmentCriteria());
{
AssessmentCriteria criteriaCopy = AssessmentCriteria.createAssessmentCriteria(newObjTran);
criteriaCopy.copyAttributesFrom(criteria); if(job.getIncludeAssessmentCriteria())
{
for (AssessmentCriteria criteria : job.getAssessmentCriteriasSet())
{
AssessmentCriteria criteriaCopy = AssessmentCriteria.createAssessmentCriteria(newObjTran);
criteriaCopy.copyAttributesFrom(criteria);
newTemplate.addToAssessmentCriterias(criteriaCopy); newTemplate.addToAssessmentCriterias(criteriaCopy);
}
} }
}); });
......
cmsWebApp/src/performa/orm/BaseJob.java
...@@ -1159,7 +1159,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -1159,7 +1159,7 @@ public abstract class BaseJob extends BaseBusinessClass
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "require_cv"); metaInfo.put ("dbcol", "require_cv");
metaInfo.put ("defaultValue", "Boolean.FALSE"); metaInfo.put ("defaultValue", "Boolean.TRUE");
metaInfo.put ("name", "RequireCV"); metaInfo.put ("name", "RequireCV");
metaInfo.put ("type", "Boolean"); metaInfo.put ("type", "Boolean");
...@@ -1348,7 +1348,7 @@ public abstract class BaseJob extends BaseBusinessClass ...@@ -1348,7 +1348,7 @@ public abstract class BaseJob extends BaseBusinessClass
_ExpectedCandidateRadius = (LocationRadius)(LocationRadius.KM100); _ExpectedCandidateRadius = (LocationRadius)(LocationRadius.KM100);
_State = (State)(State.WA); _State = (State)(State.WA);
_Country = (Countries)(Countries.AU); _Country = (Countries)(Countries.AU);
_RequireCV = (Boolean)(Boolean.FALSE); _RequireCV = (Boolean)(Boolean.TRUE);
_IsManuallyClosed = (Boolean)(Boolean.FALSE); _IsManuallyClosed = (Boolean)(Boolean.FALSE);
_LastEdited = (Date)(HELPER_LastEdited.initialise (_LastEdited)); _LastEdited = (Date)(HELPER_LastEdited.initialise (_LastEdited));
_IsPPJ = (Boolean)(Boolean.FALSE); _IsPPJ = (Boolean)(Boolean.FALSE);
......
cmsWebApp/src/performa/orm/Job.java
...@@ -311,12 +311,21 @@ public class Job extends BaseJob ...@@ -311,12 +311,21 @@ public class Job extends BaseJob
public AssessmentCriteriaTemplate[] getAssessmentTemplates() public AssessmentCriteriaTemplate[] getAssessmentTemplates()
{ {
CompanyUser companyUser = SecUser.getTXUser(getTransaction()).getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser companyUser = SecUser.getTXUser(getTransaction()).getExtension(CompanyUser.REFERENCE_CompanyUser);
return AssessmentCriteriaTemplate.SearchByAll() AssessmentCriteriaTemplate.SearchAll search = AssessmentCriteriaTemplate.SearchByAll()
.andHiringTeam(new EqualsFilter<>(getHiringTeam())) .andHiringTeam(new EqualsFilter<>(getHiringTeam()))
.andCompanyUser(new EqualsFilter<>(companyUser)) .andCompanyUser(new EqualsFilter<>(companyUser));
.search(getTransaction()); if(getHiringTeam().showHasClientSupport() && getClient() != null)
{
search = search.andClient(new EqualsFilter<>(getClient()));
}
else
{
search = search.andClient(new IsNullFilter<>());
}
return search.search(getTransaction());
} }
...@@ -324,10 +333,20 @@ public class Job extends BaseJob ...@@ -324,10 +333,20 @@ public class Job extends BaseJob
{ {
CompanyUser companyUser = SecUser.getTXUser(getTransaction()).getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser companyUser = SecUser.getTXUser(getTransaction()).getExtension(CompanyUser.REFERENCE_CompanyUser);
return CultureCriteriaTemplate.SearchByAll() CultureCriteriaTemplate.SearchAll search = CultureCriteriaTemplate.SearchByAll()
.andHiringTeam(new EqualsFilter<>(getHiringTeam())) .andHiringTeam(new EqualsFilter<>(getHiringTeam()))
.andCompanyUser(new EqualsFilter<>(companyUser)) .andCompanyUser(new EqualsFilter<>(companyUser));
.search(getTransaction());
if(getHiringTeam().showHasClientSupport() && getClient() != null)
{
search = search.andClient(new EqualsFilter<>(getClient()));
}
else
{
search = search.andClient(new IsNullFilter<>());
}
return search.search(getTransaction());
} }
...@@ -685,11 +704,14 @@ public class Job extends BaseJob ...@@ -685,11 +704,14 @@ public class Job extends BaseJob
return filteredList; return filteredList;
} }
// templates disabled for sprint 1 public String getTemplateClass(boolean isTeamplate)
@Override
public FieldWriteability getWriteability_JobTemplate()
{ {
return FieldWriteability.NOT_IN_GUI; StringBuilder sb = new StringBuilder("create-job-selector rectangle-4");
sb.append(getHiringTeam().showHasClientSupport() ? " special" : "");
sb.append((isTeamplate && isTrue(getFromTemplate())) || (!isTeamplate && isFalse(getFromTemplate())) ? " checked" : "");
return sb.toString();
} }
} }
\ No newline at end of file
cmsWebApp/src/performa/orm/Job.xml
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<ATTRIB name="ExpectedCandidateRadius" type="LocationRadius" dbcol="location_radius" defaultValue="LocationRadius.KM100" attribHelper="EnumeratedAttributeHelper" mandatory="true"/> <ATTRIB name="ExpectedCandidateRadius" type="LocationRadius" dbcol="location_radius" defaultValue="LocationRadius.KM100" attribHelper="EnumeratedAttributeHelper" mandatory="true"/>
<ATTRIB name="State" type="State" dbcol="state" defaultValue="State.WA" 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="Country" type="Countries" dbcol="country" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="RequireCV" type="Boolean" dbcol="require_cv" defaultValue="Boolean.FALSE"/> <ATTRIB name="RequireCV" type="Boolean" dbcol="require_cv" defaultValue="Boolean.TRUE"/>
<ATTRIB name="IsManuallyClosed" type="Boolean" dbcol="manually_closed" defaultValue="Boolean.FALSE"/> <ATTRIB name="IsManuallyClosed" type="Boolean" dbcol="manually_closed" defaultValue="Boolean.FALSE"/>
<ATTRIB name="LastEdited" type="Date" dbcol="last_edited" /> <ATTRIB name="LastEdited" type="Date" dbcol="last_edited" />
<ATTRIB name="IsPPJ" type="Boolean" dbcol="is_ppj" defaultValue="Boolean.FALSE"/> <ATTRIB name="IsPPJ" type="Boolean" dbcol="is_ppj" defaultValue="Boolean.FALSE"/>
......
cmsWebApp/src/performa/orm/JobApplication.xml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<IMPORT value="performa.orm.types.*"/> <IMPORT value="performa.orm.types.*"/>
<MULTIPLEREFERENCE name="AssessmentCriteriaAnswers" type="AssessmentCriteriaAnswer" backreferenceName="JobApplication" /> <MULTIPLEREFERENCE name="AssessmentCriteriaAnswers" type="AssessmentCriteriaAnswer" backreferenceName="JobApplication" />
<MULTIPLEREFERENCE name="Notes" type="Note" backreferenceName="JobApplication" />
<TRANSIENT name="AppProcessOption" type="AppProcessOption" attribHelper="EnumeratedAttributeHelper"/> <TRANSIENT name="AppProcessOption" type="AppProcessOption" attribHelper="EnumeratedAttributeHelper"/>
<TRANSIENT name="OverallRank" type="Integer" /> <TRANSIENT name="OverallRank" type="Integer" />
...@@ -13,6 +14,7 @@ ...@@ -13,6 +14,7 @@
<TRANSIENT name="RequirementFit" type="Map" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE"/> <TRANSIENT name="RequirementFit" type="Map" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE"/>
<TRANSIENT name="CultureFit" type="Map" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE"/> <TRANSIENT name="CultureFit" type="Map" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE"/>
<TRANSIENT name="FactorScoreDetails" type="Map" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE"/> <TRANSIENT name="FactorScoreDetails" type="Map" attribHelper="BLOBAttributeHelper" attribHelperInstance="BLOBAttributeHelper.INSTANCE"/>
<TRANSIENT name="Note" type="String" />
<TRANSIENTSINGLE name="WorkFlow" type="WorkFlow" /> <TRANSIENTSINGLE name="WorkFlow" type="WorkFlow" />
......
cmsWebApp/src/performa/orm/Note.java 0 → 100644
package performa.orm;
public class Note extends BaseNote
{
private static final long serialVersionUID = 0L;
// This constructor should not be called
public Note ()
{
// Do not add any code to this, always put it in initialiseNewObject
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/Note.xml 0 → 100644
<?xml version="1.0"?>
<ROOT xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://www.oneit.com.au/schemas/5.2/BusinessObject.xsd'>
<BUSINESSCLASS name="Note" package="performa.orm">
<IMPORT value="oneit.security.*"/>
<TABLE name="tl_note" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Comment" type="String" dbcol="comment" length="1000" mandatory="true"/>
<SINGLEREFERENCE name="CreatedUser" type="CompanyUser" dbcol="created_user_id" mandatory="true" />
<SINGLEREFERENCE name="JobApplication" type="JobApplication" dbcol="job_application_id" mandatory="true" backreferenceName="Notes"/>
</TABLE>
<SEARCH type="All" paramFilter="object_id is not null"/>
</BUSINESSCLASS>
</ROOT>
cmsWebApp/src/performa/orm/Occupation.xml
...@@ -9,11 +9,13 @@ ...@@ -9,11 +9,13 @@
<MULTIPLEREFERENCE name="ChildOccupations" type="Occupation" backreferenceName="ParentOccupation" /> <MULTIPLEREFERENCE name="ChildOccupations" type="Occupation" backreferenceName="ParentOccupation" />
<TABLE name="tl_occupation" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_occupation" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Code" type="String" dbcol="code" length="4" mandatory="true" isUnique="true"/> <ATTRIB name="Code" type="String" dbcol="code" length="4" mandatory="true" isUnique="true"/>
<ATTRIB name="Name" type="String" dbcol="name" length="250" mandatory="true"/> <ATTRIB name="Name" type="String" dbcol="name" length="250" mandatory="true"/>
<ATTRIB name="Level" type="OccupationLevel" dbcol="level" attribHelper="EnumeratedAttributeHelper" mandatory="true"/> <ATTRIB name="Level" type="OccupationLevel" dbcol="level" attribHelper="EnumeratedAttributeHelper" mandatory="true"/>
<ATTRIB name="AssessmentType" type="AssessmentType" dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper" />
<SINGLEREFERENCE name="ParentOccupation" type="Occupation" dbcol="parent_occupation_id" backreferenceName="ChildOccupations"/>
<SINGLEREFERENCE name="AssessmentLevel" type="Level" dbcol="assessment_level_id" />
<SINGLEREFERENCE name="ParentOccupation" type="Occupation" dbcol="parent_occupation_id" backreferenceName="ChildOccupations"/>
</TABLE> </TABLE>
<SEARCH type="All" paramFilter="object_id is not null" orderBy="object_id"/> <SEARCH type="All" paramFilter="object_id is not null" orderBy="object_id"/>
......
cmsWebApp/src/performa/orm/OccupationPersistenceMgr.java
...@@ -30,12 +30,14 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr ...@@ -30,12 +30,14 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr
private String dummyCode; private String dummyCode;
private String dummyName; private String dummyName;
private OccupationLevel dummyLevel; private OccupationLevel dummyLevel;
private AssessmentType dummyAssessmentType;
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper HELPER_Code = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_Code = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_Name = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_Name = DefaultAttributeHelper.INSTANCE;
private static final EnumeratedAttributeHelper HELPER_Level = new EnumeratedAttributeHelper (OccupationLevel.FACTORY_OccupationLevel); private static final EnumeratedAttributeHelper HELPER_Level = new EnumeratedAttributeHelper (OccupationLevel.FACTORY_OccupationLevel);
private static final EnumeratedAttributeHelper HELPER_AssessmentType = new EnumeratedAttributeHelper (AssessmentType.FACTORY_AssessmentType);
...@@ -45,10 +47,11 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr ...@@ -45,10 +47,11 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr
dummyCode = (String)(HELPER_Code.initialise (dummyCode)); dummyCode = (String)(HELPER_Code.initialise (dummyCode));
dummyName = (String)(HELPER_Name.initialise (dummyName)); dummyName = (String)(HELPER_Name.initialise (dummyName));
dummyLevel = (OccupationLevel)(HELPER_Level.initialise (dummyLevel)); dummyLevel = (OccupationLevel)(HELPER_Level.initialise (dummyLevel));
dummyAssessmentType = (AssessmentType)(HELPER_AssessmentType.initialise (dummyAssessmentType));
} }
private String SELECT_COLUMNS = "{PREFIX}tl_occupation.object_id as id, {PREFIX}tl_occupation.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_occupation.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_occupation.code, {PREFIX}tl_occupation.name, {PREFIX}tl_occupation.level, {PREFIX}tl_occupation.parent_occupation_id, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}tl_occupation.object_id as id, {PREFIX}tl_occupation.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_occupation.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_occupation.code, {PREFIX}tl_occupation.name, {PREFIX}tl_occupation.level, {PREFIX}tl_occupation.assessment_type, {PREFIX}tl_occupation.assessment_level_id, {PREFIX}tl_occupation.parent_occupation_id, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -102,6 +105,8 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr ...@@ -102,6 +105,8 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr
!tl_occupationPSet.containsAttrib(Occupation.FIELD_Code)|| !tl_occupationPSet.containsAttrib(Occupation.FIELD_Code)||
!tl_occupationPSet.containsAttrib(Occupation.FIELD_Name)|| !tl_occupationPSet.containsAttrib(Occupation.FIELD_Name)||
!tl_occupationPSet.containsAttrib(Occupation.FIELD_Level)|| !tl_occupationPSet.containsAttrib(Occupation.FIELD_Level)||
!tl_occupationPSet.containsAttrib(Occupation.FIELD_AssessmentType)||
!tl_occupationPSet.containsAttrib(Occupation.SINGLEREFERENCE_AssessmentLevel)||
!tl_occupationPSet.containsAttrib(Occupation.SINGLEREFERENCE_ParentOccupation)) !tl_occupationPSet.containsAttrib(Occupation.SINGLEREFERENCE_ParentOccupation))
{ {
// We will need to retrieve it // We will need to retrieve it
...@@ -182,10 +187,10 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr ...@@ -182,10 +187,10 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}tl_occupation " + "UPDATE {PREFIX}tl_occupation " +
"SET code = ?, name = ?, level = ?, parent_occupation_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET code = ?, name = ?, level = ?, assessment_type = ?, assessment_level_id = ? , parent_occupation_id = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE tl_occupation.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE tl_occupation.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Code.getForSQL(dummyCode, tl_occupationPSet.getAttrib (Occupation.FIELD_Code))).listEntry (HELPER_Name.getForSQL(dummyName, tl_occupationPSet.getAttrib (Occupation.FIELD_Name))).listEntry (HELPER_Level.getForSQL(dummyLevel, tl_occupationPSet.getAttrib (Occupation.FIELD_Level))).listEntry (SQLManager.CheckNull((Long)(tl_occupationPSet.getAttrib (Occupation.SINGLEREFERENCE_ParentOccupation)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Code.getForSQL(dummyCode, tl_occupationPSet.getAttrib (Occupation.FIELD_Code))).listEntry (HELPER_Name.getForSQL(dummyName, tl_occupationPSet.getAttrib (Occupation.FIELD_Name))).listEntry (HELPER_Level.getForSQL(dummyLevel, tl_occupationPSet.getAttrib (Occupation.FIELD_Level))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_occupationPSet.getAttrib (Occupation.FIELD_AssessmentType))).listEntry (SQLManager.CheckNull((Long)(tl_occupationPSet.getAttrib (Occupation.SINGLEREFERENCE_AssessmentLevel)))).listEntry (SQLManager.CheckNull((Long)(tl_occupationPSet.getAttrib (Occupation.SINGLEREFERENCE_ParentOccupation)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -444,7 +449,9 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr ...@@ -444,7 +449,9 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr
tl_occupationPSet.setAttrib(Occupation.FIELD_Code, HELPER_Code.getFromRS(dummyCode, r, "code")); tl_occupationPSet.setAttrib(Occupation.FIELD_Code, HELPER_Code.getFromRS(dummyCode, r, "code"));
tl_occupationPSet.setAttrib(Occupation.FIELD_Name, HELPER_Name.getFromRS(dummyName, r, "name")); tl_occupationPSet.setAttrib(Occupation.FIELD_Name, HELPER_Name.getFromRS(dummyName, r, "name"));
tl_occupationPSet.setAttrib(Occupation.FIELD_Level, HELPER_Level.getFromRS(dummyLevel, r, "level")); tl_occupationPSet.setAttrib(Occupation.FIELD_Level, HELPER_Level.getFromRS(dummyLevel, r, "level"));
tl_occupationPSet.setAttrib(Occupation.FIELD_AssessmentType, HELPER_AssessmentType.getFromRS(dummyAssessmentType, r, "assessment_type"));
tl_occupationPSet.setAttrib(Occupation.SINGLEREFERENCE_AssessmentLevel, r.getObject ("assessment_level_id"));
tl_occupationPSet.setAttrib(Occupation.SINGLEREFERENCE_ParentOccupation, r.getObject ("parent_occupation_id")); tl_occupationPSet.setAttrib(Occupation.SINGLEREFERENCE_ParentOccupation, r.getObject ("parent_occupation_id"));
} }
...@@ -462,10 +469,10 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr ...@@ -462,10 +469,10 @@ public class OccupationPersistenceMgr extends ObjectPersistenceMgr
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}tl_occupation " + "INSERT INTO {PREFIX}tl_occupation " +
" (code, name, level, parent_occupation_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (code, name, level, assessment_type, assessment_level_id, parent_occupation_id, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Code.getForSQL(dummyCode, tl_occupationPSet.getAttrib (Occupation.FIELD_Code))).listEntry (HELPER_Name.getForSQL(dummyName, tl_occupationPSet.getAttrib (Occupation.FIELD_Name))).listEntry (HELPER_Level.getForSQL(dummyLevel, tl_occupationPSet.getAttrib (Occupation.FIELD_Level))) .listEntry (SQLManager.CheckNull((Long)(tl_occupationPSet.getAttrib (Occupation.SINGLEREFERENCE_ParentOccupation)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_Code.getForSQL(dummyCode, tl_occupationPSet.getAttrib (Occupation.FIELD_Code))).listEntry (HELPER_Name.getForSQL(dummyName, tl_occupationPSet.getAttrib (Occupation.FIELD_Name))).listEntry (HELPER_Level.getForSQL(dummyLevel, tl_occupationPSet.getAttrib (Occupation.FIELD_Level))).listEntry (HELPER_AssessmentType.getForSQL(dummyAssessmentType, tl_occupationPSet.getAttrib (Occupation.FIELD_AssessmentType))) .listEntry (SQLManager.CheckNull((Long)(tl_occupationPSet.getAttrib (Occupation.SINGLEREFERENCE_AssessmentLevel)))).listEntry (SQLManager.CheckNull((Long)(tl_occupationPSet.getAttrib (Occupation.SINGLEREFERENCE_ParentOccupation)))) .listEntry (objectID.longID ()).toList().toArray());
tl_occupationPSet.setStatus (PersistentSetStatus.PROCESSED); tl_occupationPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
......
cmsWebApp/webroot/css/common.css
...@@ -3695,7 +3695,7 @@ span.appli-progress-bar { ...@@ -3695,7 +3695,7 @@ span.appli-progress-bar {
margin-bottom: 10px; margin-bottom: 10px;
text-align: left; text-align: left;
} }
input.add-note-btn { button.add-note-btn {
display: inline-block; display: inline-block;
height: 30px; height: 30px;
border-radius: 100px; border-radius: 100px;
...@@ -3710,7 +3710,7 @@ input.add-note-btn { ...@@ -3710,7 +3710,7 @@ input.add-note-btn {
padding: 0; padding: 0;
width: 100px; width: 100px;
} }
input.add-note-btn:hover{ button.add-note-btn:hover{
background-color: #434c58; background-color: #434c58;
} }
.note-txt-box { .note-txt-box {
...@@ -6073,9 +6073,12 @@ label, label .label-title span { ...@@ -6073,9 +6073,12 @@ label, label .label-title span {
.job-template-left.job-template-cl4 { .job-template-left.job-template-cl4 {
width: 25%; width: 25%;
} }
.job-template-left.job-template-cl1.culture { .job-template-left.job-template-cl1.culture, .job-template-left.job-template-cl1.no-client {
width: 49%; width: 49%;
} }
.job-template-left.job-template-cl1.culture.no-client{
width: 75%;
}
.job-template-left.job-template-cl4 .m-user-right-padlock { .job-template-left.job-template-cl4 .m-user-right-padlock {
float: right; float: right;
padding: 17px 0; padding: 17px 0;
...@@ -7641,4 +7644,84 @@ input{ ...@@ -7641,4 +7644,84 @@ input{
.billing-notice{ .billing-notice{
margin-bottom: 40px; margin-bottom: 40px;
padding-left: 10px; padding-left: 10px;
} }
\ No newline at end of file
/*
Start of CV Cover Letter Popup
*/
.cv-cover-letter{
border: 1px solid #E5E8EB;
border-radius: 2px;
background-color: #FFFFFF;
padding: 14px 18px;
color: #4E5258;
font-size: 12px;
}
.cv-cover-letter img{
height: 18px;
padding-right: 18px;
}
.cv-popup{
border-radius: 4px;
background-color: #ffffff;
box-shadow: 0 0 30px 5px rgba(0, 0, 0, 0.2);
/*border: 1px solid #e8e8eb;*/
width: 65%;
height:1000px;
margin: 0 auto;
text-align: center;
padding: 0;
margin-top: 150px;
}
.cv-popup .nav-tabs{
background: #4E5258;
}
.cv-popup .nav-tabs>li.active>a{
color: #4A4A4A;
opacity: 1;
}
.cv-popup .nav-tabs>li>a{
color: #FFFFFF;
opacity: 0.5;
font-size: 20px;
line-height: 30px;
text-align: center;
}
.cv-popup .nav-tabs>li>a:focus, .cv-popup .nav-tabs>li>a:hover{
color: #4A4A4A;
}
.cv-popup .nav-tabs>li.active>a, .cv-popup .nav-tabs>li.active>a:focus, .cv-popup .nav-tabs>li.active>a:hover{
background: #F5F7F8;
}
.cv-popup .tab-pane{
background: #F5F7F8;
}
.cv-popup button.close{
color: #F5F7F8;
padding: 10px 20px;
opacity: 1;
}
.cv-popup .no-preview{
padding-top: 100px;
}
.cv-popup .download-btn{
border: 1px solid #E5E8EB;
border-radius: 2px;
background-color: #4E5258;
padding: 14px 18px;
color: #FFFFFF;
font-size: 18px;
margin-top: 20px;
}
.cv-popup .download-btn img{
height: 30px;
padding-right: 18px;
}
.modal-dialog.cv{
width:100%;
}
/*
End of CV Cover Letter Popup
*/
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<FORM name="*.loadRequirementsFromTemplate" factory="Participant" class="performa.form.LoadRequirementsFromTemplateFP"/> <FORM name="*.loadRequirementsFromTemplate" factory="Participant" class="performa.form.LoadRequirementsFromTemplateFP"/>
<FORM name="*.loadCultureFromTemplate" factory="Participant" class="performa.form.LoadCultureFromTemplateFP"/> <FORM name="*.loadCultureFromTemplate" factory="Participant" class="performa.form.LoadCultureFromTemplateFP"/>
<FORM name="*.changeApplicationStatus" factory="Participant" class="performa.form.ChangeApplicationStatusFP"/> <FORM name="*.changeApplicationStatus" factory="Participant" class="performa.form.ChangeApplicationStatusFP"/>
<FORM name="*.addNote" factory="Participant" class="performa.form.AddNoteFP"/>
<FORM name="*.extendJob" factory="Participant" class="performa.form.ExtendJobFP"/>
<FORM name="*.bulkupdate" factory="Participant" class="performa.form.BulkUpdateFP"/> <FORM name="*.bulkupdate" factory="Participant" class="performa.form.BulkUpdateFP"/>
<FORM name="*.navigateBetweenStatus" factory="Participant" class="performa.form.NavigateBetweenStatusFP"/> <FORM name="*.navigateBetweenStatus" factory="Participant" class="performa.form.NavigateBetweenStatusFP"/>
<FORM name="*.sendCompanyUserInvites" factory="Participant" class="performa.form.SendCompanyUserInvitesFP"> <FORM name="*.sendCompanyUserInvites" factory="Participant" class="performa.form.SendCompanyUserInvitesFP">
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
...@@ -158,47 +158,47 @@ ...@@ -158,47 +158,47 @@
<% <%
} }
%> %>
</oneit:recalcClass>
<div class="form-group"> <div class="form-group">
<div class="styled_checkboxes"> <div class="styled_checkboxes">
<div class="checkbox checkbox-primary"> <div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveAssessmentTemplate" type="checkbox"/> <oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveAssessmentTemplate" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.showSaveAssessmentTemplate() ? 'checked': 'unchecked'" job="<%= job %>"> <oneit:recalcClass htmlTag="span" classScript="job.showSaveAssessmentTemplate() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="save-assess-check"> <label for="save-assess-check">
<oneit:label GUIName="Save Job Details and Requirements as a new template (this will not publish the Job)" /> <oneit:label GUIName="Save Job Details and Requirements as a new template (this will not publish the Job)" />
</label> </label>
</oneit:recalcClass> </oneit:recalcClass>
</div>
</div> </div>
</div> </div>
<oneit:recalcClass htmlTag="div" classScript="job.showSaveAssessmentTemplate() ? 'form-group template-save show': 'form-group template-save hide'" job="<%= job %>"> </div>
<div class="input-group input-group-lg"> <oneit:recalcClass htmlTag="div" classScript="job.showSaveAssessmentTemplate() ? 'form-group template-save show': 'form-group template-save hide'" job="<%= job %>">
<div class="icon-addon addon-lg"> <div class="input-group input-group-lg">
<oneit:ormInput obj="<%= job %>" type="text" attributeName="AssessmentTemplateName" cssClass="form-control" /> <div class="icon-addon addon-lg">
</div> <oneit:ormInput obj="<%= job %>" type="text" attributeName="AssessmentTemplateName" cssClass="form-control" />
<span class="input-group-btn">
<oneit:button value="SAVE" name="saveRequirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
</span>
</div> </div>
</oneit:recalcClass> <span class="input-group-btn">
<oneit:button value="SAVE" name="saveRequirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
</span>
</div>
</oneit:recalcClass> </oneit:recalcClass>
<div class="text-center"> <div class="text-center">
<oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn greyBtn" <oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn greyBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
.mapEntry("DraftLocation", DraftLocation.ASSESSMENT) .mapEntry("DraftLocation", DraftLocation.ASSESSMENT)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) .mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/> .toMap() %>"/>
<oneit:button value="Proceed to Culture" 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) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.mapEntry("fromAssessment", true) .mapEntry("fromAssessment", true)
.toMap() %>" /> .toMap() %>" />
</div>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/culture_templates.jsp
...@@ -21,17 +21,10 @@ ...@@ -21,17 +21,10 @@
response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request)); response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
} }
CultureCriteriaTemplate[] templates = (CultureCriteriaTemplate[]) process.getAttribute("CultureCriteriaTemplates"); CultureCriteriaTemplate[] templates = CultureCriteriaTemplate.SearchByAll()
.andHiringTeam(new EqualsFilter<>(hiringTeam))
if(templates == null) .andCompanyUser(new EqualsFilter<>(companyUser))
{ .search(transaction);
templates = CultureCriteriaTemplate.SearchByAll()
.andHiringTeam(new EqualsFilter<>(hiringTeam))
.andCompanyUser(new EqualsFilter<>(companyUser))
.search(transaction);
process.setAttribute("CultureCriteriaTemplates", templates);
}
// handle client // handle client
if( parameterMap.containsKey("Client")) if( parameterMap.containsKey("Client"))
...@@ -94,17 +87,24 @@ ...@@ -94,17 +87,24 @@
%> %>
<div class="template-list" id="<%= template.getID() %>"> <div class="template-list" id="<%= template.getID() %>">
<div class="template-row"> <div class="template-row">
<div class="job-template-left job-template-cl1 culture"> <div class="job-template-left job-template-cl1 culture <%= hiringTeam.showHasClientSupport() ? "" : "no-client"%>">
<div class="template-name heading"> <div class="template-name heading">
<oneit:toString value="<%= template.getTemplateName() %>" mode="EscapeHTML" /> <oneit:toString value="<%= template.getTemplateName() %>" mode="EscapeHTML" />
</div> </div>
</div> </div>
<div class="job-template-left job-template-cl2"> <%
<span class="grey-span">CLIENT</span> if(hiringTeam.showHasClientSupport())
<div class="template-name"> {
<oneit:toString value="<%= template.getClient() %>" mode="EscapeHTML" /> %>
</div> <div class="job-template-left job-template-cl2">
</div> <span class="grey-span">CLIENT</span>
<div class="template-name">
<oneit:toString value="<%= template.getClient() %>" mode="EscapeHTML" />
</div>
</div>
<%
}
%>
<div class="job-template-left job-template-cl4"> <div class="job-template-left job-template-cl4">
<span class="grey-span">LAST UPDATED</span> <span class="grey-span">LAST UPDATED</span>
<div class="template-name"> <div class="template-name">
......
cmsWebApp/webroot/extensions/adminportal/edit_culture_template.jsp
...@@ -11,6 +11,15 @@ ...@@ -11,6 +11,15 @@
String nextPage = WebUtils.getSamePageInRenderMode(request, "Page"); String nextPage = WebUtils.getSamePageInRenderMode(request, "Page");
Debug.assertion(template != null && !toRedirect, "Invalid template in culture templates"); Debug.assertion(template != null && !toRedirect, "Invalid template in culture templates");
SecUser secUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
HiringTeam hiringTeam = companyUser.getSelectedTeam();
if(hiringTeam != template.getHiringTeam())
{
response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
}
template.pipelineCultureCriteriaTemplate().toCultureCriterias().toCultureElement().toRatings().uniqueVals(); //preloading data template.pipelineCultureCriteriaTemplate().toCultureCriterias().toCultureElement().toRatings().uniqueVals(); //preloading data
%> %>
......
cmsWebApp/webroot/extensions/adminportal/inc/htmlheader.jsp
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
CompanyUser companyUser = clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser companyUser = clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
User intercomUser = (User)session.getAttribute("IntercomUser"); User intercomUser = (User)session.getAttribute("IntercomUser");
HiringTeam selectedTeam = (HiringTeam) session.getAttribute("SelectedHiringTeam"); HiringTeam selectedTeam = (HiringTeam) session.getAttribute("SelectedHiringTeam");
String gtmKey = oneit.appservices.config.ConfigMgr.getKeyfileString("gtm.key","GTM-M6M4SW6");
if(selectedTeam != null && companyUser != null) if(selectedTeam != null && companyUser != null)
{ {
companyUser.setSelectedTeam(selectedTeam.getInTransaction(objTran)); companyUser.setSelectedTeam(selectedTeam.getInTransaction(objTran));
...@@ -47,7 +48,7 @@ ...@@ -47,7 +48,7 @@
}]; }];
</script> </script>
<script> <script>
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-WFZ4NVT'); (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','<%= gtmKey %>');
</script> </script>
<!-- End Google Tag Manager --> <!-- End Google Tag Manager -->
</head> </head>
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
</script> </script>
<body> <body>
<!-- Google Tag Manager (noscript) --> <!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WFZ4NVT" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= gtmKey %>" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) --> <!-- End Google Tag Manager (noscript) -->
<% <%
boolean isMobile = BrowserServices.isMobile(request); boolean isMobile = BrowserServices.isMobile(request);
......
cmsWebApp/webroot/extensions/adminportal/inc/htmlheader_nopriv.jsp
...@@ -8,16 +8,19 @@ ...@@ -8,16 +8,19 @@
<%@include file="/inc/std_imports.jsp" %> <%@include file="/inc/std_imports.jsp" %>
<%@include file="/heapAnalysis.jsp" %> <%@include file="/heapAnalysis.jsp" %>
<%
String gtmKey = oneit.appservices.config.ConfigMgr.getKeyfileString("gtm.key","GTM-M6M4SW6");
%>
<!-- Google Tag Manager --> <!-- Google Tag Manager -->
<script> <script>
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-WFZ4NVT'); (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','<%= gtmKey %>');
</script> </script>
<!-- End Google Tag Manager --> <!-- End Google Tag Manager -->
</head> </head>
<body class="bg-color"> <body class="bg-color">
<!-- Google Tag Manager (noscript) --> <!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WFZ4NVT" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= gtmKey %>" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) --> <!-- End Google Tag Manager (noscript) -->
<div class="container"> <div class="container">
<div class="row"> <div class="row">
......
cmsWebApp/webroot/extensions/adminportal/inc/view_application_tab_applicant.jsp
...@@ -88,6 +88,10 @@ ...@@ -88,6 +88,10 @@
$('.save-application').click(); $('.save-application').click();
}); });
}); });
function previewCV(){
$('#pdfPreview').modal('show');
}
</script> </script>
<div class="main-applicant-content dashboard-content-area v-applicant-area "> <div class="main-applicant-content dashboard-content-area v-applicant-area ">
<div class="applicant-header"> <div class="applicant-header">
...@@ -103,6 +107,16 @@ ...@@ -103,6 +107,16 @@
</div> </div>
</div> </div>
<div class="main-export"> <div class="main-export">
<%
if(jobApplication.getCV() != null && jobApplication.getCoverLetter() != null)
{
%>
<a href="#" class="btn cv-cover-letter" onclick="previewCV()">
<img src="images/icon-paper-clip.png" />CV & Cover Letter
</a>
<%
}
%>
<span class="export-candidate" style="display: none;"> <span class="export-candidate" style="display: none;">
<select class="form-control"> <select class="form-control">
<option>Export Candidate Report</option> <option>Export Candidate Report</option>
...@@ -648,27 +662,88 @@ ...@@ -648,27 +662,88 @@
} }
%> %>
</div> </div>
<%--
<div class="applicant-note" > <div class="applicant-note" >
<div class="applicant-note-title">Notes</div> <div class="applicant-note-title">Notes</div>
<div class="note-txt-box"> <div class="note-txt-box">
<textarea class="form-control"></textarea> <oneit:ormtextarea obj="<%= jobApplication %>" attributeName="Note" cssClass="form-control"/>
<input type="button" class="add-note-btn" value="ADD NOTE" /> <oneit:button name="addNote" value="ADD NOTE" cssClass="add-note-btn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Applications", applications).mapEntry("Job", job).toMap())
.mapEntry ("attribNamesToRestore", new HashSet<String> (Arrays.asList(new String[] {"Job", "JobApplication", "Applications"})))
.mapEntry("JobApplication", jobApplication)
.toMap() %>" />
</div> </div>
</div> </div>
<div class="admin-notes"> <div class="admin-notes">
<div class="admin-name">Admin name</div> <%
<div class="date-value">TODAY</div> for (Note note : jobApplication.getNotesSet())
<div class="admin-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent accumsan interdum nisi, sed laoreet dui rhoncus.</div> {
<div class="admin-br-line"></div> %>
<div class="admin-name">Admin name</div> <div class="admin-name"><oneit:toString value="<%= note.getCreatedUser() %>" mode="EscapeHTML"/></div>
<div class="date-value">2 days ago</div> <div class="date-value"><oneit:toString value="<%= note.getObjectCreated() %>" mode="MidDate"/></div>
<div class="admin-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit.</div> <div class="admin-text"><oneit:toString value="<%= note.getComment() %>" mode="EscapeHTML"/></div>
<div class="admin-br-line"></div>
<%
}
%>
</div> </div>
--%>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="pdfPreview" role="dialog">
<div class="modal-dialog cv">
<div class="modal-body cv-popup">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<ul class="nav nav-tabs">
<li class="tab-heading active"><a data-toggle="tab" href="#cl">Cover Letter</a></li>
<li class="tab-heading"><a data-toggle="tab" href="#cv">Curriculum Vitae</a></li>
</ul>
<div class="tab-content">
<div id="cl" class="tab-pane fade in active" style="height:1200px; padding-top:40px;">
<%
if(jobApplication.getCoverLetter() != null && jobApplication.getCoverLetter().getContentType().contains("pdf"))
{
%>
<embed height="100%" width="80%" scrolling="yes" src="<%= request.getContextPath() + "/" + BinaryContentHandler.getRelativeURL(request, jobApplication, "CoverLetter", jobApplication.getCoverLetter(), true) %>#zoom=100"/>
<%
}
else
{
%>
<div class="no-preview">No preview available</div>
<a class="btn download-btn" href='<%= request.getContextPath() + "/" + BinaryContentHandler.getRelativeURL(request, jobApplication, "CoverLetter", jobApplication.getCoverLetter(), true) %>'>
<img src="images/icon-download-large.png" />Download
</a>
<%
}
%>
</div>
<div id="cv" class="tab-pane fade in" style="height:1200px; padding-top:40px;">
<%
if(jobApplication.getCV() != null && jobApplication.getCV().getContentType().contains("pdf"))
{
%>
<embed height="100%" width="80%" scrolling="yes" src="<%= request.getContextPath() + "/" + BinaryContentHandler.getRelativeURL(request, jobApplication, "CV", jobApplication.getCV(), true) %>#zoom=100"/>
<%
}
else
{
%>
<div class="no-preview">No preview available</div>
<a class="btn download-btn" href='<%= request.getContextPath() + "/" + BinaryContentHandler.getRelativeURL(request, jobApplication, "CV", jobApplication.getCV(), true) %>'>
<img src="images/icon-download-large.png" />Download
</a>
<%
}
%>
</div>
</div>
</div>
</div>
</div>
</oneit:dynIncluded> </oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/job_start_point.jsp
...@@ -30,7 +30,11 @@ ...@@ -30,7 +30,11 @@
job.setIndustry(hiringTeam.getIndustry()); job.setIndustry(hiringTeam.getIndustry());
job.setGoogleAddressText(hiringTeam.getGoogleAddressText()); job.setGoogleAddressText(hiringTeam.getGoogleAddressText());
%> %>
<style>
.rectangle-4.special{
height: 260px;
}
</style>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
...@@ -81,29 +85,33 @@ ...@@ -81,29 +85,33 @@
<div class="form-group row"> <div class="form-group row">
<div class="col-md-6"> <div class="col-md-6">
<div class="oneit-radio"> <div class="oneit-radio">
<label class="create-job-selector rectangle-4"> <oneit:recalcClass htmlTag="label" classScript="job.getTemplateClass(isTeamplate)" job="<%= job %>" isTeamplate="<%= true %>">
<span class="create-job-icon from-template"></span> <span class="create-job-icon from-template"></span>
<!--<img src="images/create_from_template.png">--> <!--<img src="images/create_from_template.png">-->
<h3>Create from template</h3> <h3>Create from template</h3>
<oneit:ormInput obj="<%= job %>" type="radio" attributeName="FromTemplate" value="true"/> <oneit:ormInput obj="<%= job %>" type="radio" attributeName="FromTemplate" value="true"/>
<div> <oneit:recalcClass htmlTag="div" classScript="hiringTeam.showHasClientSupport() ? 'show': 'hide'" hiringTeam="<%= hiringTeam %>">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="AssessmentTemplate" options="<%= job.getAssessmentTemplates() %>" <tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByHiringTeam(transaction) %>"
blankValue="Select your template" disabled='true'/> blankValue="No Client"/>
</oneit:recalcClass>
<div style="padding-top:10px;">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="AssessmentTemplate" optionsScript="job.getAssessmentTemplates()" job="<%= job%>"
blankValue="Select your template"/>
</div> </div>
</label> </oneit:recalcClass>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="oneit-radio" > <div class="oneit-radio">
<label class="create-job-selector rectangle-4"> <oneit:recalcClass htmlTag="label" classScript="job.getTemplateClass(isTeamplate)" job="<%= job %>" isTeamplate="<%= false %>">
<span class="create-job-icon new-job"></span> <span class="create-job-icon new-job"></span>
<!--<img src="images/create_new_job.png">--> <!--<img src="images/create_new_job.png">-->
<h3>Create a new job</h3> <h3>Create a new job</h3>
<oneit:ormInput obj="<%= job %>" type="radio" attributeName="FromTemplate" value="false"/> <oneit:ormInput obj="<%= job %>" type="radio" attributeName="FromTemplate" value="false"/>
<div> <div>
New jobs can be saved as a template to be used in future. New jobs can be saved as a template to be used in future.
</div> </div>
</label> </oneit:recalcClass>
</div> </div>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/job_templates.jsp
...@@ -21,18 +21,11 @@ ...@@ -21,18 +21,11 @@
response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request)); response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
} }
AssessmentCriteriaTemplate[] templates = (AssessmentCriteriaTemplate[]) process.getAttribute("AssessmentCriteriaTemplates"); AssessmentCriteriaTemplate[] templates = AssessmentCriteriaTemplate.SearchByAll()
.andHiringTeam(new EqualsFilter<>(hiringTeam))
.andCompanyUser(new EqualsFilter<>(companyUser))
.search(transaction);
if(templates == null)
{
templates = AssessmentCriteriaTemplate.SearchByAll()
.andHiringTeam(new EqualsFilter<>(hiringTeam))
.andCompanyUser(new EqualsFilter<>(companyUser))
.search(transaction);
process.setAttribute("AssessmentCriteriaTemplates", templates);
}
// handle client // handle client
if( parameterMap.containsKey("Client")) if( parameterMap.containsKey("Client"))
{ {
...@@ -94,7 +87,7 @@ ...@@ -94,7 +87,7 @@
%> %>
<div class="template-list" id="<%= template.getID() %>"> <div class="template-list" id="<%= template.getID() %>">
<div class="template-row"> <div class="template-row">
<div class="job-template-left job-template-cl1"> <div class="job-template-left job-template-cl1 <%= hiringTeam.showHasClientSupport() ? "" : "no-client"%>">
<div class="template-name heading"> <div class="template-name heading">
<oneit:toString value="<%= template.getTemplateName() %>" mode="EscapeHTML" /> <oneit:toString value="<%= template.getTemplateName() %>" mode="EscapeHTML" />
</div> </div>
...@@ -105,12 +98,19 @@ ...@@ -105,12 +98,19 @@
<oneit:toString value="<%= template.getJobTitle() %>" mode="EscapeHTML" /> <oneit:toString value="<%= template.getJobTitle() %>" mode="EscapeHTML" />
</div> </div>
</div> </div>
<div class="job-template-left job-template-cl3"> <%
<span class="grey-span">CLIENT</span> if(hiringTeam.showHasClientSupport())
<div class="template-name"> {
<oneit:toString value="<%= template.getClient() %>" mode="EscapeHTML" /> %>
</div> <div class="job-template-left job-template-cl3">
</div> <span class="grey-span">CLIENT</span>
<div class="template-name">
<oneit:toString value="<%= template.getClient() %>" mode="EscapeHTML" />
</div>
</div>
<%
}
%>
<div class="job-template-left job-template-cl4"> <div class="job-template-left job-template-cl4">
<span class="grey-span">LAST UPDATED</span> <span class="grey-span">LAST UPDATED</span>
<div class="template-name"> <div class="template-name">
......
cmsWebApp/webroot/extensions/adminportal/list_clients.jsp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
String clientPage = WebUtils.getSamePageInRenderMode(request, "Page"); String clientPage = WebUtils.getSamePageInRenderMode(request, "Page");
ClientSortOption clientSortOpt = (ClientSortOption) process.getAttribute("ClientSortOption"); ClientSortOption clientSortOpt = (ClientSortOption) process.getAttribute("ClientSortOption");
Client[] clients = (Client[]) process.getAttribute("Clients"); Client[] clients = Utils.getClientsByHiringTeam(transaction);;
if( request.getParameter("ClientSortOption") != null) if( request.getParameter("ClientSortOption") != null)
{ {
...@@ -30,13 +30,6 @@ ...@@ -30,13 +30,6 @@
clientSortOpt = ClientSortOption.ALPHA_A_Z; clientSortOpt = ClientSortOption.ALPHA_A_Z;
} }
if(clients == null)
{
clients = Utils.getClientsByHiringTeam(transaction);
process.setAttribute("Clients", clients);
}
List<Client> sortedClients = Utils.getClientsSorted(clients, clientSortOpt); List<Client> sortedClients = Utils.getClientsSorted(clients, clientSortOpt);
process.setAttribute("ClientSortOption", clientSortOpt); process.setAttribute("ClientSortOption", clientSortOpt);
......
cmsWebApp/webroot/extensions/adminportal/list_jobs.jsp
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
Map<String, String[]> parameterMap = request.getParameterMap(); Map<String, String[]> parameterMap = request.getParameterMap();
SearchJob searchJob = (SearchJob) RunSearchExecutorFP.setupExecutor(request, SearchJob.REFERENCE_SearchJob, true); SearchJob searchJob = (SearchJob) RunSearchExecutorFP.setupExecutor(request, SearchJob.REFERENCE_SearchJob, true);
Job[] jobs = (Job[])process.getAttribute("jobs"); Job[] jobs = (Job[])process.getAttribute("jobs");
boolean canCreateJob = hiringTeam.allowJobCreation();
if(!hiringTeam.hasBillingSetup()) if(!hiringTeam.hasBillingSetup())
{ {
...@@ -237,7 +238,7 @@ ...@@ -237,7 +238,7 @@
%> %>
<oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" ShortlistPage="<%= shortlistPage %>" <oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" ShortlistPage="<%= shortlistPage %>"
NextPage="<%= nextPage%>" HomePage="<%= homePage%>" Jobs="<%= sortedJobs.toArray(new Job[0]) %>" JobStatus="<%= jobStatus %>" NextPage="<%= nextPage%>" HomePage="<%= homePage%>" Jobs="<%= sortedJobs.toArray(new Job[0]) %>" JobStatus="<%= jobStatus %>"
JobSortOption="<%= jobSortOpt %>" /> JobSortOption="<%= jobSortOpt %>" CanCreateJob="<%= canCreateJob %>" CompanyUser="<%= companyUser %>"/>
<% <%
} }
%> %>
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
...@@ -12,6 +12,7 @@ Job.State = State or Province ...@@ -12,6 +12,7 @@ Job.State = State or Province
Job.JobTemplate = Job Template 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
CultureCriteria.Importance = Rate Importance CultureCriteria.Importance = Rate Importance
CultureCriteria.CultureElementRating = Rating CultureCriteria.CultureElementRating = Rating
......
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
{ {
%> %>
<oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" ShortlistPage="<%= shortlistPage %>" <oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>" ShortlistPage="<%= shortlistPage %>"
NextPage="<%= nextPage%>" HomePage="<%= homePage%>" NextPage="<%= nextPage%>" HomePage="<%= homePage%>" CanCreateJob="<%= canCreateJob %>" CompanyUser="<%= companyUser %>"
Jobs="<%= CollectionUtils.batch(recentJobs, 10).get(0).toArray(new Job[0]) %>"/> Jobs="<%= CollectionUtils.batch(recentJobs, 10).get(0).toArray(new Job[0]) %>"/>
<% <%
} }
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20190110_Note.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.DefineTableOperation">
<tableName factory="String">tl_note</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="comment" type="String" nullable="false" length="1000"/>
<column name="created_user_id" type="Long" length="11" nullable="false"/>
<column name="job_application_id" type="Long" length="11" nullable="false"/>
</NODE>
<NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_note" indexName="idx_tl_note_job_application_id" isUnique="false">
<column name="job_application_id"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20190113_Alter_Occupation.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_occupation</tableName>
<column name="assessment_type" type="String" nullable="true" length="200"/>
<column name="assessment_level_id" type="Long" length="11" nullable="true"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/performa/customers.jsp
...@@ -108,9 +108,7 @@ ...@@ -108,9 +108,7 @@
<div class="client-row" > <div class="client-row" >
<div class="client-name-cell jl-c" style="width:50%;"> <div class="client-name-cell jl-c" style="width:50%;">
<div class="client-name"> <div class="client-name">
<a href="<%= "&ClientID="+hiringTeam.getObjectID() %>">
<oneit:toString value="<%= hiringTeam.getHiringTeamName() %>" mode="EscapeHTML" /> <oneit:toString value="<%= hiringTeam.getHiringTeamName() %>" mode="EscapeHTML" />
</a>
</div> </div>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/performa/upgrades/20190213_Add_GTM_key.txt 0 → 100644
Add GTM key to keyfile properties in production as follows
gtm.key=GTM-WFZ4NVT
\ No newline at end of file
cmsWebApp/webroot/images/icon-extend.svg 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="17px" viewBox="0 0 20 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: sketchtool 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
<title>AF0E9984-0C6C-4A1E-ADAB-1379B1E82F72</title>
<desc>Created with sketchtool.</desc>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="Job-Card---Active" transform="translate(-297.000000, -63.000000)" stroke="#03A0E7" stroke-width="0.5">
<g id="Job-Card">
<g id="Meta" transform="translate(39.000000, 26.000000)">
<g id="icon-extend" transform="translate(258.000000, 37.000000)">
<path d="M4.68181818,13.8501818 C1.75202485,11.1121736 1.38603787,6.59474971 3.83686531,3.42082111 C5.93222546,0.707238192 9.49847354,-0.26271468 12.6074471,0.851621824" id="Shape"></path>
<polyline id="Shape" points="15.3181818 7.13472727 15.3181818 2.45290909 20 2.45290909"></polyline>
<polyline id="Shape" points="4.68181818 9.22563636 4.68181818 13.9074545 0 13.9074545"></polyline>
<path d="M15.3181818,2.51263636 C18.2524379,5.25843462 18.6098632,9.78822684 16.1425546,12.960238 C13.9801154,15.7403043 10.2728343,16.6739556 7.11186564,15.4024604" id="Shape"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
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