Skip to content

P
PERFORMA_REPLICA
Commit 4f4c0d47 by nilu
Options

Merged 'develop'. 

# Conflicts:
#	cmsWebApp/src/performa/orm/Job.java
parents 6881ffbc 54fc188a
Showing with 104 additions and 47 deletions
cmsWebApp/sql/AssessmentCriteriaTemplate.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <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="object_created_date" type="Date" nullable="false" length="22"/>
<column name="template_name" type="String" nullable="true" length="100"/> <column name="template_name" type="String" nullable="true" length="100"/>
<column name="job_title" type="String" nullable="false" length="30"/> <column name="job_title" type="String" nullable="false" length="60"/>
<column name="job_description" type="CLOB" nullable="false"/> <column name="job_description" type="CLOB" nullable="false"/>
<column name="ref_number" type="String" nullable="true" length="10"/> <column name="ref_number" type="String" nullable="true" length="10"/>
<column name="google_address_text" type="String" nullable="false" length="300"/> <column name="google_address_text" type="String" nullable="false" length="300"/>
......
cmsWebApp/sql/ms/AssessmentCriteriaTemplate.sql
...@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -9,7 +9,7 @@ CREATE TABLE tl_assessment_template (
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
, ,
template_name varchar(100) NULL, template_name varchar(100) NULL,
job_title varchar(30) NOT NULL, job_title varchar(60) NOT NULL,
job_description text NOT NULL, job_description text NOT NULL,
ref_number varchar(10) NULL, ref_number varchar(10) NULL,
google_address_text varchar(300) NOT NULL, google_address_text varchar(300) NOT NULL,
......
cmsWebApp/sql/oracle/AssessmentCriteriaTemplate.sql
...@@ -10,7 +10,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -10,7 +10,7 @@ CREATE TABLE tl_assessment_template (
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
, ,
template_name varchar2(100) NULL, template_name varchar2(100) NULL,
job_title varchar2(30) NOT NULL, job_title varchar2(60) NOT NULL,
job_description clob NOT NULL, job_description clob NOT NULL,
ref_number varchar2(10) NULL, ref_number varchar2(10) NULL,
google_address_text varchar2(300) NOT NULL, google_address_text varchar2(300) NOT NULL,
......
cmsWebApp/sql/postgres/AssessmentCriteriaTemplate.sql
...@@ -10,7 +10,7 @@ CREATE TABLE tl_assessment_template ( ...@@ -10,7 +10,7 @@ CREATE TABLE tl_assessment_template (
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
, ,
template_name varchar(100) NULL, template_name varchar(100) NULL,
job_title varchar(30) NOT NULL, job_title varchar(60) NOT NULL,
job_description text NOT NULL, job_description text NOT NULL,
ref_number varchar(10) NULL, ref_number varchar(10) NULL,
google_address_text varchar(300) NOT NULL, google_address_text varchar(300) NOT NULL,
......
cmsWebApp/src/performa/orm/AssessmentCriteriaTemplate.xml
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<TABLE name="tl_assessment_template" tablePrefix="object" polymorphic="FALSE"> <TABLE name="tl_assessment_template" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="TemplateName" type="String" dbcol="template_name" length="100" uniqueGroup="TemplateID"/> <ATTRIB name="TemplateName" type="String" dbcol="template_name" length="100" uniqueGroup="TemplateID"/>
<ATTRIB name="JobTitle" type="String" dbcol="job_title" length="30" mandatory="true"/> <ATTRIB name="JobTitle" type="String" dbcol="job_title" length="60" mandatory="true"/>
<ATTRIB name="JobDescription" type="String" dbcol="job_description" mandatory="true"/> <ATTRIB name="JobDescription" type="String" dbcol="job_description" mandatory="true"/>
<ATTRIB name="ReferenceNumber" type="String" dbcol="ref_number" length="10"/> <ATTRIB name="ReferenceNumber" type="String" dbcol="ref_number" length="10"/>
<ATTRIB name="GoogleAddressText" type="String" dbcol="google_address_text" mandatory="true" length="300" /> <ATTRIB name="GoogleAddressText" type="String" dbcol="google_address_text" mandatory="true" length="300" />
......
cmsWebApp/src/performa/orm/BaseAssessmentCriteriaTemplate.java
...@@ -378,7 +378,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass ...@@ -378,7 +378,7 @@ public abstract class BaseAssessmentCriteriaTemplate extends BaseBusinessClass
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "job_title"); metaInfo.put ("dbcol", "job_title");
metaInfo.put ("length", "30"); metaInfo.put ("length", "60");
metaInfo.put ("mandatory", "true"); metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "JobTitle"); metaInfo.put ("name", "JobTitle");
metaInfo.put ("type", "String"); metaInfo.put ("type", "String");
......
cmsWebApp/src/performa/orm/Candidate.java
...@@ -6,6 +6,7 @@ import java.util.Collection; ...@@ -6,6 +6,7 @@ import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import oneit.logging.LoggingArea; import oneit.logging.LoggingArea;
import oneit.objstore.MessageSource; import oneit.objstore.MessageSource;
...@@ -113,22 +114,40 @@ public class Candidate extends BaseCandidate ...@@ -113,22 +114,40 @@ public class Candidate extends BaseCandidate
public boolean cultureCompleted(Job job) public boolean cultureCompleted(Job job)
{ {
int allAnswersCount = getCultureCriteriaAnswersCount(); if(!job.showCultureCriteriaSection())
if(job.showCultureCriteriaSection() && allAnswersCount == job.getCultureCriteriasCount())
{ {
Filter filter = CultureCriteriaAnswer.SearchByAll().andSelectedQuestion(new IsNotNullFilter<>()); return false;
Collection selectedAnswers = pipelineCandidate().toCultureCriteriaAnswers(filter).vals();
return (selectedAnswers.size() == allAnswersCount);
} }
return false; Set<CultureCriteriaAnswer> selectedAnswers = pipelineCandidate().toCultureCriteriaAnswers(CultureCriteriaAnswer.SearchByAll().andSelectedQuestion(new IsNotNullFilter<>())).uniqueVals();
Set<CultureElement> answeredElements = CultureCriteriaAnswer.pipesCultureCriteriaAnswer(selectedAnswers).toCultureElement().uniqueVals();
Set<CultureElement> applicableElements = CultureCriteria.pipesCultureCriteria(job.getApplicableCultureSet()).toCultureElement().uniqueVals();
return answeredElements.containsAll(applicableElements);
} }
public double cultureCompletedPercentage(Job job) public double cultureCompletedPercentage(Job job)
{ {
return job.showCultureCriteriaSection() ? (getCultureCriteriaAnswersCount() * 100) / job.getCultureCriteriasCount() : 0d; return job.showCultureCriteriaSection() ? (getApplicableCultureAnswerCount(job) * 100) / job.getApplicableCultureCount(): 0d;
}
public int getApplicableCultureAnswerCount(Job job)
{
int applicableAnswerCount = 0;
for(CultureCriteria cultureCriteria : job.getApplicableCultureSet())
{
for(CultureCriteriaAnswer answer : getCultureCriteriaAnswersSet())
{
if(CollectionUtils.equals(answer.getCultureElement(), cultureCriteria.getCultureElement()))
{
applicableAnswerCount+= 1;
break;
}
}
}
return applicableAnswerCount;
} }
public double roleFitCompletedPercentage(Job job) public double roleFitCompletedPercentage(Job job)
......
cmsWebApp/src/performa/orm/CultureCriteriaAnswer.java
package performa.orm; package performa.orm;
import java.util.SortedSet;
import oneit.utils.CollectionUtils; import oneit.utils.CollectionUtils;
...@@ -20,16 +19,13 @@ public class CultureCriteriaAnswer extends BaseCultureCriteriaAnswer ...@@ -20,16 +19,13 @@ public class CultureCriteriaAnswer extends BaseCultureCriteriaAnswer
{ {
CultureCriteria criteria = null; CultureCriteria criteria = null;
if(job!=null) if(job != null)
{ {
SortedSet<CultureCriteria> cultureCriteriasSet = job.getCultureCriteriasSet(); for(CultureCriteria cc: job.getApplicableCultureSet())
for(CultureCriteria cc: cultureCriteriasSet)
{ {
if(CollectionUtils.equals(cc.getCultureElement(), getCultureElement())) if(CollectionUtils.equals(cc.getCultureElement(), getCultureElement()))
{ {
criteria = cc; criteria = cc;
break; break;
} }
} }
......
cmsWebApp/src/performa/orm/Job.java
...@@ -827,4 +827,18 @@ public class Job extends BaseJob ...@@ -827,4 +827,18 @@ public class Job extends BaseJob
return null; return null;
} }
public int getApplicableCultureCount()
{
Filter<CultureCriteria> filter = CultureCriteria.SearchByAll().andIsApplicable(new EqualsFilter<>(Boolean.TRUE));
return pipelineJob().toCultureCriterias(filter).uniqueVals().size();
}
public Set<CultureCriteria> getApplicableCultureSet()
{
Filter<CultureCriteria> filter = CultureCriteria.SearchByAll().andIsApplicable(new EqualsFilter<>(Boolean.TRUE));
return pipelineJob().toCultureCriterias(filter).uniqueVals();
}
} }
\ No newline at end of file
cmsWebApp/src/performa/orm/JobApplication.java
...@@ -109,15 +109,13 @@ public class JobApplication extends BaseJobApplication ...@@ -109,15 +109,13 @@ public class JobApplication extends BaseJobApplication
if(getCV() != null) if(getCV() != null)
{ {
String contentType = getCV().getContentType(); String contentType = getCV().getContentType();
context.check(contentType.contains("msword") || contentType.contains("doc") || contentType.contains("docx") || contentType.contains("opendocument.text") context.check(contentType!= null && Utils.isValidContentType(contentType.toLowerCase()), this, FIELD_CV, "invalid");
|| contentType.contains("pdf") || contentType.contains("vnd.openxmlformats-officedocument.wordprocessingml.document") , this, FIELD_CV, "invalid");
} }
if(getCoverLetter() != null) if(getCoverLetter() != null)
{ {
String contentType = getCoverLetter().getContentType(); String contentType = getCoverLetter().getContentType();
context.check(contentType.contains("msword") || contentType.contains("doc") || contentType.contains("docx") || contentType.contains("opendocument.text") context.check(contentType!= null && Utils.isValidContentType(contentType.toLowerCase()) , this, FIELD_CoverLetter, "invalid");
|| contentType.contains("pdf") || contentType.contains("vnd.openxmlformats-officedocument.wordprocessingml.document") , this, FIELD_CoverLetter, "invalid");
} }
} }
catch(RuntimeException ex) catch(RuntimeException ex)
...@@ -174,7 +172,7 @@ public class JobApplication extends BaseJobApplication ...@@ -174,7 +172,7 @@ public class JobApplication extends BaseJobApplication
return safeRedirect; return safeRedirect;
} }
for(CultureCriteria cultureCriteria : getJob().getCultureCriteriasSet()) for(CultureCriteria cultureCriteria : getJob().getApplicableCultureSet())
{ {
boolean available = false; boolean available = false;
......
cmsWebApp/src/performa/orm/types/JobType.java
...@@ -20,6 +20,8 @@ public class JobType extends AbstractEnumerated ...@@ -20,6 +20,8 @@ public class JobType extends AbstractEnumerated
public static final EnumeratedFactory FACTORY_JobType = new JobTypeFactory(); public static final EnumeratedFactory FACTORY_JobType = new JobTypeFactory();
public static final JobType CASUAL = new JobType ("CASUAL", "CASUAL", "Casual", false);
public static final JobType FULL_TIME = new JobType ("FULL_TIME", "FULL_TIME", "Full Time", false); public static final JobType FULL_TIME = new JobType ("FULL_TIME", "FULL_TIME", "Full Time", false);
public static final JobType PART_TIME = new JobType ("PART_TIME", "PART_TIME", "Part Time", false); public static final JobType PART_TIME = new JobType ("PART_TIME", "PART_TIME", "Part Time", false);
...@@ -27,7 +29,7 @@ public class JobType extends AbstractEnumerated ...@@ -27,7 +29,7 @@ public class JobType extends AbstractEnumerated
public static final JobType CONTRACT = new JobType ("CONTRACT", "CONTRACT", "Contract", false); public static final JobType CONTRACT = new JobType ("CONTRACT", "CONTRACT", "Contract", false);
private static final JobType[] allJobTypes = private static final JobType[] allJobTypes =
new JobType[] { FULL_TIME,PART_TIME,CONTRACT}; new JobType[] { CASUAL,FULL_TIME,PART_TIME,CONTRACT};
private static JobType[] getAllJobTypes () private static JobType[] getAllJobTypes ()
......
cmsWebApp/src/performa/orm/types/JobType.xml
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<ROOT> <ROOT>
<CONSTANT package="performa.orm.types" name="JobType"> <CONSTANT package="performa.orm.types" name="JobType">
<VALUE name="CASUAL" value="CASUAL" description="Casual"/>
<VALUE name="FULL_TIME" value="FULL_TIME" description="Full Time"/> <VALUE name="FULL_TIME" value="FULL_TIME" description="Full Time"/>
<VALUE name="PART_TIME" value="PART_TIME" description="Part Time"/> <VALUE name="PART_TIME" value="PART_TIME" description="Part Time"/>
<VALUE name="CONTRACT" value="CONTRACT" description="Contract"/> <VALUE name="CONTRACT" value="CONTRACT" description="Contract"/>
......
cmsWebApp/src/performa/utils/PerformaEmailFetcher.java
...@@ -388,12 +388,22 @@ public class PerformaEmailFetcher implements Runnable, InitialisationParticipant ...@@ -388,12 +388,22 @@ public class PerformaEmailFetcher implements Runnable, InitialisationParticipant
if(contents.size() > 0) if(contents.size() > 0)
{ {
jobApplication.setCV(contents.get(0)); FileBinaryContent cv = contents.get(0);
if(cv.getContentType() != null && Utils.isValidContentType(cv.getContentType().toLowerCase()))
{
jobApplication.setCV(cv);
}
} }
if(contents.size() > 1) if(contents.size() > 1)
{ {
jobApplication.setCoverLetter(contents.get(1)); FileBinaryContent coverLetter = contents.get(0);
if(coverLetter.getContentType() != null && Utils.isValidContentType(coverLetter.getContentType().toLowerCase()))
{
jobApplication.setCoverLetter(contents.get(1));
}
} }
} }
...@@ -438,9 +448,14 @@ public class PerformaEmailFetcher implements Runnable, InitialisationParticipant ...@@ -438,9 +448,14 @@ public class PerformaEmailFetcher implements Runnable, InitialisationParticipant
jobApplication.setApplicationStatus(ApplicationStatus.POST_INGEST); jobApplication.setApplicationStatus(ApplicationStatus.POST_INGEST);
jobApplication.setIsEmailIngest(true); jobApplication.setIsEmailIngest(true);
if(contents.size() > 0) if(contents.size() > 0 )
{ {
jobApplication.setCV(contents.get(0)); FileBinaryContent cv = contents.get(0);
if(cv.getContentType() != null && Utils.isValidContentType(cv.getContentType().toLowerCase()))
{
jobApplication.setCV(cv);
}
} }
Document document = Jsoup.parse(messageBody); Document document = Jsoup.parse(messageBody);
......
cmsWebApp/src/performa/utils/Utils.java
...@@ -716,4 +716,10 @@ public class Utils ...@@ -716,4 +716,10 @@ public class Utils
{ {
return request.getSession ().getAttribute (oneit.security.jsp.AssumeUserFP.UNASSUME_SEC_USER_ID) != null; return request.getSession ().getAttribute (oneit.security.jsp.AssumeUserFP.UNASSUME_SEC_USER_ID) != null;
} }
public static boolean isValidContentType(String contentType)
{
return contentType.contains("msword") || contentType.contains("doc") || contentType.contains("docx") || contentType.contains("opendocument.text")
|| contentType.contains("pdf") || contentType.contains("vnd.openxmlformats-officedocument.wordprocessingml.document") || contentType.contains("text/plain");
}
} }
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp
...@@ -123,6 +123,16 @@ ...@@ -123,6 +123,16 @@
.toMap() %>"> .toMap() %>">
EDIT JOB EDIT JOB
</oneit:button> </oneit:button>
<oneit:button value=" " cssClass="job-edit-menu-item" name="downloadApplicantReport" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("AppView", appView)
.mapEntry("ApplicantPage", applicantPage)
.mapEntry("Applications", applications)
.mapEntry("Detailed", false)
.mapEntry("WorkFlow", workFlow)
.toMap() %>">
EXPORT APPLICANT REPORT
</oneit:button>
<% <%
if(applicantPage) if(applicantPage)
{ {
...@@ -131,16 +141,6 @@ ...@@ -131,16 +141,6 @@
requestAttribs="<%= CollectionUtils.mapEntry("AppView", appView) requestAttribs="<%= CollectionUtils.mapEntry("AppView", appView)
.mapEntry("ApplicantPage", applicantPage) .mapEntry("ApplicantPage", applicantPage)
.mapEntry("Applications", applications) .mapEntry("Applications", applications)
.mapEntry("Detailed", false)
.mapEntry("WorkFlow", workFlow)
.toMap() %>">
EXPORT APPLICANT REPORT
</oneit:button>
<oneit:button value=" " cssClass="job-edit-menu-item" name="downloadApplicantReport" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("AppView", appView)
.mapEntry("ApplicantPage", applicantPage)
.mapEntry("Applications", applications)
.mapEntry("Detailed", true) .mapEntry("Detailed", true)
.toMap() %>"> .toMap() %>">
EXPORT DETAILED APPLICANT REPORT EXPORT DETAILED APPLICANT REPORT
......
cmsWebApp/webroot/extensions/adminportal/inc/view_application_tab_applicant.jsp
...@@ -740,7 +740,7 @@ ...@@ -740,7 +740,7 @@
{ {
%> %>
<div class="no-preview">No preview available</div> <div class="no-preview">No preview available</div>
<a class="btn download-btn" href='<%= request.getContextPath() + "/" + BinaryContentHandler.getRelativeURL(request, jobApplication, "CoverLetter", jobApplication.getCoverLetter(), true) %>'> <a class="btn download-btn" target="_blank" href='<%= request.getContextPath() + "/" + BinaryContentHandler.getRelativeURL(request, jobApplication, "CoverLetter", jobApplication.getCoverLetter(), true) %>'>
<img src="images/icon-download-large.png" />Download <img src="images/icon-download-large.png" />Download
</a> </a>
<% <%
...@@ -759,7 +759,7 @@ ...@@ -759,7 +759,7 @@
{ {
%> %>
<div class="no-preview">No preview available</div> <div class="no-preview">No preview available</div>
<a class="btn download-btn" href='<%= request.getContextPath() + "/" + BinaryContentHandler.getRelativeURL(request, jobApplication, "CV", jobApplication.getCV(), true) %>'> <a class="btn download-btn" target="_blank" href='<%= request.getContextPath() + "/" + BinaryContentHandler.getRelativeURL(request, jobApplication, "CV", jobApplication.getCV(), true) %>'>
<img src="images/icon-download-large.png" />Download <img src="images/icon-download-large.png" />Download
</a> </a>
<% <%
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20190712_Alter_Assessment_Template.sql 0 → 100644
ALTER TABLE tl_assessment_template ALTER COLUMN job_title TYPE character varying(60);
\ No newline at end of file
cmsWebApp/webroot/extensions/applicantportal/sign_in.jsp
...@@ -135,10 +135,12 @@ ...@@ -135,10 +135,12 @@
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/>
</div> </div>
<div class="main-box-layout verify-i-setpone"> <div class="main-box-layout verify-i-setpone">
<%--
<div class="box-label">Sign in using your social network of choice</div> <div class="box-label">Sign in using your social network of choice</div>
<oneit:form name="socialLogin" method="post"> <oneit:form name="socialLogin" method="post">
<ul class="social-login"> <ul class="social-login">
<li> <li>
<oneit:button value=" " name="linkedinOAuthLogin" skin="link" cssClass="social_login_btn" <oneit:button value=" " name="linkedinOAuthLogin" skin="link" cssClass="social_login_btn"
disabled="<%= Utils.linkedInAvailable() ? "false" : "true" %>" disabled="<%= Utils.linkedInAvailable() ? "false" : "true" %>"
...@@ -153,7 +155,7 @@ ...@@ -153,7 +155,7 @@
<img src="<%= request.getContextPath() %>/images/login-facebok-icon.svg" /> <img src="<%= request.getContextPath() %>/images/login-facebok-icon.svg" />
</oneit:button> </oneit:button>
</li> </li>
<%--
<li> <li>
<oneit:button value=" " name="googleOAuthLogin" skin="link" cssClass="social_login_btn" <oneit:button value=" " name="googleOAuthLogin" skin="link" cssClass="social_login_btn"
disabled="<%= Utils.googleAvailable() ? "false" : "true" %>" disabled="<%= Utils.googleAvailable() ? "false" : "true" %>"
...@@ -161,17 +163,17 @@ ...@@ -161,17 +163,17 @@
<img src="<%= request.getContextPath() %>/images/login-google.png" /> <img src="<%= request.getContextPath() %>/images/login-google.png" />
</oneit:button> </oneit:button>
</li> </li>
--%>
</ul> </ul>
</oneit:form> </oneit:form>
<div class="box-br-line"><span></span></div> <div class="box-br-line"><span></span></div>
--%>
<oneit:form name="applyJob" method="post" enctype="multipart/form-data"> <oneit:form name="applyJob" method="post" enctype="multipart/form-data">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/> <oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="box-label">Or sign in via email</div> <%--<div class="box-label">Or sign in via email</div>--%>
<div class="form-group text-left" id="email-div"> <div class="form-group text-left" id="email-div">
<label>Email Address</label> <label>Email Address</label>
......
release/production.properties
...@@ -46,6 +46,6 @@ cd.deploy.dir=${dir.root}/Deploy/PerformaInvestments/CD_image ...@@ -46,6 +46,6 @@ cd.deploy.dir=${dir.root}/Deploy/PerformaInvestments/CD_image
key.file=${config.deploy.dir}/production.keyfile.properties key.file=${config.deploy.dir}/production.keyfile.properties
rsync.user=1itupdate rsync.user=1itupdate
rsync.server=54.153.249.224 rsync.server=app.matchd.com
tctransform.version=55 tctransform.version=55
rsync.port=40022 rsync.port=40022
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