Commit 7f868bca by Nilu Committed by Harsh Shah

I002 - New row is added top of existing row. Shouldn't that be other way around?

parent be4d1fba
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
var divID = "#" + criteria; var divID = "#" + criteria;
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/job_assessment_criteria_add.jsp", divID, {'CriteriaName' : criteria}, function (theHTML_JQ) { ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/job_assessment_criteria_add.jsp", divID, {'CriteriaName' : criteria}, function (theHTML_JQ) {
$(divID).after (theHTML_JQ); $(divID + "> #assessmentCriteriaSection").append (theHTML_JQ);
}); });
} }
...@@ -120,38 +120,40 @@ ...@@ -120,38 +120,40 @@
String name = criteria.getName(); String name = criteria.getName();
%> %>
<div class="form-group"> <div class="form-group">
<div class="form-medium-title qualification-title" id="<%= name%>"> <div class="form-group" id="<%= name%>">
<div class="form-medium-title qualification-title">
<oneit:toString value="<%= criteria %>" mode="EscapeHTML"/>
<oneit:toString value="<%= criteria %>" mode="EscapeHTML"/>
<span class="skill-label">
<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:recalcClass htmlTag="span" class="skill-label" classScript="job.getAssessmentCriteraCountByType(criteria) > 0 ? 'show': 'hide'" job="<%= job %>" criteria="<%= criteria %>">
<oneit:toString value="<%= criteria %>" mode="EscapeHTML"/> added <oneit:recalc script="job.getAssessmentCriteraCountByType(criteria)" mode="EscapeHTML" job="<%= job %>" criteria="<%= criteria %>" />
</oneit:recalcClass> <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 htmlTag="span" class="skill-label" classScript="job.getAssessmentCriteraCountByType(criteria) > 0 ? 'hide': 'show'" job="<%= job %>" criteria="<%= criteria %>">
</oneit:recalcClass> <span class="skill-label">No <oneit:toString value="<%= criteria %>" mode="EscapeHTML"/> currently added for this role.</span>
</oneit:recalcClass>
</span>
</div> </span>
<div id="assessmentCriteriaSection">
<%
for (AssessmentCriteria assessmentCriteria : job.getAssessmentCriteraByType(criteria))
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/job_assessment_criteria_add.jsp" AssessmentCriteria="<%= assessmentCriteria %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
}
%>
<div class="main-add-more">
<oneit:button value="<%= "Add " + name%>" name="newAssessmentCriteria" cssClass="add-more-btn" skin="link"
onClick="<%="addCriteria('" + name + "'); return false;"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", samePage).toMap() %>"/>
</div> </div>
<div id="assessmentCriteriaSection">
<%
for (AssessmentCriteria assessmentCriteria : job.getAssessmentCriteraByType(criteria))
{
%>
<oneit:dynInclude page="/extensions/adminportal/inc/job_assessment_criteria_add.jsp" AssessmentCriteria="<%= assessmentCriteria %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
}
%>
</div>
</div>
<div class="main-add-more">
<oneit:button value="<%= "Add " + name%>" name="newAssessmentCriteria" cssClass="add-more-btn" skin="link"
onClick="<%="addCriteria('" + name + "'); return false;"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", samePage).toMap() %>"/>
</div> </div>
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></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