Commit 2f8d8c4b by Nilu Committed by Harsh Shah

job review and assessment type changes

parent 40c54750
...@@ -125,6 +125,7 @@ public class Job extends BaseJob ...@@ -125,6 +125,7 @@ public class Job extends BaseJob
new ObjectTransform[] {Question.pipesQuestion().toSection().toObjectID(), Question.pipesQuestion().toObjectID()}, new ObjectTransform[] {Question.pipesQuestion().toSection().toObjectID(), Question.pipesQuestion().toObjectID()},
new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR, CollectionUtils.DEFAULT_COMPARATOR}); new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR, CollectionUtils.DEFAULT_COMPARATOR});
} }
public Collection<CultureCriteria> getCultureCriteriasForClass(CultureClass cultureClass) public Collection<CultureCriteria> getCultureCriteriasForClass(CultureClass cultureClass)
{ {
......
...@@ -37,6 +37,8 @@ public class AssessmentType extends AbstractEnumerated ...@@ -37,6 +37,8 @@ public class AssessmentType extends AbstractEnumerated
private transient String AdditionalDesc; private transient String AdditionalDesc;
private transient String QuestionDetails;
private AssessmentType (String name, String value, String description, boolean disabled) private AssessmentType (String name, String value, String description, boolean disabled)
{ {
super (name, value, description, disabled); super (name, value, description, disabled);
...@@ -51,6 +53,11 @@ public class AssessmentType extends AbstractEnumerated ...@@ -51,6 +53,11 @@ public class AssessmentType extends AbstractEnumerated
{ {
return AdditionalDesc; return AdditionalDesc;
} }
public String getQuestionDetails()
{
return QuestionDetails;
}
public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allAssessmentTypes); public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allAssessmentTypes);
...@@ -119,10 +126,12 @@ public class AssessmentType extends AbstractEnumerated ...@@ -119,10 +126,12 @@ public class AssessmentType extends AbstractEnumerated
public static void defineAdditionalData () public static void defineAdditionalData ()
{ {
COMPREHENSIVE.HeaderDesc = " – Up to 96% accuracy on candidate suitability (250 Questions - 20 Minutes)"; COMPREHENSIVE.HeaderDesc = " – Up to 96% accuracy on candidate suitability ";
COMPREHENSIVE.AdditionalDesc = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh."; COMPREHENSIVE.AdditionalDesc = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh.";
EXPRESS.HeaderDesc = " (30 Questions - 5 Minutes)"; COMPREHENSIVE.QuestionDetails = " (250 Questions - 20 Minutes)";
EXPRESS.HeaderDesc = "";
EXPRESS.AdditionalDesc = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut."; EXPRESS.AdditionalDesc = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut.";
EXPRESS.QuestionDetails = " (30 Questions - 5 Minutes)";
} }
...@@ -152,6 +161,7 @@ public class AssessmentType extends AbstractEnumerated ...@@ -152,6 +161,7 @@ public class AssessmentType extends AbstractEnumerated
attribs.put ("HeaderDesc", ArrayFormatter.toObject(getHeaderDesc())); attribs.put ("HeaderDesc", ArrayFormatter.toObject(getHeaderDesc()));
attribs.put ("AdditionalDesc", ArrayFormatter.toObject(getAdditionalDesc())); attribs.put ("AdditionalDesc", ArrayFormatter.toObject(getAdditionalDesc()));
attribs.put ("QuestionDetails", ArrayFormatter.toObject(getQuestionDetails()));
return attribs; return attribs;
} }
......
...@@ -5,10 +5,13 @@ ...@@ -5,10 +5,13 @@
<DATA name="HeaderDesc" type="String" /> <DATA name="HeaderDesc" type="String" />
<DATA name="AdditionalDesc" type="String" /> <DATA name="AdditionalDesc" type="String" />
<DATA name="QuestionDetails" type="String" />
<VALUE name="COMPREHENSIVE" description="Talentology Comprehensive" HeaderDesc='" – Up to 96% accuracy on candidate suitability (250 Questions - 20 Minutes)"' <VALUE name="COMPREHENSIVE" description="Talentology Comprehensive" HeaderDesc='" – Up to 96% accuracy on candidate suitability "'
AdditionalDesc='"Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh."'/> AdditionalDesc='"Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh."'
<VALUE name="EXPRESS" description="Talentology Express" HeaderDesc='" (30 Questions - 5 Minutes)"' QuestionDetails='" (250 Questions - 20 Minutes)"'/>
AdditionalDesc='"Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut."'/> <VALUE name="EXPRESS" description="Talentology Express" HeaderDesc='""'
AdditionalDesc='"Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut."'
QuestionDetails='" (30 Questions - 5 Minutes)"'/>
</CONSTANT> </CONSTANT>
</ROOT> </ROOT>
\ No newline at end of file
...@@ -1014,6 +1014,11 @@ span.skill-label { ...@@ -1014,6 +1014,11 @@ span.skill-label {
.available-day{ .available-day{
margin-left: 8px; margin-left: 8px;
} }
.culture-element{
text-transform: uppercase;
}
/*Review and Submit Page End*/ /*Review and Submit Page End*/
/*Workplace Culture*/ /*Workplace Culture*/
......
...@@ -13,9 +13,13 @@ ...@@ -13,9 +13,13 @@
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$('.type_radio').click(function(){
return false;
});
$(".level_radio").change(function(){ $(".level_radio").change(function(){
$('li.active').removeClass("active" ); $('.form-page-area li.active').removeClass("active" );
$("input.level_radio:checked").closest('li').addClass("active" ); $("input.level_radio:checked").closest('li').addClass("active" );
}); });
}); });
...@@ -49,9 +53,11 @@ ...@@ -49,9 +53,11 @@
String selectedStr = CollectionUtils.equals(assessmentTypeValue, assessmentTypeId) ? "checked" : ""; String selectedStr = CollectionUtils.equals(assessmentTypeValue, assessmentTypeId) ? "checked" : "";
%> %>
<div class="radio radio-primary job-match-radio"> <div class="radio radio-primary job-match-radio">
<input type="radio" name="<%= assessmentTypeKey %>" id="<%= assessmentTypeId %>" value="<%= assessmentType.getName() %>" <%= selectedStr %>/> <input type="radio" name="<%= assessmentTypeKey %>" id="<%= assessmentTypeId %>" class="type_radio" value="<%= assessmentType.getName() %>" <%= selectedStr %>/>
<label for="<%= assessmentTypeId %>"> <label for="<%= assessmentTypeId %>">
<b><oneit:toString value="<%= assessmentType %>" mode="EscapeHTML" /></b><oneit:toString value="<%= assessmentType.getHeaderDesc() %>" mode="EscapeHTML"/><br /> <b><oneit:toString value="<%= assessmentType %>" mode="EscapeHTML" /></b>
<oneit:toString value="<%= assessmentType.getHeaderDesc() %>" mode="EscapeHTML"/>
<oneit:toString value="<%= assessmentType.getQuestionDetails() %>" mode="EscapeHTML"/><br />
<span class="sub-radio-title"><oneit:toString value="<%= assessmentType.getAdditionalDesc() %>" mode="EscapeHTML" /></span> <span class="sub-radio-title"><oneit:toString value="<%= assessmentType.getAdditionalDesc() %>" mode="EscapeHTML" /></span>
</label> </label>
</div> </div>
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
<oneit:dynIncluded> <oneit:dynIncluded>
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
%> %>
<oneit:form name="editJob" method="post" enctype="multipart/form-data"> <oneit:form name="editJob" method="post" enctype="multipart/form-data">
...@@ -31,7 +33,7 @@ ...@@ -31,7 +33,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="review-medium-title"> <div class="review-medium-title">
<oneit:ormlabel obj="<%= job %>" field="JobTitle" /> <oneit:ormlabel obj="<%= job %>" field="JobTitle" />
<span class="skill-label"> <span class="skill-label">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" /> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" />
</span> </span>
...@@ -39,16 +41,20 @@ ...@@ -39,16 +41,20 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="review-medium-title"> <div class="review-medium-title">
<oneit:ormlabel obj="<%= job %>" field="JobDescription" /> <oneit:ormlabel obj="<%= job %>" field="JobDescription" />
<span class="skill-label"> <span class="skill-label">
<oneit:toString value="<%= job.getJobDescription() %>" mode="EscapeHTML" /> <oneit:toString value="<%= job.getJobDescription() %>" mode="EscapeHTML" />
</span> </span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="row main-review-label"> <div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">Role Type</div> <div class="col-sm-3 col-xs-12 review-label">
<div class="col-sm-9 col-xs-12 review-data">Executive Management</div> <oneit:ormlabel obj="<%= job %>" field="Level" />
</div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getLevel() %>" mode="EscapeHTML" />
</div>
</div> </div>
<div class="row main-review-label"> <div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">Client</div> <div class="col-sm-3 col-xs-12 review-label">Client</div>
...@@ -62,7 +68,7 @@ ...@@ -62,7 +68,7 @@
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group">
<label class="label-16">Assessment Criteria</label> <label class="label-16">Requirements</label>
<div class="add-more-btn review-edit-btn pull-right">EDIT</div> <div class="add-more-btn review-edit-btn pull-right">EDIT</div>
</div> </div>
<% <%
...@@ -80,56 +86,68 @@ ...@@ -80,56 +86,68 @@
<oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/> <oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/>
</div> </div>
</div> </div>
<div class="form-group">
<% <%
for (AssessmentCriteria assessmentCriteria : assessmentCriterias) for (AssessmentCriteria assessmentCriteria : assessmentCriterias)
{ {
%> %>
<div class="form-group"> <span class="skill-label">
<div class="row main-review-label"> <oneit:toString value="<%= assessmentCriteria.getName() %>" mode="EscapeHTML"/> -
<div class="col-sm-3 col-xs-12 review-label"> <oneit:toString value="<%= assessmentCriteria.getImportance() %>" mode="EscapeHTML"/>
<oneit:toString value="<%= assessmentCriteria.getName() %>" mode="EscapeHTML"/> </span>
</div> <% } %>
<div class="col-sm-9 col-xs-12 review-data">Description (Rating)</div> </div>
</div> <% } %>
</div>
<%
}
}
%>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group">
<label class="label-16">Workplace Culture</label> <label class="label-16">Culture</label>
<div class="add-more-btn review-edit-btn pull-right">EDIT</div> <div class="add-more-btn review-edit-btn pull-right">EDIT</div>
</div>
<div class="form-group">
<div class="beloning">Beloning</div>
</div>
<div class="form-group">
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">TEAMWORK</div>
<div class="col-sm-9 col-xs-12 review-data">Some teamwork is involved (Desirable)</div>
</div>
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">LOYALTY</div>
<div class="col-sm-9 col-xs-12 review-data">We are a very loyal ogranisation to employees (Highly Desirable)</div>
</div>
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">FRIENDLINESS</div>
<div class="col-sm-9 col-xs-12 review-data">It is important to be friendly (Highly Desirable)</div>
</div>
</div> </div>
<%
for(CultureClass cultureClass : CultureClass.getCultureClassArray())
{
%>
<div class="form-group">
<div class="beloning">
<oneit:toString value="<%= cultureClass %>" mode="EscapeHTML"/>
</div>
</div>
<div class="form-group">
<%
for (CultureCriteria criteria : job.getCultureCriteriasForClass(cultureClass))
{
%>
<div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label culture-element">
<oneit:toString value="<%= criteria.getCultureElement() %>" mode="EscapeHTML"/>
</div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= criteria.getCultureElementRating().getDescription() %>" mode="EscapeHTML"/>
(<oneit:toString value="<%= criteria.getImportance() %>" mode="EscapeHTML"/>)
</div>
</div>
<% } %>
</div>
<% } %>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group"> <div class="form-group">
<label class="label-16">Job Match Assessment</label> <label class="label-16">Job Match Assessment</label>
<div class="add-more-btn review-edit-btn pull-right">EDIT</div> <div class="add-more-btn review-edit-btn pull-right">EDIT</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="beloning job-match-ass">Comprehensive Assessment (250 Questions ? 20 Minutes)</div> <div class="beloning job-match-ass">
<oneit:toString value="<%= job.getAssessmentType() %>" mode="EscapeHTML"/>
</div>
</div> </div>
<div class="text-center"> <div class="text-center">
<input type="button" class="btn btn-primary top-margin-25" value="Confirm and make payment" /> <oneit:button value="Confirm and make payment" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" />
</div> </div>
<div class="job-active-time">Your job will be active for 30 days from being published</div> <div class="job-active-time">Your job will be active for 30 days from being published</div>
</div> </div>
......
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