Skip to content

P
PERFORMA_REPLICA
Commit 885ad1eb by Nilu
Options

workflow add fix

parent d19c0a79
Showing with 75 additions and 22 deletions
cmsWebApp/webroot/extensions/adminportal/inc/workflow_add.jsp
...@@ -30,7 +30,11 @@ ...@@ -30,7 +30,11 @@
<oneit:evalBody buffer="<%= getBuffer(request) %>"> <oneit:evalBody buffer="<%= getBuffer(request) %>">
<div class="form-group row"> <div class="form-group row">
<div class="col-md-12"> <div class="col-md-12">
<oneit:ormInput obj="<%= workflow %>" type="text" attributeName="Name" cssClass="form-control" /> <div class="workflow-row">
<span><%= workflow.getSortOrder() %></span>
<oneit:ormInput obj="<%= workflow %>" type="text" attributeName="Name" cssClass="form-control" />
<div class="remove-icon">_</div>
</div>
</div> </div>
</div> </div>
</oneit:evalBody> </oneit:evalBody>
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
...@@ -76,10 +76,15 @@ ...@@ -76,10 +76,15 @@
function addWorkflow() function addWorkflow()
{ {
// var divID = "#" + criteria; ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/workflow_add.jsp", "#middle-workflows", {}, function (theHTML_JQ) {
$("#middle-workflows").append (theHTML_JQ);
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/workflow_add.jsp", "#workflows", {}, function (theHTML_JQ) { });
$("#workflows").append (theHTML_JQ); }
function deleteWorkflow()
{
ajaxProcessAddJQ ("<%= request.getContextPath() %>/extensions/adminportal/inc/workflow_add.jsp", "#middle-workflows", {}, function (theHTML_JQ) {
$("#middle-workflows").append (theHTML_JQ);
}); });
} }
</script> </script>
...@@ -307,29 +312,73 @@ ...@@ -307,29 +312,73 @@
</div> </div>
</div> </div>
<div id="workflows"> <div id="workflows">
<% <div>
List<WorkFlow> sortedWorkflows = job.getSortedWorkFlows(); <%
WorkFlow firstWorkflow = job.getWorkFlowBySortOrder(1);
%>
<div class="form-group row">
<div class="col-md-12">
<div class="workflow-row">
<span><%= firstWorkflow.getSortOrder() %></span>
<oneit:ormInput obj="<%= firstWorkflow %>" type="text" attributeName="Name" cssClass="form-control" />
</div>
<div class="seperator-dots"><span class="dot"></span><span class="dot"></span><span class="dot"></span></div>
</div>
</div>
</div>
<div id="middle-workflows">
<%
List<WorkFlow> sortedWorkflows = job.getSortedMiddleWorkFlows();
int index = 0;
for (WorkFlow workflow : sortedWorkflows)
{
index++;
%>
for (WorkFlow workflow : sortedWorkflows) <div class="form-group row">
{ <div class="col-md-12">
%> <div class="workflow-row">
<span><%= workflow.getSortOrder() %></span>
<div class="form-group row"> <oneit:ormInput obj="<%= workflow %>" type="text" attributeName="Name" cssClass="form-control" />
<div class="col-md-12"> <%
<div class="workflow-row"> if(workflow.getApplicationStatus() != ApplicationStatus.SUBMITTED && workflow.getApplicationStatus() != ApplicationStatus.SHORTLISTED)
<span><%= workflow.getSortOrder() %></span> {
<oneit:ormInput obj="<%= workflow %>" type="text" attributeName="Name" cssClass="form-control" /> %>
<div class="remove-icon">_</div> <div class="remove-icon">_</div>
<%
}
%>
</div>
<%
if(sortedWorkflows.size() == index)
{
%>
<div class="seperator-dots"><span class="dot"></span><span class="dot"></span><span class="dot"></span></div>
<%
}
%>
</div> </div>
<div class="seperator-dots"><span class="dot"></span><span class="dot"></span><span class="dot"></span></div> </div>
<%
}
%>
</div>
<div>
<%
WorkFlow lastWorkflow = job.getWorkFlowBySortOrder(9);
%>
<div class="form-group row">
<div class="col-md-12">
<div class="workflow-row">
<span><%= lastWorkflow.getSortOrder() %></span>
<oneit:ormInput obj="<%= lastWorkflow %>" type="text" attributeName="Name" cssClass="form-control" />
</div> </div>
</div> </div>
<% </div>
} </div>
%>
</div> </div>
<div class="form-group row"> <div class="form-group row" style="text-align: center;">
<oneit:button value="Add Workflow Step" name="gotoPage" cssClass="add-more-btn review-edit-btn" skin="link" <oneit:button value="Add Workflow Step" name="gotoPage" cssClass="add-more-btn review-edit-btn" skin="link"
onClick="<%="addWorkflow(); return false;"%>" onClick="<%="addWorkflow(); return false;"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage).toMap() %>"/> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage).toMap() %>"/>
......
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