Commit 2ab9873f by Nilu Committed by Harsh Shah

Assessment criteria : create job. add and delete

parent 8a1b8c57
......@@ -530,6 +530,11 @@ input:checked + .slider:before {-webkit-transform: translateX(18px);-ms-transfor
.slider.round {border-radius: 34px;}
.slider.round:before {border-radius: 50%;}
span.checkbox.checked + .slider {background-color: #67b413;}
input:focus + .slider {box-shadow: 0 0 1px #2196F3;}
span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms-transform: translateX(18px);transform: translateX(18px);}
/*CheckBox*/
.checkbox {
padding-left: 20px; }
......
......@@ -5,13 +5,7 @@
<oneit:dynIncluded>
<%
Job job = (Job) process.getAttribute("Job");
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);
Job job = (Job) process.getAttribute("Job");
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]), "");
......@@ -20,10 +14,10 @@
%>
<script type="text/javascript">
$(document).ready(function() {
setupRecalc ($("form#editJob"),{'recalcOnError': true});
$(document).ready(function()
{
recalcFunction = setupRecalc($("form"));
$(".switch input[type='checkbox']").each(function()
{
$(this).parent('span').removeClass("checked" );
......@@ -57,24 +51,28 @@
$( ".assessment-criteria-details" ).css( "display", "none" );
}
});
});
function addCriteria(criteria) {
alert(criteria);
function addCriteria(criteria)
{
var divID = "#" + criteria;
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/job_assessment_criteria_add.jsp", divID, {'CriteriaName' : criteria}, function (theHTML_JQ) {
$(divID).append (theHTML_JQ);
$(divID).after (theHTML_JQ);
});
}
function deleteCriteria(deleteVarKey, criteria)
{
var divID = "#" + criteria;
ajaxProcessDeleteJQ("<%= request.getContextPath() %>/genericDelete_AJAX.jsp", divID , { varKey: deleteVarKey });
return false;
}
</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>
......@@ -113,7 +111,6 @@
<div class="form-group">
<label>Include Assessment Criteria for this position? <a href="#" class="info-icon"><img src="images/info-icon.png" /></a> </label>
<span class="pull-right">
<label class="switch">
<oneit:ormInput obj="<%= job %>" attributeName="IncludeAssessmentCriteria" type="checkbox"/>
<div class="slider round"></div>
......@@ -138,44 +135,37 @@
String name = criteria.getName();
%>
<div class="form-group">
<div class="form-medium-title" id="<%= name%>">
<div class="form-medium-title qualification-title" id="<%= name%>">
<oneit:toString value="<%= criteria %>" mode="EscapeHTML"/>
<%
if(assessmentCriterias.size() > 0)
{
%>
<span class="skill-label">
<oneit:recalc script="job.getAssessmentCriteraCountByType(criteria)" mode="EscapeHTML" job="<%= job %>" criteria="<%= criteria %>" />
<oneit:toString value="<%= criteria %>" mode="EscapeHTML"/> added
</span>
<%
}
else
{
%>
<span class="skill-label">
<oneit:recalcClass htmlTag="span" class="skill-label" classScript="job.getAssessmentCriteraCountByType(criteria) > 0 ? 'show': 'hide'" job="<%= job %>" criteria="<%= criteria %>">
<oneit:recalc script="job.getAssessmentCriteraCountByType(criteria)" mode="EscapeHTML" job="<%= job %>" criteria="<%= criteria %>" />
<oneit:toString value="<%= criteria %>" mode="EscapeHTML"/> added
</oneit:recalcClass>
<oneit:recalcClass htmlTag="span" class="skill-label" classScript="job.getAssessmentCriteraCountByType(criteria) > 0 ? 'hide': 'show'" job="<%= job %>" criteria="<%= criteria %>">
<span class="skill-label">No <oneit:toString value="<%= criteria %>" mode="EscapeHTML"/> currently added for this role.</span>
<%
}
%>
</oneit:recalcClass>
</span>
</div>
<div id="skills">
<%
for (AssessmentCriteria assessmentCriteria : assessmentCriterias)
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/job_assessment_criteria_add.jsp" AssessmentCriteria="<%= assessmentCriteria %>"
CriteriaType="<%= criteria %>"
<oneit:dynInclude page="/extensions/adminportal/inc/job_assessment_criteria_add.jsp" AssessmentCriteria="<%= assessmentCriteria %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
}
%>
</div>
<div class="main-add-more">
<oneit:button value="<%= "Add " + name%>" name="newSkill" cssClass="add-more-btn" skin="link"
<oneit:button value="<%= "Add " + name%>" name="newAssessmentCriteria" cssClass="add-more-btn" skin="link"
onClick="<%="addCriteria('" + name + "'); return false;"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("CriteriaType", CriteriaType.SKILL)
.toMap() %>"/>
</div>
</div>
......@@ -187,7 +177,7 @@
<div class="form-group">
<div class="save-assess">
<div class="checkbox checkbox-primary">
<input id="checkbox2" type="checkbox" checked>
<input id="checkbox2" type="checkbox" name="chekbox2" checked>
<label for="checkbox2">
Save this Assessment Criteria as a template
</label>
......
......@@ -10,14 +10,12 @@
ObjectTransaction objTran = process.getTransaction ();
Job job = (Job) process.getAttribute("Job");
AssessmentCriteria criteria = (AssessmentCriteria) getData(request, "AssessmentCriteria");
CriteriaType criteriaType = (CriteriaType) getData(request, "CriteriaType");
if(criteria == null)
{
criteria = AssessmentCriteria.createAssessmentCriteria(objTran);
criteriaType = CriteriaType.forName((String) request.getParameter("CriteriaName"));
criteria.setCriteriaType(criteriaType);
criteria.setCriteriaType(CriteriaType.forName((String) request.getParameter("CriteriaName")));
job.addToAssessmentCriterias(criteria);
}
%>
......@@ -26,13 +24,22 @@
<oneit:evalBody buffer="<%= getBuffer(request) %>">
<%
FormTag myForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = myForm.getFormBuilder();
String optionKey = WebUtils.getInputKey(request, criteria, AssessmentCriteria.FIELD_Importance);
String formValue = formBuilder.fieldValue (optionKey, criteria.getImportance() == null ? "" : criteria.getImportance().getName());
String deleteVarKey = FormTag.getVariableKey (request);
FormTag.setVariable (request, deleteVarKey, "objToDelete", criteria);
FormTag.setVariable (request, deleteVarKey, "jqToDelete", "#" + criteria.getID());
%>
<div class="main-qualification">
<span class="delete-qualification"><span></span></span>
<div class="main-qualification" id="<%= criteria.getID() %>">
<span class="delete-qualification" onclick="return deleteCriteria (<%= deleteVarKey %>, '<%= criteria.getCriteriaType().getName() %>')"><span></span></span>
<oneit:ormInput obj="<%= criteria %>" type="text" attributeName="Name" cssClass="form-control" />
<%
for(Importance importance : Importance.getImportanceArray())
......
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