Skip to content

P
PERFORMA_REPLICA
Commit de369962 by nilu
Options

S34576305 # Client - Incoming Issues (raised by Client) #Expose Assessment length

parent 67caa0f9
Showing with 178 additions and 56 deletions
cmsWebApp/sql/Occupation.xml
......@@ -12,7 +12,9 @@
<column name="name" type="String" nullable="false" length="250"/>
<column name="level" type="String" nullable="false" length="200"/>
<column name="assessment_type" type="String" nullable="true" length="200"/>
<column name="parttime_assessment_type" type="String" nullable="true" length="200"/>
<column name="assessment_level_id" type="Long" length="11" nullable="true"/>
<column name="express_assessment_level_id" type="Long" length="11" nullable="true"/>
<column name="parent_occupation_id" type="Long" length="11" nullable="true"/>
</NODE>
......
cmsWebApp/sql/ms/Occupation.sql
......@@ -12,7 +12,9 @@ CREATE TABLE tl_occupation (
name varchar(250) NOT NULL,
level varchar(200) NOT NULL,
assessment_type varchar(200) NULL,
parttime_assessment_type varchar(200) NULL,
assessment_level_id numeric(12) NULL,
express_assessment_level_id numeric(12) NULL,
parent_occupation_id numeric(12) NULL
);
......
cmsWebApp/sql/oracle/Occupation.sql
......@@ -13,7 +13,9 @@ CREATE TABLE tl_occupation (
name varchar2(250) NOT NULL,
level varchar2(200) NOT NULL,
assessment_type varchar2(200) NULL,
parttime_assessment_type varchar2(200) NULL,
assessment_level_id number(12) NULL,
express_assessment_level_id number(12) NULL,
parent_occupation_id number(12) NULL
);
......
cmsWebApp/sql/postgres/Occupation.sql
......@@ -13,7 +13,9 @@ CREATE TABLE tl_occupation (
name varchar(250) NOT NULL,
level varchar(200) NOT NULL,
assessment_type varchar(200) NULL,
parttime_assessment_type varchar(200) NULL,
assessment_level_id numeric(12) NULL,
express_assessment_level_id numeric(12) NULL,
parent_occupation_id numeric(12) NULL
);
......
cmsWebApp/src/performa/orm/ILOJobTitle.java
package performa.orm;
import java.io.*;
import java.util.*;
import oneit.appservices.config.*;
import oneit.logging.*;
import oneit.objstore.*;
import oneit.utils.*;
import performa.orm.types.*;
public class ILOJobTitle extends BaseILOJobTitle
{
......@@ -31,5 +19,4 @@ public class ILOJobTitle extends BaseILOJobTitle
return StringUtils.subNulls(getJobTitle(), super.getToString());
}
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/Job.java
......@@ -744,12 +744,44 @@ public class Job extends BaseJob
if(occupation != null)
{
setOccupation(occupation);
setLevel(occupation.getAssessmentLevel());
setAssessmentType(occupation.getAssessmentType());
setSuggestedAssessmentType(getJobType() == JobType.FULL_TIME ? occupation.getAssessmentType() : occupation.getPartTimeAssessmentType());
setAssessmentType(getJobType() == JobType.FULL_TIME ? occupation.getAssessmentType() : occupation.getPartTimeAssessmentType());
setLevel(getAssessmentType() == AssessmentType.COMPREHENSIVE ? occupation.getAssessmentLevel() : occupation.getExpressAssessmentLevel());
}
super.postILOJobTitleChange();
}
@Override
protected void postJobTypeChange() throws FieldException
{
Occupation occupation = getILOJobTitle() != null ? getILOJobTitle().getOccupation() : null;
if(occupation != null)
{
setSuggestedAssessmentType(getJobType() == JobType.FULL_TIME ? occupation.getAssessmentType() : occupation.getPartTimeAssessmentType());
setAssessmentType(getJobType() == JobType.FULL_TIME ? occupation.getAssessmentType() : occupation.getPartTimeAssessmentType());
setLevel(getAssessmentType() == AssessmentType.COMPREHENSIVE ? occupation.getAssessmentLevel() : occupation.getExpressAssessmentLevel());
}
super.postJobTypeChange();
}
@Override
public AssessmentType getSuggestedAssessmentType()
{
Occupation occupation = getILOJobTitle() != null ? getILOJobTitle().getOccupation() : null;
if(occupation != null)
{
return getJobType() == JobType.FULL_TIME ? occupation.getAssessmentType() : occupation.getPartTimeAssessmentType();
}
return super.getSuggestedAssessmentType();
}
public Occupation displayOccupation()
{
......
cmsWebApp/src/performa/orm/Job.xml
......@@ -24,6 +24,7 @@
<TRANSIENT name="AssessmentTemplateName" type="String"/>
<TRANSIENT name="CultureTemplateName" type="String"/>
<TRANSIENT name="AppProcessOption" type="AppProcessOption" attribHelper="EnumeratedAttributeHelper"/>
<TRANSIENT name="SuggestedAssessmentType" type="AssessmentType" attribHelper="EnumeratedAttributeHelper"/>
<TRANSIENT name="RankingCompleted" type="Boolean" />
<TRANSIENTSINGLE name="CultureTemplate" type="CultureCriteriaTemplate" />
......
cmsWebApp/src/performa/orm/Occupation.xml
......@@ -9,13 +9,15 @@
<MULTIPLEREFERENCE name="ChildOccupations" type="Occupation" backreferenceName="ParentOccupation" />
<TABLE name="tl_occupation" tablePrefix="object" polymorphic="FALSE">
<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="Level" type="OccupationLevel" dbcol="level" attribHelper="EnumeratedAttributeHelper" mandatory="true"/>
<ATTRIB name="AssessmentType" type="AssessmentType" dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper" />
<SINGLEREFERENCE name="AssessmentLevel" type="Level" dbcol="assessment_level_id" />
<SINGLEREFERENCE name="ParentOccupation" type="Occupation" dbcol="parent_occupation_id" backreferenceName="ChildOccupations"/>
<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="Level" type="OccupationLevel" dbcol="level" attribHelper="EnumeratedAttributeHelper" mandatory="true"/>
<ATTRIB name="AssessmentType" type="AssessmentType" dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper" />
<ATTRIB name="PartTimeAssessmentType" type="AssessmentType" dbcol="parttime_assessment_type" attribHelper="EnumeratedAttributeHelper" />
<SINGLEREFERENCE name="AssessmentLevel" type="Level" dbcol="assessment_level_id" />
<SINGLEREFERENCE name="ExpressAssessmentLevel" type="Level" dbcol="express_assessment_level_id" />
<SINGLEREFERENCE name="ParentOccupation" type="Occupation" dbcol="parent_occupation_id" backreferenceName="ChildOccupations"/>
</TABLE>
<SEARCH type="All" paramFilter="object_id is not null" orderBy="object_id"/>
......
cmsWebApp/src/performa/utils/AssessmentTypeEnumFormatter.java 0 → 100644
package performa.utils;
import oneit.utils.FormatterFactory;
import performa.orm.Job;
import performa.orm.types.AssessmentType;
public class AssessmentTypeEnumFormatter implements FormatterFactory
{
private Job job;
public AssessmentTypeEnumFormatter(Job job)
{
this.job = job;
}
@Override
public Object getFormatterFor(Object objectToFormat)
{
AssessmentType assessmentType = ((AssessmentType) objectToFormat);
if(job.getSuggestedAssessmentType() == assessmentType)
{
return assessmentType.getDescription() + " (Suggested)";
}
return assessmentType.getDescription();
}
}
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
......@@ -81,6 +81,9 @@
<INHERITS factory="Named" nodename="CoreORMAdminNoPriv"/>
</NODE>
<NODE name="assessment_type_selector_jsp" factory="Participant">
<INHERITS factory="Named" nodename="CoreORMAdminNoPriv"/>
</NODE>
<NODE name="signin_jsp" factory="Participant">
<INHERITS factory="Named" nodename="CoreORMAdminNoPriv"/>
......
cmsWebApp/webroot/extensions/adminportal/inc/assessment_type_selector.jsp 0 → 100644
<%@ page extends="oneit.servlets.process.AJAXProcessJSP" %>
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
<%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<%@ include file="/inc/std_imports.jsp" %>
<%! protected String getName (ServletConfig config) { return "assessment_type_selector_jsp"; } %>
<%
ORMProcessState process = (ORMProcessState) ProcessDecorator.getDefaultProcess(request);
ObjectTransaction objTran = process.getTransaction ();
Job job = (Job) process.getAttribute("Job");
Long jobTitleID = request.getParameter("jobTitleID") != null ? Long.valueOf(request.getParameter("jobTitleID")) : null;
String jobTypeName = request.getParameter("jobTypeName");
if(jobTypeName != null)
{
JobType jobType = JobType.forName(jobTypeName);
job.setJobType(jobType);
}
if(jobTitleID != null)
{
ILOJobTitle jobTitle = ILOJobTitle.getILOJobTitleByID(objTran, jobTitleID);
job.setILOJobTitle(jobTitle);
}
%>
<oneit:form name="editJob" method="POST">
<oneit:evalBody buffer="<%= getBuffer(request) %>">
<oneit:ormEnum obj="<%= job %>" attributeName="AssessmentType" cssClass="form-control" enumFormatter="<%= new AssessmentTypeEnumFormatter(job) %>"/>
</oneit:evalBody>
</oneit:form>
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
......@@ -46,6 +46,24 @@
$("button[name$='loadJobFromTemplate']").click();
});
$('input[type="text"][id$="ILOJobTitle_autocomplete"]').change(function()
{
$( "select[name$='AssessmentType']" ).remove();
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/assessment_type_selector.jsp", "#assessment_type", {jobTitleID : $('input[type="hidden"][id$="JobTitle"]').val()}, function (theHTML_JQ) {
$("#assessment_type").append (theHTML_JQ);
});
});
$("select[name$='JobType']").change(function()
{
$( "select[name$='AssessmentType']" ).remove();
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/assessment_type_selector.jsp", "#assessment_type", {jobTypeName : $(this).val()}, function (theHTML_JQ) {
$("#assessment_type").append (theHTML_JQ);
});
});
if ($("#select-occupation-id").val()) {
lastclickedOccid = $("#select-occupation-id").val();
}else {
......@@ -164,6 +182,10 @@
$("#occupation span").addClass("form-control");
$("#occupation span").css({"padding":"15px","display":"inline-table"});
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/assessment_type_selector.jsp", "#assessment_type", {}, function (theHTML_JQ) {
$("#assessment_type").append (theHTML_JQ);
});
});
......@@ -335,32 +357,6 @@
<label class="label-16">Job Location</label>
</div>
</div>
<%--
<div class="form-group row">
<div class="col-md-6">
<label><oneit:ormlabel obj="<%= job %>" field="Country" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="Country" cssClass="form-control"/>
</div>
<div class="col-md-6">
<label><oneit:label GUIName="State or Province"/></label>
<oneit:ormEnum obj="<%= job %>" attributeName="State" cssClass="form-control"/>
</div>
</div>
<div class="form-group row">
<div class="col-md-4">
<label><oneit:label GUIName="City or Town"/></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="City" cssClass="form-control" />
</div>
<div class="col-md-4">
<label><oneit:label GUIName="Zip / Post Code"/></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="PostCode" cssClass="form-control" />
</div>
<div class="col-md-4">
<label><oneit:label GUIName="Expected Candidate Radius"/></label>
<oneit:ormEnum obj="<%= job %>" attributeName="ExpectedCandidateRadius" cssClass="form-control"/>
</div>
</div>
--%>
<div class="form-group row">
<div class="col-md-8">
<label><oneit:label GUIName="Google Location"/></label>
......@@ -403,7 +399,6 @@
<oneit:recalc mode="EscapeHTML" script="job.displayOccupation()" job="<%= job %>"/>
</div>
</div>
<div class="form-group row">
<div class="col-md-6">
<label><oneit:label GUIName="Job Type" /></label>
......@@ -415,6 +410,12 @@
</div>
</div>
<div class="form-group row">
<div class="col-md-6" id="assessment_type">
<label><oneit:label GUIName="Assessment Length" /></label>
</div>
</div>
<div class="form-group row">
<div class="col-md-12">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20190514_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="parttime_assessment_type" type="String" nullable="true" length="200"/>
<column name="express_assessment_level_id" type="Long" length="11" nullable="true"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20190515_Update_Occupation.sql 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
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