Skip to content

P
PERFORMA_REPLICA
Commit 1a5b49e1 by Nilu
Options

showing client name and client logo to admin portal and applicant portal.… 

showing client name and client logo to admin portal and applicant portal. Allowing users to select a client when creating a job.
parent 292bd731
Showing with 146 additions and 34 deletions
cmsWebApp/src/performa/orm/Client.java
...@@ -22,4 +22,11 @@ public class Client extends BaseClient ...@@ -22,4 +22,11 @@ public class Client extends BaseClient
// return pipesClient().toJobs(filter).toJobApplications().uniqueVals().size(); // return pipesClient().toJobs(filter).toJobApplications().uniqueVals().size();
return 0; return 0;
} }
@Override
public String getToString()
{
return getClientName();
}
} }
\ No newline at end of file
cmsWebApp/src/performa/orm/CompanyUser.java
...@@ -35,4 +35,11 @@ public class CompanyUser extends BaseCompanyUser ...@@ -35,4 +35,11 @@ public class CompanyUser extends BaseCompanyUser
return null; return null;
} }
@Override
public String getToString()
{
return getUser().getName();
}
} }
\ No newline at end of file
cmsWebApp/src/performa/utils/Utils.java
...@@ -10,6 +10,7 @@ import oneit.logging.LogMgr; ...@@ -10,6 +10,7 @@ import oneit.logging.LogMgr;
import oneit.logging.LoggingArea; import oneit.logging.LoggingArea;
import oneit.objstore.BaseBusinessClass; import oneit.objstore.BaseBusinessClass;
import oneit.objstore.ObjectTransaction; import oneit.objstore.ObjectTransaction;
import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.objstore.rdbms.filters.GreaterThanEqualFilter; import oneit.objstore.rdbms.filters.GreaterThanEqualFilter;
import oneit.objstore.rdbms.filters.LessThanFilter; import oneit.objstore.rdbms.filters.LessThanFilter;
import oneit.security.*; import oneit.security.*;
...@@ -346,4 +347,15 @@ public class Utils ...@@ -346,4 +347,15 @@ public class Utils
return new RedirectResult((String) request.getAttribute("nextPage"), null); return new RedirectResult((String) request.getAttribute("nextPage"), null);
} }
public static Client[] getClientsByCompany(ObjectTransaction transaction)
{
SecUser secUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
Company company = companyUser.getCompany();
return Client.SearchByAll()
.andCompany(new EqualsFilter<>(company))
.search(transaction);
}
} }
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
...@@ -43,13 +43,10 @@ ...@@ -43,13 +43,10 @@
<div class="optional-title">OPTIONAL</div> <div class="optional-title">OPTIONAL</div>
<div class="row"> <div class="row">
<div class="col-sm-6 col-xs-12 form-group"> <div class="col-sm-6 col-xs-12 form-group">
<label>Client</label> <label><oneit:label GUIName="Client"/></label>
<select class="form-control"> <div class="wider-select">
<option>Australia Post</option> <tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/>
<option>One 1</option> </div>
<option>One 2</option>
<option>One 3</option>
</select>
</div> </div>
<div class="col-sm-6 col-xs-12 form-group"> <div class="col-sm-6 col-xs-12 form-group">
<label><oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" /></label> <label><oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" /></label>
......
cmsWebApp/webroot/extensions/adminportal/inc/job_list.jsp
...@@ -55,7 +55,9 @@ ...@@ -55,7 +55,9 @@
</a> </a>
</div> </div>
<div class="job-company-name"> <div class="job-company-name">
<!--<span class="superlaw">SUPERLAW</span>--> <span class="superlaw">
<oneit:toString value="<%= job.getClient() %>" mode="EscapeHTML" />
</span>
<span class="calendar"> <span class="calendar">
<% <%
if(job.getJobStatus() == JobStatus.OPEN) if(job.getJobStatus() == JobStatus.OPEN)
......
cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp
...@@ -16,7 +16,16 @@ ...@@ -16,7 +16,16 @@
<div class="officer-box"> <div class="officer-box">
<div class="officer-name"> <div class="officer-name">
<div class="chief-officer"><img src="images/post-p.png" /> <div class="chief-officer">
<%
if(job.getClient() != null)
{
int logoWidth = 27;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
<oneit:button value=" " name="gotoPage" skin="link" <oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
...@@ -25,7 +34,9 @@ ...@@ -25,7 +34,9 @@
</oneit:button> </oneit:button>
</div> </div>
<div class="off-name"> <div class="off-name">
<span class="austr-post">Australia Post</span> by <oneit:toString value="<%= job.getCompanyUser() %>" mode="EscapeHTML" nullValue=""/><span class="ex-management">&bull;&nbsp; <span class="austr-post">
<oneit:toString value="<%= job.getClient() %>" mode="EscapeHTML" />
</span> by <oneit:toString value="<%= job.getCompanyUser() %>" mode="EscapeHTML" nullValue=""/><span class="ex-management">&bull;&nbsp;
<oneit:toString value="<%= job.getLevel() %>" mode="EscapeHTML" /> <oneit:toString value="<%= job.getLevel() %>" mode="EscapeHTML" />
</span> </span>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
...@@ -81,13 +81,10 @@ ...@@ -81,13 +81,10 @@
<div class="optional-title">OPTIONAL</div> <div class="optional-title">OPTIONAL</div>
<div class="row"> <div class="row">
<div class="col-sm-6 col-xs-12 form-group"> <div class="col-sm-6 col-xs-12 form-group">
<label>Client</label> <label><oneit:label GUIName="Client"/></label>
<select class="form-control"> <div class="wider-select">
<option>Please Select or Add New</option> <tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/>
<option>One 1</option> </div>
<option>One 2</option>
<option>One 3</option>
</select>
</div> </div>
<div class="col-sm-6 col-xs-12 form-group"> <div class="col-sm-6 col-xs-12 form-group">
<label><oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" /></label> <label><oneit:ormlabel obj="<%= job %>" field="ReferenceNumber" /></label>
......
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
...@@ -58,12 +58,20 @@ ...@@ -58,12 +58,20 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="row main-review-label"> <div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">Job Type</div> <div class="col-sm-3 col-xs-12 review-label">
<div class="col-sm-9 col-xs-12 review-data"><oneit:toString value="<%= job.getJobType() %>" mode="EscapeHTML" /></div> <oneit:label GUIName="Job Type" />
</div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getJobType() %>" mode="EscapeHTML" />
</div>
</div> </div>
<div class="row main-review-label"> <div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label">Client</div> <div class="col-sm-3 col-xs-12 review-label">
<div class="col-sm-9 col-xs-12 review-data">Australia Post</div> <oneit:label GUIName="Client" />
</div>
<div class="col-sm-9 col-xs-12 review-data">
<oneit:toString value="<%= job.getClient() %>" mode="EscapeHTML" />
</div>
</div> </div>
<div class="row main-review-label"> <div class="row main-review-label">
<div class="col-sm-3 col-xs-12 review-label"> <div class="col-sm-3 col-xs-12 review-label">
......
cmsWebApp/webroot/extensions/adminportal/list_clients.jsp
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
String clientPage = WebUtils.getSamePageInRenderMode(request, "Page"); String clientPage = WebUtils.getSamePageInRenderMode(request, "Page");
ClientSortOption clientSortOpt = (ClientSortOption) process.getAttribute("ClientSortOption"); ClientSortOption clientSortOpt = (ClientSortOption) process.getAttribute("ClientSortOption");
Client[] clients = (Client[]) process.getAttribute("Clients"); Client[] clients = (Client[]) process.getAttribute("Clients");
if( request.getParameter("ClientSortOption") != null) if( request.getParameter("ClientSortOption") != null)
{ {
clientSortOpt = ClientSortOption.forName((String) request.getParameter("ClientSortOption")); clientSortOpt = ClientSortOption.forName((String) request.getParameter("ClientSortOption"));
...@@ -23,9 +22,7 @@ ...@@ -23,9 +22,7 @@
if(clients == null) if(clients == null)
{ {
// TODO: add filter to show jobs belongs to logged in company clients = Utils.getClientsByCompany(transaction);
clients = Client.SearchByAll()
.search(transaction);
process.setAttribute("Clients", clients); process.setAttribute("Clients", clients);
} }
......
cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp
...@@ -77,7 +77,17 @@ ...@@ -77,7 +77,17 @@
process.setAttribute("JobApplication", jobApplication); process.setAttribute("JobApplication", jobApplication);
%> %>
<div class="welcome-aust-logo"><img src="images/australia-post.png" /></div> <div class="welcome-aust-logo">
<%
if(job.getClient() != null)
{
int logoWidth = 45;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
</div>
<div class="welcome-title">Welcome <oneit:toString value="<%= candidate.getFirstName() %>"/>, here's your application outline</div> <div class="welcome-title">Welcome <oneit:toString value="<%= candidate.getFirstName() %>"/>, here's your application outline</div>
<div class="appli-aust-title"> <div class="appli-aust-title">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/>
......
cmsWebApp/webroot/extensions/applicantportal/job_match_assessment.jsp
...@@ -90,7 +90,15 @@ ...@@ -90,7 +90,15 @@
<div class="main-application-outline"> <div class="main-application-outline">
<div class="selection-aust-logo"> <div class="selection-aust-logo">
<img src="images/australia-post.png" /> <%
if(job.getClient() != null)
{
int logoWidth = 45;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
<span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span>
</div> </div>
<div class="show-mobile-title"> <div class="show-mobile-title">
......
cmsWebApp/webroot/extensions/applicantportal/job_overview.jsp
...@@ -28,7 +28,17 @@ ...@@ -28,7 +28,17 @@
</style> </style>
<div class="main-position-overview"> <div class="main-position-overview">
<div class="aust-logo"><img src="images/australia-post.png"></div> <div class="aust-logo">
<%
if(job.getClient() != null)
{
int logoWidth = 45;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
</div>
<div class="overview-title"> <div class="overview-title">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/>
</div> </div>
......
cmsWebApp/webroot/extensions/applicantportal/selection_criteria.jsp
...@@ -45,7 +45,15 @@ ...@@ -45,7 +45,15 @@
<div class="main-application-outline"> <div class="main-application-outline">
<div class="selection-aust-logo"> <div class="selection-aust-logo">
<img src="images/australia-post.png" /> <%
if(job.getClient() != null)
{
int logoWidth = 45;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
<span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span>
</div> </div>
<div class="show-mobile-title"> <div class="show-mobile-title">
......
cmsWebApp/webroot/extensions/applicantportal/sign_in.jsp
...@@ -79,7 +79,17 @@ ...@@ -79,7 +79,17 @@
</style> </style>
<div class="main-verify-identity"> <div class="main-verify-identity">
<div class="verify-aust-logo"><img src="images/australia-post.png"></div> <div class="verify-aust-logo">
<%
if(job.getClient() != null)
{
int logoWidth = 45;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
</div>
<div class="pl-verify">Please verify your identity before applying to:</div> <div class="pl-verify">Please verify your identity before applying to:</div>
<div class="verify-i-title"> <div class="verify-i-title">
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/>
......
cmsWebApp/webroot/extensions/applicantportal/submit_application.jsp
...@@ -17,7 +17,15 @@ ...@@ -17,7 +17,15 @@
<div class="main-application-outline"> <div class="main-application-outline">
<div class="selection-aust-logo"> <div class="selection-aust-logo">
<img src="images/australia-post.png" /> <%
if(job.getClient() != null)
{
int logoWidth = 45;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
<span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span>
</div> </div>
<div class="mobile-successfull-show display-none">Thank you <span><img class="mob-smile-face" src="images/smile-face.png" /></span></div> <div class="mobile-successfull-show display-none">Thank you <span><img class="mob-smile-face" src="images/smile-face.png" /></span></div>
......
cmsWebApp/webroot/extensions/applicantportal/verify_identity.jsp
...@@ -100,7 +100,17 @@ ...@@ -100,7 +100,17 @@
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/> <oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="main-verify-identity"> <div class="main-verify-identity">
<div class="verify-aust-logo"><img src="images/australia-post.png"></div> <div class="verify-aust-logo">
<%
if(job.getClient() != null)
{
int logoWidth = 45;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
</div>
<div class="pl-confirm text-center">Please confirm your details to continue</div> <div class="pl-confirm text-center">Please confirm your details to continue</div>
<div class="main-box-layout main-verify-step-2"> <div class="main-box-layout main-verify-step-2">
<div class="form-group text-left"> <div class="form-group text-left">
......
cmsWebApp/webroot/extensions/applicantportal/workplace_culture.jsp
...@@ -68,7 +68,15 @@ ...@@ -68,7 +68,15 @@
<div class="main-application-outline"> <div class="main-application-outline">
<div class="selection-aust-logo"> <div class="selection-aust-logo">
<img src="images/australia-post.png" /> <%
if(job.getClient() != null)
{
int logoWidth = 45;
%>
<tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
<%
}
%>
<span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span> <span><oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML"/></span>
</div> </div>
<div class="show-mobile-title"> <div class="show-mobile-title">
......
cmsWebApp/webroot/extensions/performa/inc/stdimports.jsp
<%@ page import="performa.orm.*, performa.orm.types.*, performa.form.*, performa.utils.*"%> <%@ page import="performa.orm.*, performa.orm.types.*, performa.form.*, performa.utils.*"%>
<%@ page import="oneit.objstore.rdbms.filters.*, oneit.security.jsp.SecUserToNameTransform, oneit.servlets.utils.* "%> <%@ page import="oneit.objstore.rdbms.filters.*, oneit.security.jsp.SecUserToNameTransform, oneit.servlets.utils.*, oneit.utils.image.* "%>
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