Skip to content

P
PERFORMA_REPLICA
Commit bbf36853 by Nilu Committed by Harsh Shah
Options

adding skills to assessment criteria

parent 97afe3d1
Showing with 107 additions and 19 deletions
cmsWebApp/src/performa/utils/WebUtils.java
......@@ -9,6 +9,7 @@ import oneit.business.content.jsp.ShortcutFilter;
import oneit.objstore.BaseBusinessClass;
import oneit.objstore.ObjectTransaction;
import oneit.servlets.jsp.ORMSimpleAssocTag;
import oneit.servlets.orm.DataInputHandler;
import oneit.servlets.orm.DataMap;
......@@ -32,6 +33,14 @@ public class WebUtils
}
public static String getInputKey(HttpServletRequest request, BaseBusinessClass bbc, String attributeName)
{
DataMap dataMap = DataMap.getDataMap (request, true);
DataInputHandler dih = new DataInputHandler.SimpleAttributeHandler (bbc, attributeName, null);
return dataMap.storeORMHandler (dih, bbc, attributeName);
}
public static Article getArticleByShortCut(ObjectTransaction objTran, String shortCut)
{
return ShortcutFilter.doShortcutSearch(objTran, shortCut);
......
cmsWebApp/webroot/css/style-admin.css
......@@ -770,9 +770,15 @@ span.skill-label {
line-height: 45px;
padding: 0 23.37px;
text-transform: uppercase;
background-image: url(../images/plus-img.png);
background-repeat: no-repeat;
background-position: center left 20px;
padding-left: 35px;
}
.add-more-btn:hover{
background: #434c58;
background-color: #434c58;
color: white;
}
.add-more-btn img {
margin-right: 6px;
......@@ -3802,4 +3808,4 @@ span.right-img {
@media screen and (max-width: 320px){
.verify-i-title {font-size: 13px;}
}
\ No newline at end of file
}
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
......@@ -7,17 +7,13 @@
<%
Job job = (Job) process.getAttribute("Job");
Filter skilsFilter = AssessmentCriteria.SearchByAll().andAssessmentType(new EqualsFilter<>(AssessmentType.SKILL));
Filter qualificationFilter = AssessmentCriteria.SearchByAll().andAssessmentType(new EqualsFilter<>(AssessmentType.QUALIFICATION));
Filter experienceFilter = AssessmentCriteria.SearchByAll().andAssessmentType(new EqualsFilter<>(AssessmentType.EXPERIENCE));
Filter knowledgeFilter = AssessmentCriteria.SearchByAll().andAssessmentType(new EqualsFilter<>(AssessmentType.KNOWLEDGE));
Collection<AssessmentCriteria> skills = CollectionFilter.filter(job.getAssessmentCriteriasSet(), skilsFilter);
Collection<AssessmentCriteria> qualifications = CollectionFilter.filter(job.getAssessmentCriteriasSet(), qualificationFilter);
Collection<AssessmentCriteria> experience = CollectionFilter.filter(job.getAssessmentCriteriasSet(), experienceFilter);
Collection<AssessmentCriteria> knowledge = CollectionFilter.filter(job.getAssessmentCriteriasSet(), knowledgeFilter);
Collection<AssessmentCriteria> skills = job.getAssessmentCriteraByType(CriteriaType.SKILL);
Collection<AssessmentCriteria> qualifications = job.getAssessmentCriteraByType(CriteriaType.QUALIFICATION);
Collection<AssessmentCriteria> experience = job.getAssessmentCriteraByType(CriteriaType.EXPERIENCE);
Collection<AssessmentCriteria> knowledge = job.getAssessmentCriteraByType(CriteriaType.KNOWLEDGE);
String firstPage = HTTPRequestDetails.getFullURL(WebUtils.getSamePageInRenderMode(request, "Page"), ProcessDecorator.getRequestParameters(request, new String[0]), "");
String secondPage = WebUtils.getSamePageInRenderMode(request, PerformaArticleUtil.ASSESSMENT_CRITERIA);
String thirdPage = HTTPRequestDetails.getFullURL(WebUtils.getSamePageInRenderMode(request, PerformaArticleUtil.WORKPLACE_CULTURE), ProcessDecorator.getRequestParameters(request, new String[0]), "");
String fourthPage = HTTPRequestDetails.getFullURL(WebUtils.getSamePageInRenderMode(request, PerformaArticleUtil.JOB_MATCH), ProcessDecorator.getRequestParameters(request, new String[0]), "");
String fifthPage = HTTPRequestDetails.getFullURL(WebUtils.getSamePageInRenderMode(request, PerformaArticleUtil.JOB_REVIEW), ProcessDecorator.getRequestParameters(request, new String[0]), "");
......@@ -25,7 +21,6 @@
<script type="text/javascript">
$(document).ready(function() {
recalcFunction = setupRecalc($("form"));
$(".switch input[type='checkbox']").each(function()
{
......@@ -61,8 +56,23 @@
}
});
});
function addCriteria(formBuilder) {
alert('adding criteria');
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/job_assessment_criteria_add.jsp", "#skill-title", {FormBuilder: formBuilder}, function (theHTML_JQ) {
$(".main-qualification").before (theHTML_JQ);
});
}
</script>
<oneit:form name="editJob" method="post" enctype="multipart/form-data" action="<%= thirdPage %>">
<%
FormTag jobForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = jobForm.getFormBuilder();
%>
<div class="container-fluid">
<h1 class="page-title">Create a job <span class="active-time">(Active for 30 days)</span> </h1>
<div class="main-tab-form">
......@@ -119,7 +129,7 @@
</div>
<div class="form-brack-line-sub"></div>
<div class="form-group">
<div class="form-medium-title">
<div class="form-medium-title" id="skill-title">
Skills
<%
if(skills.size() == 0)
......@@ -130,8 +140,21 @@
}
%>
</div>
<%
for (AssessmentCriteria skill : skills)
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/job_assessment_criteria_add.jsp" AssessmentCriteria="<%= skill%>"
FormBuilder="<%= formBuilder%>" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
}
%>
<div class="main-add-more">
<div class="add-more-btn"><img src="images/plus-img.png"> Add SKill</div>
<oneit:button value="Add Skill" name="newSkill" cssClass="add-more-btn" skin="link"
onClick="addCriteria('<%= formBuilder %>'); return false;"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("CriteriaType", CriteriaType.SKILL).toMap() %>"/>
</div>
</div>
<div class="form-brack-line-sub"></div>
......@@ -156,10 +179,6 @@
%>
</div>
<%
FormTag jobForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = jobForm.getFormBuilder();
for (AssessmentCriteria qualification : qualifications)
{
String optionKey = WebUtils.getInputKey(request, qualification, AssessmentCriteria.FIELD_Importance);
......
cmsWebApp/webroot/extensions/adminportal/inc/job_assessment_criteria_add.jsp 0 → 100644
<%@ page extends="oneit.servlets.process.AJAXProcessJSP" %>
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
<%@include file="../../../inc/std_imports.jsp" %>
<%! protected String getName (ServletConfig config) { return "dynamic_content_form"; } %>
<%
ORMProcessState process = (ORMProcessState)ProcessDecorator.getDefaultProcess(request);
ObjectTransaction objTran = process.getTransaction ();
Job job = (Job) process.getAttribute("Job");
AssessmentCriteria criteria = (AssessmentCriteria) getData(request, "AssessmentCriteria");
FormBuilder formBuilder = (FormBuilder) getData(request, "FormBuilder");
if(criteria == null)
{
criteria = AssessmentCriteria.createAssessmentCriteria(objTran);
job.addToAssessmentCriterias(criteria);
}
String optionKey = WebUtils.getInputKey(request, criteria, AssessmentCriteria.FIELD_Importance);
String formValue = formBuilder.fieldValue (optionKey, criteria.getImportance() == null ? "" : criteria.getImportance().getName());
%>
<oneit:form method="POST">
<oneit:evalBody buffer="<%= getBuffer(request) %>">
<div class="main-qualification">
<span class="delete-qualification"><span></span></span>
<oneit:ormInput obj="<%= criteria %>" type="text" attributeName="Name" cssClass="form-control" />
<%
for(Importance importance : Importance.getImportanceArray())
{
boolean isSelected = CollectionUtils.equals(formValue, importance.getName());
String id = "importance_" + importance.getName();
String selectedStr = (isSelected) ? "checked" : "";
%>
<div class="radio radio-primary qualification-radio">
<input type="radio" name="<%= optionKey %>" value="<%= importance.getName() %>" id="<%= id %>" <%= selectedStr %>/>
<label for="<%= id %>"><oneit:toString value="<%= importance %>" mode="EscapeHTML" /></label>
</div>
<%
}
%>
</div>
</oneit:evalBody>
</oneit:form>
\ 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