Commit 1e863afc by chenith Committed by Harsh Shah

Updated application status change in application view.

parent 8d4aebee
...@@ -209,13 +209,18 @@ public class JobApplication extends BaseJobApplication ...@@ -209,13 +209,18 @@ public class JobApplication extends BaseJobApplication
public String getApplicantStatusStr() public String getApplicantStatusStr()
{ {
if(getApplicationStatus() == ApplicationStatus.SUBMITTED) return getApplicationStatus().getDescription();
{ }
return "Applicant";
}
else public List<ApplicationStatus> getAvailableStatuses()
{ {
return getApplicationStatus().getDescription(); List<ApplicationStatus> statuses = new ArrayList<>();
}
statuses.add(ApplicationStatus.SUBMITTED);
statuses.add(ApplicationStatus.SHORTLISTED);
statuses.add(ApplicationStatus.UNSUITABLE);
return statuses;
} }
} }
\ No newline at end of file
...@@ -22,7 +22,7 @@ public class ApplicationStatus extends AbstractEnumerated ...@@ -22,7 +22,7 @@ public class ApplicationStatus extends AbstractEnumerated
public static final ApplicationStatus DRAFT = new ApplicationStatus ("DRAFT", "DRAFT", "Draft", false); public static final ApplicationStatus DRAFT = new ApplicationStatus ("DRAFT", "DRAFT", "Draft", false);
public static final ApplicationStatus SUBMITTED = new ApplicationStatus ("SUBMITTED", "SUBMITTED", "Submitted", false); public static final ApplicationStatus SUBMITTED = new ApplicationStatus ("SUBMITTED", "SUBMITTED", "Applicant", false);
public static final ApplicationStatus SHORTLISTED = new ApplicationStatus ("SHORTLISTED", "SHORTLISTED", "Shortlisted", false); public static final ApplicationStatus SHORTLISTED = new ApplicationStatus ("SHORTLISTED", "SHORTLISTED", "Shortlisted", false);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<CONSTANT package="performa.orm.types" name="ApplicationStatus"> <CONSTANT package="performa.orm.types" name="ApplicationStatus">
<VALUE name="DRAFT" value="DRAFT" description="Draft"/> <VALUE name="DRAFT" value="DRAFT" description="Draft"/>
<VALUE name="SUBMITTED" value="SUBMITTED" description="Submitted"/> <VALUE name="SUBMITTED" value="SUBMITTED" description="Applicant"/>
<VALUE name="SHORTLISTED" value="SHORTLISTED" description="Shortlisted"/> <VALUE name="SHORTLISTED" value="SHORTLISTED" description="Shortlisted"/>
<VALUE name="UNSUITABLE" value="UNSUITABLE" description="Unsuitable"/> <VALUE name="UNSUITABLE" value="UNSUITABLE" description="Unsuitable"/>
......
...@@ -2957,6 +2957,7 @@ input.add-note-btn:hover{ ...@@ -2957,6 +2957,7 @@ input.add-note-btn:hover{
font-size: 12px; font-size: 12px;
text-transform: uppercase; text-transform: uppercase;
margin-bottom: 15px; margin-bottom: 15px;
font-family: Usual-Regular;
} }
.applicant-progress { .applicant-progress {
display: inline-block; display: inline-block;
......
...@@ -9,10 +9,20 @@ ...@@ -9,10 +9,20 @@
Job job = jobApplication.getJob(); Job job = jobApplication.getJob();
Candidate candidate = jobApplication.getCandidate(); Candidate candidate = jobApplication.getCandidate();
String tabText = candidate.getToString(); String tabText = candidate.getToString();
String currentPage = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICATION);
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
<script>
// $(document).on('click', '.nav-list li', function() {
// $(".nav-list li").removeClass("active");
// $(this).addClass("active");
// });
//
</script>
<div class="main-applicant-content"> <div class="main-applicant-content">
<div class="applicant-header"> <div class="applicant-header">
<div class="main-appli-name"> <div class="main-appli-name">
...@@ -30,28 +40,33 @@ ...@@ -30,28 +40,33 @@
</select> </select>
</span> </span>
<span class="appli-status-short"> <span class="appli-status-short">
<oneit:ormEnum obj="<%= jobApplication %>" attributeName="AppProcessOption" cssClass="form-control status-img job-status" <oneit:ormEnum obj="<%= jobApplication %>" onChange="$('#saveBtn').click()" attributeName="ApplicationStatus" cssClass="form-control status-img"
enums="<%= jobApplication.getValidProcessOptions() %>"/> enums="<%= jobApplication.getAvailableStatuses() %>"/>
<oneit:button name="save" value="Save" cssClass="hidden" id="saveBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry ("attribNamesToRestore", new HashSet<String> (Arrays.asList(new String[] {"Job", "JobApplication"})))
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).mapEntry("Job", job).toMap())
.mapEntry ("restartProcess", Boolean.TRUE).toMap() %>" />
</span> </span>
</div> </div>
</div> </div>
<div class="applicant-sub-part"> <div class="applicant-sub-part">
<div class="applicant-left"> <div class="applicant-left">
<div class="applicant-progress"> <div class="applicant-progress">
<div class="col-sm-4 col-xs-12 text-center"> <div class="col-sm-4 col-xs-12 text-center" href="#1a" data-toggle="tab" id="progress1">
<label class="progress-label">job match</label> <label class="progress-label">role fit</label>
<div class="percent-green fixed-width"> <div class="percent-green fixed-width">
<p style="display:none;">83%</p> <p style="display:none;">83%</p>
</div> </div>
</div> </div>
<div class="col-sm-4 col-xs-12 text-center"> <div class="col-sm-4 col-xs-12 text-center" href="#2a" data-toggle="tab" id="progress2">
<label class="progress-label">culture</label> <label class="progress-label">culture fit</label>
<div class="percent-green fixed-width"> <div class="percent-green fixed-width">
<p style="display:none;">83%</p> <p style="display:none;">83%</p>
</div> </div>
</div> </div>
<div class="col-sm-4 col-xs-12 text-center"> <div class="col-sm-4 col-xs-12 text-center" href="#4a" data-toggle="tab" id="progress3">
<label class="progress-label">Selection criteria</label> <label class="progress-label">requirements</label>
<div class="percent-blue fixed-width"> <div class="percent-blue fixed-width">
<p style="display:none;">70%</p> <p style="display:none;">70%</p>
</div> </div>
...@@ -59,10 +74,10 @@ ...@@ -59,10 +74,10 @@
</div> </div>
<div class="applicant-tab"> <div class="applicant-tab">
<ul class="nav nav-pills nav-justified"> <ul class="nav nav-pills nav-justified">
<li class="active"><a href="#1a" data-toggle="tab">job match</a></li> <li class="active"><a href="#1a" data-toggle="tab">role fit</a>s</li>
<li><a href="#2a" data-toggle="tab">Culture</a></li> <li><a href="#2a" data-toggle="tab">culture fit</a></li>
<li><a href="#3a" data-toggle="tab">Selection Criteria</a></li> <li><a href="#3a" data-toggle="tab">requirements</a></li>
<li><a href="#4a" data-toggle="tab">Areas of concern</a></li> <li><a href="#4a" data-toggle="tab">areas of concern</a></li>
</ul> </ul>
<div class="tab-content clearfix"> <div class="tab-content clearfix">
<div class="tab-pane active" id="1a"> <div class="tab-pane active" id="1a">
......
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