Skip to content

P
PERFORMA_REPLICA
Commit ac637faa by Nilu Committed by Harsh Shah
Options

renaming and ordering of job creation tabs. template saving changes

parent 6b2aa5fc
Showing with 126 additions and 88 deletions
cmsWebApp/src/performa/orm/BaseCultureCriteria.java
......@@ -195,7 +195,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
metaInfo.put ("dbcol", "importance");
metaInfo.put ("defaultValue", "Importance.NOT_APPLICABLE");
metaInfo.put ("defaultValue", "Importance.DESIRABLE");
metaInfo.put ("mandatory", "true");
metaInfo.put ("name", "Importance");
metaInfo.put ("type", "Importance");
......@@ -236,7 +236,7 @@ public abstract class BaseCultureCriteria extends BaseBusinessClass
super._initialiseNewObjAttributes (transaction);
_Importance = (Importance)(Importance.NOT_APPLICABLE);
_Importance = (Importance)(Importance.DESIRABLE);
}
......
cmsWebApp/src/performa/orm/CultureCriteria.xml
......@@ -9,7 +9,7 @@
<TABLE name="tl_culture_criteria" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Importance" type="Importance" dbcol="importance" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="Importance.NOT_APPLICABLE"/>
<ATTRIB name="Importance" type="Importance" dbcol="importance" attribHelper="EnumeratedAttributeHelper" mandatory="true" defaultValue="Importance.DESIRABLE"/>
<SINGLEREFERENCE name="CultureElement" type="CultureElement" dbcol="culture_element_id" mandatory="true" />
<SINGLEREFERENCE name="CultureElementRating" type="CultureElementRating" dbcol="culture_element_rating_id" mandatory="true" />
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
......@@ -6,11 +6,15 @@
<oneit:dynIncluded>
<%
Job job = (Job) process.getAttribute("Job");
String samePage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
Debug.assertion(job != null, "Job is null in admin portal create job");
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
AssessmentCriteriaTemplate[] templates = job.getAssessmentTemplates();
AssessmentCriteriaTemplate template = AssessmentCriteriaTemplate.createAssessmentCriteriaTemplate(transaction);
process.setAttribute("AssessmentCriteriaTemplate", template);
%>
<script type="text/javascript">
......@@ -72,7 +76,7 @@
<h1 class="page-title">Create a job <span class="active-time">(Active for 30 days)</span></h1>
<oneit:dynInclude page="/extensions/adminportal/inc/job_main_tabs.jsp" PageNumber="2" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<oneit:dynInclude page="/extensions/adminportal/inc/job_main_tabs.jsp" PageNumber="4" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
job.setCompletedRequirements(Boolean.TRUE);
......@@ -101,10 +105,17 @@
</div>
<div class="assessment-criteria-details">
<%
if(templates.length > 0)
{
%>
<div class="form-group wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="AssessmentTemplate" options="<%= job.getAssessmentTemplates() %>"
blankValue="Optional: Select previously defined Requirements"/>
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="AssessmentTemplate" options="<%= templates %>"
blankValue="Optional: Select from previously defined Requirements"/>
</div>
<%
}
%>
<div class="form-brack-line-sub"></div>
<%
for(CriteriaType criteria : CriteriaType.getCriteriaTypeArray())
......@@ -142,7 +153,7 @@
<div class="main-add-more">
<oneit:button value="<%= "Add " + name%>" name="newAssessmentCriteria" cssClass="add-more-btn" skin="link"
onClick="<%="addCriteria('" + name + "'); return false;"%>"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage).toMap() %>"/>
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", samePage).toMap() %>"/>
</div>
</div>
</div>
......@@ -161,12 +172,18 @@
</div>
</div>
</div>
<oneit:button value=" " name="changeAssessmentTemplate" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry ("AssessmentCriteriaTemplate", template)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
<%
if(template != null)
{
%>
<div class="form-group template-save">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<%
AssessmentCriteriaTemplate template = AssessmentCriteriaTemplate.createAssessmentCriteriaTemplate(transaction);
%>
<oneit:ormInput obj="<%= template %>" type="text" attributeName="TemplateName" cssClass="form-control" />
</div>
<span class="input-group-btn">
......@@ -176,10 +193,13 @@
</span>
</div>
</div>
<%
}
%>
</div>
<div class="text-center">
<oneit:button value="Proceed to Workplace Culture" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", thirdPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" />
</div>
......
cmsWebApp/webroot/extensions/adminportal/inc/applicant_view_tabs.jsp
......@@ -43,12 +43,6 @@
Shortlist
</oneit:button>
</li>
<li>
<a href="#"><span>3</span>Interview</a>
</li>
<li class="interview-tran-btn">
<a href="#"><span></span>Interview</a>
</li>
</ul>
</div>
<div class="unsutable">
......
cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp
......@@ -8,9 +8,9 @@
Job job = (Job) process.getAttribute("Job");
String pageNumber = (String) getData(request, "PageNumber");
String firstPage = WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB);
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);
String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String fourthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);
String fourthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String fifthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
boolean savedJob = job.getStatus() != ObjectStatus.NEW;
%>
......@@ -28,13 +28,13 @@
Job Detail
</oneit:button>
</li>
<li class="<%= pageNumber == "2" ? "active" : job.getCompletedRequirements() || savedJob ? "complate" : ""%>">
<li class="<%= pageNumber == "2" ? "active" : job.getCompletedAssessmentType() || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>">
<span><%= job.getCompletedRequirements() || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Requirements
<span><%= job.getCompletedAssessmentType() || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span>
Profile Assessment
</oneit:button>
</li>
<li class="<%= pageNumber == "3" ? "active" : job.getCompletedCulture() || savedJob ? "complate" : ""%>">
......@@ -46,13 +46,13 @@
Culture
</oneit:button>
</li>
<li class="<%= pageNumber == "4" ? "active" : job.getCompletedAssessmentType() || savedJob ? "complate" : ""%>">
<li class="<%= pageNumber == "4" ? "active" : job.getCompletedRequirements() || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="gotoPage" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>">
<span><%= job.getCompletedAssessmentType() || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span>
Profile Assessment
<span><%= job.getCompletedRequirements() || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Requirements
</oneit:button>
</li>
<li class="<%= pageNumber == "5" ? "active" : ""%>">
......@@ -61,7 +61,7 @@
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>">
<span>5</span>
Review and Submit
Review
</oneit:button>
</li>
</ul>
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
......@@ -20,7 +20,7 @@
%><%@include file="/saferedirect.jsp" %><%
}
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);
%>
<script type="text/javascript">
......@@ -53,10 +53,17 @@
.toMap() %>" />
<div class="form-page-area">
<div class="create-job">
<%
if(jobs.length > 0)
{
%>
<div class="form-group wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="JobTemplate" options="<%= jobs %>"
blankValue="Optional: Use a previously created Job as a template"/>
blankValue="Optional: Use another Job as a starting point"/>
</div>
<%
}
%>
<div class="form-group">
<label><oneit:ormlabel obj="<%= job %>" field="JobTitle" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="JobTitle" cssClass="form-control" />
......
cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp
......@@ -6,7 +6,7 @@
<oneit:dynIncluded>
<%
Job job = (Job) process.getAttribute("Job");
String fifthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
Debug.assertion(job != null, "Job is null in admin portal create job");
%>
......@@ -32,7 +32,7 @@
<h1 class="page-title">Create a job <span class="active-time">(Active for 30 days)</span> </h1>
<oneit:dynInclude page="/extensions/adminportal/inc/job_main_tabs.jsp" PageNumber="4" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<oneit:dynInclude page="/extensions/adminportal/inc/job_main_tabs.jsp" PageNumber="2" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<%
job.setCompletedAssessmentType(Boolean.TRUE);
......@@ -104,7 +104,7 @@
%>
<div class="text-center">
<oneit:button value="Review Details" name="gotoPage" cssClass="btn btn-primary top-margin-37 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fifthPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
</div>
......
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
......@@ -11,6 +11,8 @@
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String fourthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);
Article jobsArticle = WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS);
String jobsPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.VIEW_APPLICANTS).toMap());
Debug.assertion(job != null, "Job is null in admin portal create job");
%>
......@@ -23,7 +25,6 @@
<h1 class="page-title review-title">Review Job</h1>
<div class="page-subtitle-">
<span class=""> Executive Role $599.00 &nbsp;&nbsp;&nbsp;&nbsp; Available for 30 days </span>
<span class="pull-right plan-link"> Post multiple jobs per month? <a href="#">See our plans</a></span>
</div>
......@@ -75,40 +76,20 @@
</div>
<div class="form-brack-line-sub"></div>
<div class="form-group">
<label class="label-16">Requirements</label>
<label class="label-16">Job Match Assessment</label>
<oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
</div>
<%
for(CriteriaType criteria : CriteriaType.getCriteriaTypeArray())
{
Collection<AssessmentCriteria> assessmentCriterias = job.getAssessmentCriteraByType(criteria);
if(assessmentCriterias.size() == 0)
{
continue;
}
%>
<div class="form-group">
<div class="beloning">
<oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/>
<div class="beloning job-match-ass">
<oneit:toString value="<%= job.getAssessmentType() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/>
</div>
</div>
<div class="form-group">
<%
for (AssessmentCriteria assessmentCriteria : assessmentCriterias)
{
%>
<span class="skill-label">
<oneit:toString value="<%= assessmentCriteria.getName() %>" mode="EscapeHTML"/> -
<oneit:toString value="<%= assessmentCriteria.getImportance() %>" mode="EscapeHTML"/>
</span>
<% } %>
</div>
<% } %>
<div class="form-brack-line-sub"></div>
<div class="form-group">
......@@ -145,29 +126,56 @@
<% } %>
</div>
<% } %>
<div class="form-brack-line-sub"></div>
<div class="form-group">
<label class="label-16">Job Match Assessment</label>
<label class="label-16">Requirements</label>
<oneit:button value="EDIT" name="gotoPage" cssClass="add-more-btn review-edit-btn pull-right" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/>
</div>
<%
for(CriteriaType criteria : CriteriaType.getCriteriaTypeArray())
{
Collection<AssessmentCriteria> assessmentCriterias = job.getAssessmentCriteraByType(criteria);
if(assessmentCriterias.size() == 0)
{
continue;
}
%>
<div class="form-group">
<div class="beloning job-match-ass">
<oneit:toString value="<%= job.getAssessmentType() %>" mode="EscapeHTML"/> <oneit:toString value="<%= job.getAssessmentType().getQuestionDetails() %>" mode="EscapeHTML"/>
<div class="beloning">
<oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/>
</div>
</div>
<div class="form-group">
<%
for (AssessmentCriteria assessmentCriteria : assessmentCriterias)
{
%>
<span class="skill-label">
<oneit:toString value="<%= assessmentCriteria.getName() %>" mode="EscapeHTML"/> -
<oneit:toString value="<%= assessmentCriteria.getImportance() %>" mode="EscapeHTML"/>
</span>
<% } %>
</div>
<% } %>
<div class="text-center">
<oneit:button value="Save and go to your jobs" name="save" cssClass="btn btn-primary btn-green largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobsPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry ("attribNamesToRestore", Collections.singleton("Job"))
.toMap() %>" />
<oneit:button value="Confirm and make payment" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry ("restartProcess", Boolean.TRUE)
.mapEntry ("attribNamesToRestore", Collections.singleton("Job"))
.toMap() %>" />
</div>
<div class="job-active-time">Your job will be active for 30 days from being published</div>
</div>
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
......@@ -2,8 +2,8 @@
Job.JobTitle = Job Title
Job.JobDescription = Job Description
Job.Level = Role Type
Job.SaveAssessmentTemplate = Save these settings as a Requirements template
Job.SaveCriteriaTemplate = Save these settings as a Culture template
Job.SaveAssessmentTemplate = Save these requirements as a template
Job.SaveCriteriaTemplate = Save this Culture as a template
CultureCriteria.Importance = Rate Importance
CultureCriteria.CultureElementRating = Rating
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
......@@ -21,7 +21,7 @@
<div class="welcome-box">
<div class="dashboard-welcome">
<div class="welcome-text"> Welcome <br/> back <%= oneit.security.jsp.SecUserToNameTransform.INSTANCE.transform(SecUser.getTXUser(transaction)) %>! </div>
<a class="d-create-job-btn" href="<%= jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.CREATE_JOB).toMap()) %>">Create New Job</a>
<a class="d-create-job-btn" href="<%= jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.CREATE_JOB).toMap()) %>">Create a Job</a>
</div>
<div class="col-sm-3 col-xs-12 d-three-box green-light">
<div class="d-fl-left eq-height">
......@@ -33,22 +33,13 @@
<div class="col-sm-3 col-xs-12 d-three-box gray-light">
<div class="d-fl-left eq-height">
<div class="dash-count c-gray">2</div>
<div class="d-box-title">Jobs complete</div>
<a href="#" class="arrow-btn">Review applicants</a>
</div>
</div>
<div class="col-sm-3 col-xs-12 d-three-box blue-light">
<div class="d-fl-left eq-height">
<div class="dash-count c-blue">2</div>
<div class="d-box-title">Applicants</div>
<div class="ending-time-states">Week ending May 12, 2017</div>
<div class="week-states">13 last week <span>(+5)</span></div>
<div class="d-box-title">Jobs filled</div>
</div>
</div>
</div>
</div>
<div class="dashboard-content-area second-part">
<div class="d-job-title">Active Jobs</div>
<div class="d-job-title">Open Jobs</div>
<oneit:dynInclude page="/extensions/adminportal/inc/job_list.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"
NextPage="<%= nextPage%>" HomePage="<%= homePage%>" Jobs="<%= jobs %>"/>
......
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
......@@ -6,9 +6,12 @@
<oneit:dynIncluded>
<%
Job job = (Job) process.getAttribute("Job");
String fourthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_MATCH);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
Debug.assertion(job != null, "Job is null in admin portal create job");
CultureCriteriaTemplate[] templates = job.getCultureTemplates();
CultureCriteriaTemplate template = CultureCriteriaTemplate.createCultureCriteriaTemplate(transaction);
%>
<script type="text/javascript">
......@@ -78,10 +81,17 @@
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit.
</p>
</div>
<%
if(templates.length > 0)
{
%>
<div class="form-group wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="CultureTemplate" options="<%= job.getCultureTemplates() %>"
blankValue="Optional: Select previously defined Culture"/>
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="CultureTemplate" options="<%= templates %>"
blankValue="Optional: Select from previously defined Cultures"/>
</div>
<%
}
%>
<div class="form-brack-line-sub"></div>
<%
FormTag jobForm = FormTag.getActiveFormTag(request);
......@@ -174,12 +184,17 @@
</div>
</div>
</div>
<oneit:button value=" " name="changeCultureTemplate" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
<%
if(template != null)
{
%>
<div class="form-group template-save">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<%
CultureCriteriaTemplate template = CultureCriteriaTemplate.createCultureCriteriaTemplate(transaction);
%>
<oneit:ormInput obj="<%= template %>" type="text" attributeName="TemplateName" cssClass="form-control" />
</div>
<span class="input-group-btn">
......@@ -189,9 +204,12 @@
</span>
</div>
</div>
<%
}
%>
<div class="text-center">
<oneit:button value="Proceed to Job Match" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" />
</div>
......
cmsWebApp/webroot/extensions/performa/upgrades/20170710_AssessmentCriteriaTemplate.xml
......@@ -9,7 +9,7 @@
<column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="template_name" type="String" nullable="false" length="100"/>
<column name="template_name" type="String" nullable="true" length="100"/>
<column name="user_id" type="Long" length="11" nullable="true"/>
</NODE>
......
cmsWebApp/webroot/extensions/performa/upgrades/20170710_CultureCriteriaTemplate.xml
......@@ -9,7 +9,7 @@
<column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="template_name" type="String" nullable="false" length="100"/>
<column name="template_name" type="String" nullable="true" length="100"/>
<column name="user_id" type="Long" length="11" nullable="true"/>
</NODE>
......
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