Skip to content

P
PERFORMA_REPLICA
Commit b5810bda by chenith Committed by Harsh Shah
Options

Updated navigations for job applications from job page. Fixed job status change.

parent 3a7bd308
Showing with 28 additions and 29 deletions
cmsWebApp/src/performa/form/SaveJobFP.java
package performa.form;
import javax.servlet.http.HttpServletRequest;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
......@@ -21,7 +22,8 @@ public class SaveJobFP extends SaveFP
@Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
{
Job job = (Job) process.getAttribute("Job");
HttpServletRequest request = submission.getRequest();
Job job = process.getAttribute("Job") != null ? (Job) process.getAttribute("Job") : (Job) request.getAttribute("Job");
LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );
......
cmsWebApp/webroot/css/common.css
......@@ -2976,6 +2976,7 @@ input.add-note-btn:hover{
}
.second-part.v-applicant-area{
padding-top: 63px;
margin-top: 0px;
}
.expand-hide-tag{
background-color: #f2f3f4;
......@@ -4050,7 +4051,7 @@ img.alert-icon {float: left;}
.int-timeline li.interview-tran-btn{ margin-left: 5px;}
.int-timeline li.interview-tran-btn span {margin-bottom: 5px;}
.interview-tran-btn span{background-size: 24px auto;}
.second-part.v-applicant-area {padding-top: 45px;}
.second-part.v-applicant-area {padding-top: 45px; margin-top: 0px;}
.tab-view-side {padding: 17px 10px;width: 70.4%;}
.tab-view-label{width: 26%;}
.like-strive{margin-top: 6px;font-size: 11px;}
......@@ -4128,7 +4129,7 @@ img.alert-icon {float: left;}
.main-applicants-filter{margin-bottom: 60px;}
.main-shortlist-filter.main-applicants-filter {margin-bottom: 60px;}
.main-content-area,.second-part {min-height: 904px;}
.second-part.v-applicant-area {padding-top: 30px;}
.second-part.v-applicant-area {padding-top: 30px; margin-top: 0px;}
.applicant-left{border-right: none;}
.appli-list-name{padding: 8px 0 7px 8px;font-size: 16px;}
.appli-int-status{margin-top: 5px;font-size: 10px;}
......@@ -4314,7 +4315,7 @@ img.alert-icon {float: left;}
.main-content-area .main-tab-form ul li:first-child a {border-radius: 0;}
.main-content-area .main-tab-form .nav-pills > li + li{margin-left: 0;}
.main-content-area .main-tab-form .nav-justified > li > a {margin-bottom: 0;}
.second-part.v-applicant-area {padding-top: 20px;}
.second-part.v-applicant-area {padding-top: 20px; margin-top: 0px;}
.main-application-outline {padding: 0 34px;width: 100%;}
.sl_width.slider-next.slick-arrow{right: -15px;top: 26%;}
.sl_width.slider-prev.slick-arrow{left: -15px;top: 26%;}
......
cmsWebApp/webroot/extensions/adminportal/inc/application_list_data.jsp
......@@ -9,6 +9,7 @@
Job job = (Job) process.getAttribute("Job");
List<JobApplication> applications = (List<JobApplication>) getData(request, "applications");
String currentPage = (String) getData(request, "currentPage");
String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
%>
<oneit:dynIncluded>
......@@ -41,10 +42,14 @@
</div>
</div>
<div class="appli-list-name appli-l eq-second-height">
<oneit:button value=" " name="gotoPage" cssClass="<%= jobApplication.getID()+"" %>" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()).toMap() %>">
<oneit:toString value="<%= jobApplication.getCandidate() %>" mode="EscapeHTML" />
<div class="appli-int-status">
<oneit:toString value="<%= jobApplication.getApplicantStatusStr() %>" mode="EscapeHTML" />
</div>
</oneit:button>
</div>
<div class="appli-overall appli-l eq-second-height">
<div class="rank">
......
cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp
......@@ -115,7 +115,7 @@
enums="<%= Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE, JobStatus.FILLED}) %>"/>
</div>
<oneit:button name="saveJob" value="Save" cssClass="<%= "save-job" + job.getID().toString() + " hidden"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", homePage+ (jobStatus != null ? "&JobStatus=" + jobStatus : "")).toMap() %>" />
requestAttribs="<%= CollectionUtils.mapEntry("Job", job).mapEntry("nextPage", homePage+ (jobStatus != null ? "&JobStatus=" + jobStatus : "")).toMap() %>" />
</div>
<%
}
......
cmsWebApp/webroot/extensions/adminportal/inc/view_application_tab_applicant.jsp
......@@ -18,12 +18,11 @@
<div class="main-appli-name">
<div class="appli-name"><oneit:toString value="<%= candidate.getToString() %>" mode="EscapeHTML"/></div>
<div class="appli-applied">
Applied via seek.com.au
<oneit:toString value="<%= job.getObjectCreated() %>" mode="MidDate"/>
Applied <oneit:toString value="<%= job.getObjectCreated() %>" mode="MidDate"/>
</div>
</div>
<div class="main-export">
<span class="export-candidate">
<span class="export-candidate" style="display: none;">
<select class="form-control">
<option>Export Candidate Report</option>
<option>PDF</option>
......@@ -31,11 +30,8 @@
</select>
</span>
<span class="appli-status-short">
<select class="form-control status-img">
<option data-image="images/active.png">Active</option>
<option data-image="images/complete.png">Completed</option>
<option data-image="images/shortlisted.png">Shortlisted</option>
</select>
<oneit:ormEnum obj="<%= jobApplication %>" attributeName="AppProcessOption" cssClass="form-control status-img job-status"
enums="<%= jobApplication.getValidProcessOptions() %>"/>
</span>
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp
......@@ -99,10 +99,6 @@
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
});
function gotoEditApplication (id) {
$('.' + id).click();
}
</script>
<oneit:form name="viewApplicants" method="post" enctype="multipart/form-data">
......@@ -131,11 +127,11 @@
for(JobApplication jobApplication : sortedApplications)
{
%>
<div class="appl-c-box application-row" onClick='gotoEditApplication("<%= jobApplication.getID() %>")'>
<oneit:button value=" " name="gotoPage" cssClass="<%= jobApplication.getID() + " hidden"%>" skin="link"
<div class="appl-c-box application-row">
<oneit:button value=" " name="gotoPage" cssClass="<%= jobApplication.getID() + ""%>" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>"/>
.toMap() %>">
<!--TODO: need to work on the logic. just added to demonstrate that there are 3 different colors for this-->
<div class="<%= "cb-title " + (index == 0 ? "green-back" : (index < 3 ? "blue-back" : "dark-back" ))%> ">
<oneit:toString value="<%= jobApplication.getCandidate() %>" mode="EscapeHTML" />
......@@ -182,6 +178,7 @@
</span>
</div>
</div>
</oneit:button>
</div>
<%
index++;
......@@ -209,7 +206,11 @@
{
String appID = "app-id-" + jobApplication.getID().toString();
%>
<div class="<%= "appl-c-box " + (i == 0 ? " cb-one" : "")%> " onClick='gotoEditApplication("<%= jobApplication.getID() %>")'>
<div class="<%= "appl-c-box " + (i == 0 ? " cb-one" : "")%> ">
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>">
<!--TODO: need to work on the logic. just added to demonstrate that there are 3 different colors for this-->
<div class="<%= "cb-title " + (i == 0 ? "green-back" : (i < 3 ? "blue-back" : "dark-back" ))%> ">
<div class="checkbox-list grid-checkbox">
......@@ -231,14 +232,7 @@
<div class="jcc-box">
<div class="job-match jcc">
<img src="images/app-job-match-icon.svg"> Role fit
<span>
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
.toMap() %>">
<oneit:toString value="<%= jobApplication.getJobMatchPercentage() %>" mode="PercentageWholeNumber" />
</oneit:button>
</span>
<span><oneit:toString value="<%= jobApplication.getJobMatchPercentage() %>" mode="PercentageWholeNumber" /></span>
</div>
<div class="detail-box">
<div class="detail-row">
......@@ -301,6 +295,7 @@
</div>
</div>
</div>
</oneit:button>
</div>
<%
i++;
......
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