Skip to content

P
PERFORMA_REPLICA
Commit 14ce31f3 by Nilu
Options

adding client filter to templates

parent bad6fb3b
Showing with 37 additions and 65 deletions
cmsWebApp/webroot/extensions/adminportal/culture_templates.jsp
...@@ -4,9 +4,12 @@ ...@@ -4,9 +4,12 @@
<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%> <%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
<%@ include file="/extensions/performa/inc/stdimports.jsp" %> <%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<%@ page import="oneit.utils.filter.*"%>
<oneit:dynIncluded> <oneit:dynIncluded>
<% <%
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_CULTURE); String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_CULTURE);
String homePage = WebUtils.getSamePageInRenderMode(request, "Page");
SecUser secUser = SecUser.getTXUser(transaction); SecUser secUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
HiringTeam hiringTeam = companyUser.getSelectedTeam(); HiringTeam hiringTeam = companyUser.getSelectedTeam();
...@@ -18,22 +21,8 @@ ...@@ -18,22 +21,8 @@
response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request)); response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
} }
String clientPage = WebUtils.getSamePageInRenderMode(request, "Page");
ClientSortOption clientSortOpt = (ClientSortOption) process.getAttribute("ClientSortOption");
Client[] clients = (Client[]) process.getAttribute("Clients");
CultureCriteriaTemplate[] templates = (CultureCriteriaTemplate[]) process.getAttribute("CultureCriteriaTemplates"); CultureCriteriaTemplate[] templates = (CultureCriteriaTemplate[]) process.getAttribute("CultureCriteriaTemplates");
if( request.getParameter("ClientSortOption") != null)
{
clientSortOpt = ClientSortOption.forName((String) request.getParameter("ClientSortOption"));
}
if(clientSortOpt == null)
{
clientSortOpt = ClientSortOption.ALPHA_A_Z;
}
if(templates == null) if(templates == null)
{ {
templates = CultureCriteriaTemplate.SearchByAll() templates = CultureCriteriaTemplate.SearchByAll()
...@@ -52,22 +41,16 @@ ...@@ -52,22 +41,16 @@
selectedClient = Client.getClientByID(transaction, Long.valueOf(request.getParameter("Client"))); selectedClient = Client.getClientByID(transaction, Long.valueOf(request.getParameter("Client")));
} }
} }
else
{
selectedClient = (Client) session.getAttribute("Client");
}
session.setAttribute("Client", selectedClient); List<CultureCriteriaTemplate> templateList = Arrays.asList(templates);
if(clients == null) // filter templates by client
if(selectedClient != null && selectedClient.getInTransaction(transaction).getHiringTeam() == hiringTeam)
{ {
clients = Utils.getClientsByHiringTeam(transaction); oneit.utils.filter.Filter<CultureCriteriaTemplate> filter = CultureCriteriaTemplate.SearchByAll().andClient(new EqualsFilter<>(selectedClient));
process.setAttribute("Clients", clients); templateList = new ArrayList<>(CollectionFilter.filter(templateList, filter));
} }
List<Client> sortedClients = Utils.getClientsSorted(clients, clientSortOpt);
process.setAttribute("ClientSortOption", clientSortOpt);
%> %>
<oneit:form name="cultureTemplates" method="post" enctype="multipart/form-data"> <oneit:form name="cultureTemplates" method="post" enctype="multipart/form-data">
...@@ -76,19 +59,22 @@ ...@@ -76,19 +59,22 @@
<div class="jobs-list-shorting"> <div class="jobs-list-shorting">
<div class="d-job-title all-jobs-title">Manage Culture Templates</div> <div class="d-job-title all-jobs-title">Manage Culture Templates</div>
<% <%
if(false) if(hiringTeam.showHasClientSupport())
{ {
%> %>
<div class="shorting-dropdown"> <div class="shorting-dropdown">
<span class="order-label">Select Client</span> <div class="order-label">client</div>
<select class="form-control" onChange="location=this.value"> <select class="form-control" onChange="location=this.value">
<option <%= (selectedClient == null ? "selected" : "" )%> value="<%= homePage + "&Client"%>">
<oneit:toString value="All Clients" mode="EscapeHTML"/>
</option>
<% <%
for (ClientSortOption sortOption : ClientSortOption.getClientSortOptionArray()) for (Client client : Utils.getClientsByHiringTeam(transaction))
{ {
String optionLink = clientPage + "&ClientSortOption=" + sortOption.getName() ; String optionLink = homePage + "&Client=" + client.getID().longID() ;
%> %>
<option <%= (clientSortOpt != null && clientSortOpt == sortOption ? "selected" : "" )%> value="<%= optionLink %>"> <option <%= (client != null && selectedClient != null && client.equals(selectedClient) ? "selected" : "" )%> value="<%= optionLink %>">
<oneit:toString value="<%= sortOption.getDescription() %>" mode="EscapeHTML"/> <oneit:toString value="<%= client.getClientName() %>" mode="EscapeHTML"/>
</option> </option>
<% <%
} }
...@@ -103,7 +89,7 @@ ...@@ -103,7 +89,7 @@
<div class="main-client-list"> <div class="main-client-list">
<% <%
for(CultureCriteriaTemplate template : templates) for(CultureCriteriaTemplate template : templateList)
{ {
%> %>
<div class="template-list" id="<%= template.getID() %>"> <div class="template-list" id="<%= template.getID() %>">
......
cmsWebApp/webroot/extensions/adminportal/edit_culture_template.jsp
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<oneit:ormInput obj="<%= template %>" type="text" attributeName="TemplateName" cssClass="form-control" /> <oneit:ormInput obj="<%= template %>" type="text" attributeName="TemplateName" cssClass="form-control" />
</div> </div>
<% <%
if(template.getClient() != null) if(template.getHiringTeam().showHasClientSupport())
{ {
%> %>
<div class="col-md-1"> <div class="col-md-1">
......
cmsWebApp/webroot/extensions/adminportal/job_templates.jsp
...@@ -4,9 +4,12 @@ ...@@ -4,9 +4,12 @@
<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%> <%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
<%@ include file="/extensions/performa/inc/stdimports.jsp" %> <%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<%@ page import="oneit.utils.filter.*"%>
<oneit:dynIncluded> <oneit:dynIncluded>
<% <%
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB_TEMP); String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.EDIT_JOB_TEMP);
String homePage = WebUtils.getSamePageInRenderMode(request, "Page");
SecUser secUser = SecUser.getTXUser(transaction); SecUser secUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser); CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
HiringTeam hiringTeam = companyUser.getSelectedTeam(); HiringTeam hiringTeam = companyUser.getSelectedTeam();
...@@ -18,22 +21,8 @@ ...@@ -18,22 +21,8 @@
response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request)); response.sendRedirect(WebUtils.getArticleByShortCut(transaction, WebUtils.ADMIN_HOME).getLink(request));
} }
String clientPage = WebUtils.getSamePageInRenderMode(request, "Page");
ClientSortOption clientSortOpt = (ClientSortOption) process.getAttribute("ClientSortOption");
Client[] clients = (Client[]) process.getAttribute("Clients");
AssessmentCriteriaTemplate[] templates = (AssessmentCriteriaTemplate[]) process.getAttribute("AssessmentCriteriaTemplates"); AssessmentCriteriaTemplate[] templates = (AssessmentCriteriaTemplate[]) process.getAttribute("AssessmentCriteriaTemplates");
if( request.getParameter("ClientSortOption") != null)
{
clientSortOpt = ClientSortOption.forName((String) request.getParameter("ClientSortOption"));
}
if(clientSortOpt == null)
{
clientSortOpt = ClientSortOption.ALPHA_A_Z;
}
if(templates == null) if(templates == null)
{ {
templates = AssessmentCriteriaTemplate.SearchByAll() templates = AssessmentCriteriaTemplate.SearchByAll()
...@@ -52,22 +41,16 @@ ...@@ -52,22 +41,16 @@
selectedClient = Client.getClientByID(transaction, Long.valueOf(request.getParameter("Client"))); selectedClient = Client.getClientByID(transaction, Long.valueOf(request.getParameter("Client")));
} }
} }
else
{
selectedClient = (Client) session.getAttribute("Client");
}
session.setAttribute("Client", selectedClient); List<AssessmentCriteriaTemplate> templateList = Arrays.asList(templates);
if(clients == null) // filter templates by client
if(selectedClient != null && selectedClient.getInTransaction(transaction).getHiringTeam() == hiringTeam)
{ {
clients = Utils.getClientsByHiringTeam(transaction); oneit.utils.filter.Filter<AssessmentCriteriaTemplate> filter = AssessmentCriteriaTemplate.SearchByAll().andClient(new EqualsFilter<>(selectedClient));
process.setAttribute("Clients", clients); templateList = new ArrayList<>(CollectionFilter.filter(templateList, filter));
} }
List<Client> sortedClients = Utils.getClientsSorted(clients, clientSortOpt);
process.setAttribute("ClientSortOption", clientSortOpt);
%> %>
<oneit:form name="jobTemplates" method="post" enctype="multipart/form-data"> <oneit:form name="jobTemplates" method="post" enctype="multipart/form-data">
...@@ -76,19 +59,22 @@ ...@@ -76,19 +59,22 @@
<div class="jobs-list-shorting"> <div class="jobs-list-shorting">
<div class="d-job-title all-jobs-title">Manage Job Templates</div> <div class="d-job-title all-jobs-title">Manage Job Templates</div>
<% <%
if(false) if(hiringTeam.showHasClientSupport())
{ {
%> %>
<div class="shorting-dropdown"> <div class="shorting-dropdown">
<span class="order-label">Select Client</span> <div class="order-label">client</div>
<select class="form-control" onChange="location=this.value"> <select class="form-control" onChange="location=this.value">
<option <%= (selectedClient == null ? "selected" : "" )%> value="<%= homePage + "&Client"%>">
<oneit:toString value="All Clients" mode="EscapeHTML"/>
</option>
<% <%
for (ClientSortOption sortOption : ClientSortOption.getClientSortOptionArray()) for (Client client : Utils.getClientsByHiringTeam(transaction))
{ {
String optionLink = clientPage + "&ClientSortOption=" + sortOption.getName() ; String optionLink = homePage + "&Client=" + client.getID().longID() ;
%> %>
<option <%= (clientSortOpt != null && clientSortOpt == sortOption ? "selected" : "" )%> value="<%= optionLink %>"> <option <%= (client != null && selectedClient != null && client.equals(selectedClient) ? "selected" : "" )%> value="<%= optionLink %>">
<oneit:toString value="<%= sortOption.getDescription() %>" mode="EscapeHTML"/> <oneit:toString value="<%= client.getClientName() %>" mode="EscapeHTML"/>
</option> </option>
<% <%
} }
...@@ -103,7 +89,7 @@ ...@@ -103,7 +89,7 @@
<div class="main-client-list"> <div class="main-client-list">
<% <%
for(AssessmentCriteriaTemplate template : templates) for(AssessmentCriteriaTemplate template : templateList)
{ {
%> %>
<div class="template-list" id="<%= template.getID() %>"> <div class="template-list" id="<%= template.getID() %>">
......
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