Commit b5810bda by chenith Committed by Harsh Shah

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

parent 3a7bd308
package performa.form; package performa.form;
import javax.servlet.http.HttpServletRequest;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
...@@ -21,7 +22,8 @@ public class SaveJobFP extends SaveFP ...@@ -21,7 +22,8 @@ public class SaveJobFP extends SaveFP
@Override @Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException 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 ); LogMgr.log(Job.LOG, LogLevel.PROCESSING1,"In SaveJobFP saving job : ", job );
......
...@@ -2976,6 +2976,7 @@ input.add-note-btn:hover{ ...@@ -2976,6 +2976,7 @@ input.add-note-btn:hover{
} }
.second-part.v-applicant-area{ .second-part.v-applicant-area{
padding-top: 63px; padding-top: 63px;
margin-top: 0px;
} }
.expand-hide-tag{ .expand-hide-tag{
background-color: #f2f3f4; background-color: #f2f3f4;
...@@ -4050,7 +4051,7 @@ img.alert-icon {float: left;} ...@@ -4050,7 +4051,7 @@ img.alert-icon {float: left;}
.int-timeline li.interview-tran-btn{ margin-left: 5px;} .int-timeline li.interview-tran-btn{ margin-left: 5px;}
.int-timeline li.interview-tran-btn span {margin-bottom: 5px;} .int-timeline li.interview-tran-btn span {margin-bottom: 5px;}
.interview-tran-btn span{background-size: 24px auto;} .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-side {padding: 17px 10px;width: 70.4%;}
.tab-view-label{width: 26%;} .tab-view-label{width: 26%;}
.like-strive{margin-top: 6px;font-size: 11px;} .like-strive{margin-top: 6px;font-size: 11px;}
...@@ -4128,7 +4129,7 @@ img.alert-icon {float: left;} ...@@ -4128,7 +4129,7 @@ img.alert-icon {float: left;}
.main-applicants-filter{margin-bottom: 60px;} .main-applicants-filter{margin-bottom: 60px;}
.main-shortlist-filter.main-applicants-filter {margin-bottom: 60px;} .main-shortlist-filter.main-applicants-filter {margin-bottom: 60px;}
.main-content-area,.second-part {min-height: 904px;} .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;} .applicant-left{border-right: none;}
.appli-list-name{padding: 8px 0 7px 8px;font-size: 16px;} .appli-list-name{padding: 8px 0 7px 8px;font-size: 16px;}
.appli-int-status{margin-top: 5px;font-size: 10px;} .appli-int-status{margin-top: 5px;font-size: 10px;}
...@@ -4314,7 +4315,7 @@ img.alert-icon {float: left;} ...@@ -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 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-pills > li + li{margin-left: 0;}
.main-content-area .main-tab-form .nav-justified > li > a {margin-bottom: 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%;} .main-application-outline {padding: 0 34px;width: 100%;}
.sl_width.slider-next.slick-arrow{right: -15px;top: 26%;} .sl_width.slider-next.slick-arrow{right: -15px;top: 26%;}
.sl_width.slider-prev.slick-arrow{left: -15px;top: 26%;} .sl_width.slider-prev.slick-arrow{left: -15px;top: 26%;}
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
List<JobApplication> applications = (List<JobApplication>) getData(request, "applications"); List<JobApplication> applications = (List<JobApplication>) getData(request, "applications");
String currentPage = (String) getData(request, "currentPage"); String currentPage = (String) getData(request, "currentPage");
String applicationPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
...@@ -41,10 +42,14 @@ ...@@ -41,10 +42,14 @@
</div> </div>
</div> </div>
<div class="appli-list-name appli-l eq-second-height"> <div class="appli-list-name appli-l eq-second-height">
<oneit:toString value="<%= jobApplication.getCandidate() %>" mode="EscapeHTML" /> <oneit:button value=" " name="gotoPage" cssClass="<%= jobApplication.getID()+"" %>" skin="link"
<div class="appli-int-status"> requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
<oneit:toString value="<%= jobApplication.getApplicantStatusStr() %>" mode="EscapeHTML" /> .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap()).toMap() %>">
</div> <oneit:toString value="<%= jobApplication.getCandidate() %>" mode="EscapeHTML" />
<div class="appli-int-status">
<oneit:toString value="<%= jobApplication.getApplicantStatusStr() %>" mode="EscapeHTML" />
</div>
</oneit:button>
</div> </div>
<div class="appli-overall appli-l eq-second-height"> <div class="appli-overall appli-l eq-second-height">
<div class="rank"> <div class="rank">
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
enums="<%= Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE, JobStatus.FILLED}) %>"/> enums="<%= Arrays.asList(new JobStatus[]{JobStatus.OPEN, JobStatus.COMPLETE, JobStatus.FILLED}) %>"/>
</div> </div>
<oneit:button name="saveJob" value="Save" cssClass="<%= "save-job" + job.getID().toString() + " hidden"%>" <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> </div>
<% <%
} }
......
...@@ -18,12 +18,11 @@ ...@@ -18,12 +18,11 @@
<div class="main-appli-name"> <div class="main-appli-name">
<div class="appli-name"><oneit:toString value="<%= candidate.getToString() %>" mode="EscapeHTML"/></div> <div class="appli-name"><oneit:toString value="<%= candidate.getToString() %>" mode="EscapeHTML"/></div>
<div class="appli-applied"> <div class="appli-applied">
Applied via seek.com.au Applied <oneit:toString value="<%= job.getObjectCreated() %>" mode="MidDate"/>
<oneit:toString value="<%= job.getObjectCreated() %>" mode="MidDate"/>
</div> </div>
</div> </div>
<div class="main-export"> <div class="main-export">
<span class="export-candidate"> <span class="export-candidate" style="display: none;">
<select class="form-control"> <select class="form-control">
<option>Export Candidate Report</option> <option>Export Candidate Report</option>
<option>PDF</option> <option>PDF</option>
...@@ -31,11 +30,8 @@ ...@@ -31,11 +30,8 @@
</select> </select>
</span> </span>
<span class="appli-status-short"> <span class="appli-status-short">
<select class="form-control status-img"> <oneit:ormEnum obj="<%= jobApplication %>" attributeName="AppProcessOption" cssClass="form-control status-img job-status"
<option data-image="images/active.png">Active</option> enums="<%= jobApplication.getValidProcessOptions() %>"/>
<option data-image="images/complete.png">Completed</option>
<option data-image="images/shortlisted.png">Shortlisted</option>
</select>
</span> </span>
</div> </div>
</div> </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