Skip to content

P
PERFORMA_REPLICA
Commit 0b56da0c by Nilu
Options

tabs of applicants.. styling issues reported in trello. bulk edit and inline edit option changes

parent 7fe9aa4d
Showing with 79 additions and 24 deletions
cmsWebApp/src/performa/form/BulkUpdateFP.java
...@@ -60,7 +60,10 @@ public class BulkUpdateFP extends SaveFP ...@@ -60,7 +60,10 @@ public class BulkUpdateFP extends SaveFP
{ {
application.setApplicationStatus(ApplicationStatus.UNSUITABLE); application.setApplicationStatus(ApplicationStatus.UNSUITABLE);
} }
else if(job.getAppProcessOption() == AppProcessOption.REMOVE_FROM_UNSUITABLE)
{
application.setApplicationStatus(ApplicationStatus.SUBMITTED);
}
LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1,"In BulkUpdateFP Job Application Status successfully changed : ", application ); LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1,"In BulkUpdateFP Job Application Status successfully changed : ", application );
} }
......
cmsWebApp/src/performa/form/ChangeApplicationStatusFP.java
...@@ -35,6 +35,14 @@ public class ChangeApplicationStatusFP extends SaveFP ...@@ -35,6 +35,14 @@ public class ChangeApplicationStatusFP extends SaveFP
{ {
jobApplication.setApplicationStatus(ApplicationStatus.SUBMITTED); jobApplication.setApplicationStatus(ApplicationStatus.SUBMITTED);
} }
else if(jobApplication.getAppProcessOption() == AppProcessOption.TO_UNSUITABLE)
{
jobApplication.setApplicationStatus(ApplicationStatus.UNSUITABLE);
}
else if(jobApplication.getAppProcessOption() == AppProcessOption.REMOVE_FROM_UNSUITABLE)
{
jobApplication.setApplicationStatus(ApplicationStatus.SUBMITTED);
}
LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1,"In ChangeApplicationStatusFP Job Application Status successfully changed : ", jobApplication ); LogMgr.log(JobApplication.LOG, LogLevel.PROCESSING1,"In ChangeApplicationStatusFP Job Application Status successfully changed : ", jobApplication );
......
cmsWebApp/src/performa/orm/Job.java
...@@ -381,17 +381,27 @@ public class Job extends BaseJob ...@@ -381,17 +381,27 @@ public class Job extends BaseJob
return getApplyBy() != null && DateDiff.endOfDay(getApplyBy()).before(DateDiff.getToday()); return getApplyBy() != null && DateDiff.endOfDay(getApplyBy()).before(DateDiff.getToday());
} }
public List<AppProcessOption> getValidProcessOptions(boolean isShortlist) public List<AppProcessOption> getValidProcessOptions(ApplicationStatus appStatus)
{ {
List<AppProcessOption> options = new ArrayList<>(); List<AppProcessOption> options = new ArrayList<>();
if(!isShortlist) if(appStatus == null)
{ {
options.add(AppProcessOption.TO_SHORTLIST); options.add(AppProcessOption.TO_SHORTLIST);
options.add(AppProcessOption.REMOVE_FROM_SHORTLIST);
options.add(AppProcessOption.TO_UNSUITABLE);
}
else if(appStatus == ApplicationStatus.SHORTLISTED)
{
options.add(AppProcessOption.REMOVE_FROM_SHORTLIST);
options.add(AppProcessOption.TO_UNSUITABLE);
}
else if(appStatus == ApplicationStatus.UNSUITABLE)
{
options.add(AppProcessOption.TO_SHORTLIST);
options.add(AppProcessOption.REMOVE_FROM_UNSUITABLE);
} }
options.add(AppProcessOption.REMOVE_FROM_SHORTLIST);
options.add(AppProcessOption.TO_UNSUITABLE);
return options; return options;
} }
......
cmsWebApp/src/performa/orm/JobApplication.java
...@@ -387,10 +387,17 @@ public class JobApplication extends BaseJobApplication ...@@ -387,10 +387,17 @@ public class JobApplication extends BaseJobApplication
if(getApplicationStatus() == ApplicationStatus.SUBMITTED) if(getApplicationStatus() == ApplicationStatus.SUBMITTED)
{ {
options.add(AppProcessOption.TO_SHORTLIST); options.add(AppProcessOption.TO_SHORTLIST);
options.add(AppProcessOption.TO_UNSUITABLE);
} }
else if(getApplicationStatus() == ApplicationStatus.SHORTLISTED) else if(getApplicationStatus() == ApplicationStatus.SHORTLISTED)
{ {
options.add(AppProcessOption.REMOVE_FROM_SHORTLIST); options.add(AppProcessOption.REMOVE_FROM_SHORTLIST);
options.add(AppProcessOption.TO_UNSUITABLE);
}
else if(getApplicationStatus() == ApplicationStatus.UNSUITABLE)
{
options.add(AppProcessOption.REMOVE_FROM_UNSUITABLE);
options.add(AppProcessOption.TO_SHORTLIST);
} }
return options; return options;
......
cmsWebApp/src/performa/orm/types/AppProcessOption.java
...@@ -25,9 +25,11 @@ public class AppProcessOption extends AbstractEnumerated ...@@ -25,9 +25,11 @@ public class AppProcessOption extends AbstractEnumerated
public static final AppProcessOption REMOVE_FROM_SHORTLIST = new AppProcessOption ("REMOVE_FROM_SHORTLIST", "REMOVE_FROM_SHORTLIST", "Remove From Shortlisted", false); public static final AppProcessOption REMOVE_FROM_SHORTLIST = new AppProcessOption ("REMOVE_FROM_SHORTLIST", "REMOVE_FROM_SHORTLIST", "Remove From Shortlisted", false);
public static final AppProcessOption TO_UNSUITABLE = new AppProcessOption ("TO_UNSUITABLE", "TO_UNSUITABLE", "To Unsuitable", false); public static final AppProcessOption TO_UNSUITABLE = new AppProcessOption ("TO_UNSUITABLE", "TO_UNSUITABLE", "To Unsuitable", false);
public static final AppProcessOption REMOVE_FROM_UNSUITABLE = new AppProcessOption ("REMOVE_FROM_UNSUITABLE", "REMOVE_FROM_UNSUITABLE", "Remove From Unsuitable", false);
private static final AppProcessOption[] allAppProcessOptions = private static final AppProcessOption[] allAppProcessOptions =
new AppProcessOption[] { TO_SHORTLIST,REMOVE_FROM_SHORTLIST,TO_UNSUITABLE}; new AppProcessOption[] { TO_SHORTLIST,REMOVE_FROM_SHORTLIST,TO_UNSUITABLE,REMOVE_FROM_UNSUITABLE};
private static AppProcessOption[] getAllAppProcessOptions () private static AppProcessOption[] getAllAppProcessOptions ()
......
cmsWebApp/src/performa/orm/types/AppProcessOption.xml
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
<ROOT> <ROOT>
<CONSTANT package="performa.orm.types" name="AppProcessOption"> <CONSTANT package="performa.orm.types" name="AppProcessOption">
<VALUE name="TO_SHORTLIST" value="TO_SHORTLIST" description="To Shortlisted"/> <VALUE name="TO_SHORTLIST" value="TO_SHORTLIST" description="To Shortlisted"/>
<VALUE name="REMOVE_FROM_SHORTLIST" value="REMOVE_FROM_SHORTLIST" description="Remove From Shortlisted"/> <VALUE name="REMOVE_FROM_SHORTLIST" value="REMOVE_FROM_SHORTLIST" description="Remove From Shortlisted"/>
<VALUE name="TO_UNSUITABLE" value="TO_UNSUITABLE" description="To Unsuitable"/> <VALUE name="TO_UNSUITABLE" value="TO_UNSUITABLE" description="To Unsuitable"/>
<VALUE name="REMOVE_FROM_UNSUITABLE" value="REMOVE_FROM_UNSUITABLE" description="Remove From Unsuitable"/>
</CONSTANT> </CONSTANT>
</ROOT> </ROOT>
cmsWebApp/webroot/css/common.css
...@@ -3426,10 +3426,10 @@ input.add-note-btn:hover{ ...@@ -3426,10 +3426,10 @@ input.add-note-btn:hover{
float: right; float: right;
text-align: center; text-align: center;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
background-color: #324150; background-color: #768595;
} }
.unsutable a span{ .unsutable a span{
color: #7b8da0; color: #ffffff;
font-size: 30px; font-size: 30px;
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
...@@ -3437,16 +3437,39 @@ input.add-note-btn:hover{ ...@@ -3437,16 +3437,39 @@ input.add-note-btn:hover{
margin-bottom: 4px; margin-bottom: 4px;
font-family: "Usual-Bold"; font-family: "Usual-Bold";
} }
.no-applicant a span{
color: #7b8da0;
}
.no-applicant a{
color: #7b8da0;
}
.no-applicant a{
background-color: #324150;
}
.no-applicant.active a{
background-color: #e9ecef;
}
no-applicant.inactive a:hover,no-applicant.inactive a:hover span{
color: #ffffff;
background-color: #4e5964;
}
.unsutable a { .unsutable a {
font-size: 11px; font-size: 11px;
display: block; display: block;
color: #7b8da0; color: #b5bfca;
padding: 9.5px 0; padding: 9.5px 0;
width: 96px; width: 96px;
font-family: "Usual-Medium"; font-family: "Usual-Medium";
} }
.unsutable.active a{
color: #8e97a0;
font-size: 11px;
font-weight: bold;
position: relative;
}
.unsutable.has-applicant.inactive a:hover,.unsutable.has-applicant.inactive a:hover span{ .unsutable.has-applicant.inactive a:hover,.unsutable.has-applicant.inactive a:hover span{
color: #ffffff; color: #ffffff;
background-color: #4e5964;
} }
.unsutable.active a:hover{ .unsutable.active a:hover{
background-color: #e9ecef; background-color: #e9ecef;
......
cmsWebApp/webroot/extensions/adminportal/inc/applicant_view_tabs.jsp
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
Applicants Applicants
</oneit:button> </oneit:button>
</li> </li>
<li class="<%= noOfShortlisted > 0 ? "has-applicant" : "" %> <%= tabNumber == "2" ? "active" : "inactive" %>"> <li class="<%= noOfShortlisted > 0 ? "has-applicant" : "no-applicant" %> <%= tabNumber == "2" ? "active" : "inactive" %>">
<oneit:button value=" " name="gotoPage" skin="link" disabled="<%= noOfShortlisted > 0 ? "false" : "true" %>" <oneit:button value=" " name="gotoPage" skin="link" disabled="<%= noOfShortlisted > 0 ? "false" : "true" %>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondTab) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondTab)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="unsutable <%= noOfUnsuitable > 0 ? "has-applicant" : "" %> <%= tabNumber == "3" ? "active" : "inactive" %>"> <div class="unsutable <%= noOfUnsuitable > 0 ? "has-applicant" : "no-applicant" %> <%= tabNumber == "3" ? "active" : "inactive" %>">
<oneit:button id="unsuitableBtn" value=" " name="gotoPage" skin="link" disabled="<%= noOfUnsuitable > 0 ? "false" : "true" %>" <oneit:button id="unsuitableBtn" value=" " name="gotoPage" skin="link" disabled="<%= noOfUnsuitable > 0 ? "false" : "true" %>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdTab) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdTab)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
......
cmsWebApp/webroot/extensions/adminportal/inc/application_sorting_bar.jsp
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
<%@ page import="oneit.utils.text.FormatUtils"%> <%@ page import="oneit.utils.text.FormatUtils"%>
<% <%
Job job = (Job) process.getAttribute("Job"); Job job = (Job) process.getAttribute("Job");
String currentPage = (String) getData(request, "currentPage"); String currentPage = (String) getData(request, "currentPage");
AppSortOption appSortOpt = (AppSortOption) getData(request, "sortOption"); AppSortOption appSortOpt = (AppSortOption) getData(request, "sortOption");
String tabNumber = (String) getData(request, "tabNumber"); String tabNumber = (String) getData(request, "tabNumber");
Boolean isShortList = getData(request, "isShortList")!= null ? (Boolean) getData(request, "isShortList") : Boolean.FALSE; ApplicationStatus appStatus = (ApplicationStatus) getData(request, "appStatus");
Boolean showOrderBy = getData(request, "showOrderBy")!= null ? (Boolean) getData(request, "showOrderBy") : Boolean.FALSE; Boolean showOrderBy = getData(request, "showOrderBy")!= null ? (Boolean) getData(request, "showOrderBy") : Boolean.FALSE;
%> %>
<oneit:dynIncluded> <oneit:dynIncluded>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<div class="appli-shorting-dropdown appli-left"> <div class="appli-shorting-dropdown appli-left">
<span class="appli-order-label">Bulk Update</span> <span class="appli-order-label">Bulk Update</span>
<oneit:ormEnum obj="<%= job %>" attributeName="AppProcessOption" cssClass="form-control bullk-app-process" id="AppProcessOption" <oneit:ormEnum obj="<%= job %>" attributeName="AppProcessOption" cssClass="form-control bullk-app-process" id="AppProcessOption"
enums="<%= job.getValidProcessOptions(isShortList) %>"/> enums="<%= job.getValidProcessOptions(appStatus) %>"/>
<oneit:button name="bulkupdate" value=" " cssClass="bulk-update" skin="link" <oneit:button name="bulkupdate" value=" " cssClass="bulk-update" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
String firstTab = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS); String firstTab = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS);
String secondTab = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS_GRID); String secondTab = WebUtils.getSamePageInRenderMode(request, WebUtils.VIEW_APPLICANTS_GRID);
if(isShortList) if(appStatus != null && appStatus == ApplicationStatus.SHORTLISTED)
{ {
firstTab = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_SHORTLIST); firstTab = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_SHORTLIST);
secondTab = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_GRID); secondTab = WebUtils.getSamePageInRenderMode(request, WebUtils.APPLICANTS_GRID);
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist.jsp
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
sortOption="<%= appSortOpt %>" sortOption="<%= appSortOpt %>"
currentPage="<%= currentPage %>" currentPage="<%= currentPage %>"
tabNumber="1" tabNumber="1"
isShortList="<%= Boolean.TRUE %>" appStatus="<%= ApplicationStatus.SHORTLISTED %>"
showOrderBy="<%= sortedApplications.size() > 1 %>" showOrderBy="<%= sortedApplications.size() > 1 %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/> data="<%= CollectionUtils.EMPTY_MAP%>"/>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
sortOption="<%= appSortOpt %>" sortOption="<%= appSortOpt %>"
currentPage="<%= currentPage %>" currentPage="<%= currentPage %>"
tabNumber="2" tabNumber="2"
isShortList="<%= Boolean.TRUE %>" appStatus="<%= ApplicationStatus.SHORTLISTED %>"
showOrderBy="<%= sortedApplications.size() > 1 %>" showOrderBy="<%= sortedApplications.size() > 1 %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/> data="<%= CollectionUtils.EMPTY_MAP%>"/>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_unsuitable.jsp
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<oneit:dynInclude page="/extensions/adminportal/inc/application_sorting_bar.jsp" <oneit:dynInclude page="/extensions/adminportal/inc/application_sorting_bar.jsp"
sortOption="<%= appSortOpt %>" sortOption="<%= appSortOpt %>"
currentPage="<%= currentPage %>" currentPage="<%= currentPage %>"
appStatus="<%= ApplicationStatus.UNSUITABLE %>"
showOrderBy="<%= sortedApplications.size() > 1 %>" showOrderBy="<%= sortedApplications.size() > 1 %>"
data="<%= CollectionUtils.EMPTY_MAP%>"/> data="<%= CollectionUtils.EMPTY_MAP%>"/>
......
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