Skip to content

P
PERFORMA_REPLICA
Commit b4e903fe by Nilu
Options

J008 - If the status is Draft, then this screen should allow the same level of… 

J008 - If the status is Draft, then this screen should allow the same level of editing as https://trello.com/c/0a3z9SGB/23-j005-add-job-review-summary
parent 26b52a0a
Showing with 17 additions and 9 deletions
cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp
...@@ -19,39 +19,39 @@ ...@@ -19,39 +19,39 @@
<div class="main-tab-form job-main-tabs"> <div class="main-tab-form job-main-tabs">
<ul class="nav nav-pills nav-justified"> <ul class="nav nav-pills nav-justified">
<li class="<%= pageNumber == "1" ? "active" : job.getCompletedDetails() || savedJob ? "complate" : ""%>"> <li class="<%= pageNumber == "1" ? "active" : CollectionUtils.equals(job.getCompletedDetails(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", firstPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"> .toMap() %>">
<span><%= job.getCompletedDetails() || savedJob ? "<img src=\"images/right-mark.png\" />" : "1"%></span> <span><%= CollectionUtils.equals(job.getCompletedDetails(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "1"%></span>
Job Detail Job Detail
</oneit:button> </oneit:button>
</li> </li>
<li class="<%= pageNumber == "2" ? "active" : job.getCompletedAssessmentType() || savedJob ? "complate" : ""%>"> <li class="<%= pageNumber == "2" ? "active" : CollectionUtils.equals(job.getCompletedAssessmentType(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"> .toMap() %>">
<span><%= job.getCompletedAssessmentType() || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span> <span><%= CollectionUtils.equals(job.getCompletedAssessmentType(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Role Role
</oneit:button> </oneit:button>
</li> </li>
<li class="<%= pageNumber == "3" ? "active" : job.getCompletedCulture() || savedJob ? "complate" : ""%>"> <li class="<%= pageNumber == "3" ? "active" : CollectionUtils.equals(job.getCompletedCulture(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"> .toMap() %>">
<span><%= job.getCompletedCulture() || savedJob ? "<img src=\"images/right-mark.png\" />" : "3"%></span> <span><%= CollectionUtils.equals(job.getCompletedCulture(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "3"%></span>
Culture Culture
</oneit:button> </oneit:button>
</li> </li>
<li class="<%= pageNumber == "4" ? "active" : job.getCompletedRequirements() || savedJob ? "complate" : ""%>"> <li class="<%= pageNumber == "4" ? "active" : CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"> .toMap() %>">
<span><%= job.getCompletedRequirements() || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span> <span><%= CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span>
Requirements Requirements
</oneit:button> </oneit:button>
</li> </li>
......
cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
int shortlisted = job.getNoOfCandidatesShortlisted(); int shortlisted = job.getNoOfCandidatesShortlisted();
String editJobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB); String editJobPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB);
String reviewPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
String sharePage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB); String sharePage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATED_JOB);
String jobPage = WebUtils.getSamePageInRenderMode(request, (shortlisted > 0 ? WebUtils.APPLICANTS_SHORTLIST : WebUtils.VIEW_APPLICANTS)); String jobPage = WebUtils.getSamePageInRenderMode(request, (shortlisted > 0 ? WebUtils.APPLICANTS_SHORTLIST : WebUtils.VIEW_APPLICANTS));
%> %>
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
.mapEntry("cancelProcess", true) .mapEntry("cancelProcess", true)
.toMap() %>"/> .toMap() %>"/>
<oneit:button value=" " cssClass="rightbtn" name="gotoPage" skin="link" <oneit:button value=" " cssClass="rightbtn" name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", editJobPage + "&JobID=" + job.getObjectID()) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", (job.getJobStatus() == JobStatus.DRAFT ? reviewPage : editJobPage) + "&JobID=" + job.getObjectID())
.mapEntry("cancelProcess", true) .mapEntry("cancelProcess", true)
.toMap() %>"> .toMap() %>">
EDIT EDIT
......
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
...@@ -14,6 +14,13 @@ ...@@ -14,6 +14,13 @@
Article jobsArticle = WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS); Article jobsArticle = WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS);
String jobsPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.VIEW_APPLICANTS).toMap()); String jobsPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.VIEW_APPLICANTS).toMap());
if(job == null && request.getParameter("JobID")!= null)
{
job = Job.getJobByID(transaction, Long.parseLong(request.getParameter("JobID")));
process.setAttribute("Job", job);
}
Debug.assertion(job != null, "Job is null in admin portal create job"); Debug.assertion(job != null, "Job is null in admin portal create job");
%> %>
<oneit:form name="editJob" method="post" enctype="multipart/form-data"> <oneit:form name="editJob" method="post" enctype="multipart/form-data">
......
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