Skip to content

P
PERFORMA_REPLICA
Commit bffb1542 by Chamath
Options

WorkflowStage and StageType replacements. 

Edit job page changes.
parent 18393969
Showing with 44 additions and 47 deletions
cmsWebApp/src/performa/form/ConfirmDetailsFP.java
...@@ -38,6 +38,8 @@ public class ConfirmDetailsFP extends SaveFP ...@@ -38,6 +38,8 @@ public class ConfirmDetailsFP extends SaveFP
{ {
secUser = SecUser.createSecUser(objTran); secUser = SecUser.createSecUser(objTran);
objTran.setAttrib(SecUser.CREATE_USER_KEY, true);
secUser.setUserName(email); secUser.setUserName(email);
secUser.setEmail(email); secUser.setEmail(email);
secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD); secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
......
cmsWebApp/src/performa/orm/Job.java
...@@ -88,6 +88,8 @@ public class Job extends BaseJob ...@@ -88,6 +88,8 @@ public class Job extends BaseJob
context.check(getSaveAssessmentTemplate() == null || !getSaveAssessmentTemplate() , this, FIELD_AssessmentTemplateName, "saveTemplateFirst"); context.check(getSaveAssessmentTemplate() == null || !getSaveAssessmentTemplate() , this, FIELD_AssessmentTemplateName, "saveTemplateFirst");
context.check(getSaveCultureTemplate() == null || !getSaveCultureTemplate() , this, FIELD_CultureTemplateName, "saveTemplateFirst"); context.check(getSaveCultureTemplate() == null || !getSaveCultureTemplate() , this, FIELD_CultureTemplateName, "saveTemplateFirst");
context.check(getWorkFlowTemplate() != null, this, SINGLEREFERENCE_WorkFlowTemplate, "mandatory");
} }
...@@ -611,10 +613,10 @@ public class Job extends BaseJob ...@@ -611,10 +613,10 @@ public class Job extends BaseJob
} }
public List<WorkFlow> getSortedWorkFlows() public List<WorkFlowStage> getSortedWorkFlowStages()
{ {
return ObjstoreUtils.sort(getWorkFlowsSet(), return ObjstoreUtils.sort(getWorkFlowTemplate().getWorkFlowStagesSet(),
new ObjectTransform[]{WorkFlow.pipesWorkFlow().toSortOrder()}, new ObjectTransform[]{WorkFlowStage.pipesWorkFlowStage().toSortOrder()},
new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST}); new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST});
} }
...@@ -627,11 +629,11 @@ public class Job extends BaseJob ...@@ -627,11 +629,11 @@ public class Job extends BaseJob
new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST}); new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR_NULLS_FIRST});
} }
public WorkFlow getWorkFlowBySortOrder(int sortOrder) public WorkFlowStage getWorkFlowStageBySortOrder(int sortOrder)
{ {
Filter<WorkFlow> filter = WorkFlow.SearchByAll().andSortOrder(new EqualsFilter<>(sortOrder)); Filter<WorkFlowStage> filter = WorkFlowStage.SearchByAll().andSortOrder(new EqualsFilter<>(sortOrder));
return pipelineJob().toWorkFlows(filter).val(); return pipelineJob().toWorkFlowTemplate().toWorkFlowStages(filter).val();
} }
public WorkFlowStage getWorkFlowByStageType(StageType stageType) public WorkFlowStage getWorkFlowByStageType(StageType stageType)
......
cmsWebApp/src/performa/utils/Utils.java
...@@ -643,13 +643,9 @@ public class Utils ...@@ -643,13 +643,9 @@ public class Utils
job.addToAssessmentCriterias(criteriaCopy); job.addToAssessmentCriterias(criteriaCopy);
} }
for (WorkFlow workflow : jobTemplate.getWorkFlowsSet()) if (jobTemplate.getWorkFlowTemplate() != null)
{ {
WorkFlow workflowCopy = WorkFlow.createWorkFlow(objTran); job.setWorkFlowTemplate(jobTemplate.getWorkFlowTemplate());
workflowCopy.copyAttributesFrom(workflow);
job.addToWorkFlows(workflowCopy);
} }
} }
......
cmsWebApp/webroot/css/common.css
...@@ -876,6 +876,16 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms- ...@@ -876,6 +876,16 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms-
.form-page-section.darkbg { .form-page-section.darkbg {
background-color: #F5F7F8; background-color: #F5F7F8;
} }
.blue-line {
background-color: #d9edf7;
left: 10px;
right: 10px;
padding: 0px 10px;
}
.blue-line span {
color: #31708f;
font-size: small;
}
.form-brack-line{ .form-brack-line{
border-top: solid 1px #dbdbdf; border-top: solid 1px #dbdbdf;
display: inline-block; display: inline-block;
......
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
...@@ -194,22 +194,11 @@ ...@@ -194,22 +194,11 @@
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
<div class="form-group row"> <div class="form-group row">
<div class="row"> <div class="col-md-4">
<div class="col-md-4 review-medium-title"> <label><oneit:label GUIName="Workflow" /></label>
<oneit:label GUIName="Appllicant Workflow / Tabs" />
</div>
<div class="col-md-8 workflow-tabs">
<%
for (WorkFlowStage workflow : job.getSortedWorkFlows())
{
%>
<span class="skill-label">
<strong><%= workflow.getSortOrder()%> .</strong>&nbsp;&nbsp; <%= workflow.getName()%>
</span>
<%
}
%>
</div> </div>
<div class="col-md-8">
<oneit:toString value="<%= job.getWorkFlowTemplate() %>" mode="EscapeHTML"/>
</div> </div>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/edit_job_template.jsp
...@@ -450,15 +450,17 @@ ...@@ -450,15 +450,17 @@
</div> </div>
</div> </div>
<div class="form-page-section darkbg"> <div class="form-page-section darkbg">
<div class="form-group row">
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<label><oneit:label GUIName="Select Workflow "/></label> <label><oneit:label GUIName="Select Workflow"/></label>
<div class="wider-select"> <div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= template %>" assocName="WorkFlowTemplate" options="<%= Utils.getWorkFlowTemplatesForHiringTeam(transaction) %>"/> <tagfile:ormsingleasso_select obj="<%= template %>" assocName="WorkFlowTemplate" options="<%= Utils.getWorkFlowTemplatesForHiringTeam(transaction) %>"/>
</div> </div>
</div> </div>
</div>
<div class="form-group row"> <div class="form-group row">
<div class="col-md-12"> <div class="col-sm-12 col-xs-12 text-center blue-line">
If you want to modify the existing workflow or create a new workflow, please save the job and click on the Workflow templates. <span>If you want to modify the existing workflow or create a new workflow, please save the job and click on the Workflow templates.</span>
</div> </div>
</div> </div>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/inc/applicant_view_tabs.jsp
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<oneit:toString value="<%= noOfIncomplete %>" mode="Integer" /> <oneit:toString value="<%= noOfIncomplete %>" mode="Integer" />
</span> </span>
<div class="app-b-title"> <div class="app-b-title">
<%= job.getWorkFlowBySortOrder(1) %> <%= job.getWorkFlowStageBySortOrder(1) %>
</div> </div>
</oneit:button> </oneit:button>
</li> </li>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<oneit:toString value="<%= noOfUnsuitable %>" mode="Integer" /> <oneit:toString value="<%= noOfUnsuitable %>" mode="Integer" />
</span> </span>
<div class="app-b-title"> <div class="app-b-title">
<%= job.getWorkFlowBySortOrder(9)%> <%= job.getWorkFlowStageBySortOrder(9)%>
</div> </div>
</oneit:button> </oneit:button>
</div> </div>
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
...@@ -459,18 +459,19 @@ ...@@ -459,18 +459,19 @@
<div class="form-page-section darkbg"> <div class="form-page-section darkbg">
<div class="form-group row"> <div class="form-group row">
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<label><oneit:label GUIName="Select Workflow "/></label> <label><oneit:label GUIName="Select Workflow"/></label>
<div class="wider-select"> <div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="AssessmentTemplate" options="<%= Utils.getWorkFlowTemplatesForHiringTeam(transaction) %>"/> <tagfile:ormsingleasso_select obj="<%= job %>" assocName="WorkFlowTemplate" options="<%= Utils.getWorkFlowTemplatesForHiringTeam(transaction) %>"/>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="col-sm-12 col-xs-12 text-center" style="background-color: #d9edf7;"> <div class="col-sm-12 col-xs-12 text-center blue-line">
<span style="color: #31708f; font-size: small">If you want to modify the existing workflow or create a new workflow, please save the job and click on the Workflow templates.</span> <span>If you want to modify the existing workflow or create a new workflow, please save the job and click on the Workflow templates.</span>
</div>
</div> </div>
</div> </div>
<div class="form-group row">
<div class="form-brack-line"></div>
<div class="text-center"> <div class="text-center">
<oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary largeBtn greyBtn" <oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary largeBtn greyBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
...@@ -487,6 +488,8 @@ ...@@ -487,6 +488,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<div class="occupation_content" id="occupation_content" style="display: none;"> <div class="occupation_content" id="occupation_content" style="display: none;">
<div class="occupation_content_row"> <div class="occupation_content_row">
......
cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp
...@@ -238,19 +238,12 @@ ...@@ -238,19 +238,12 @@
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-4 review-medium-title"> <div class="col-md-4 review-medium-title">
<oneit:label GUIName="Appllicant Workflow / Tabs" /> <oneit:label GUIName="Workflow" />
</div> </div>
<div class="col-md-8 workflow-tabs"> <div class="col-md-8">
<%
for (WorkFlow workflow : job.getSortedWorkFlows())
{
%>
<span class="skill-label"> <span class="skill-label">
<strong><%= workflow.getSortOrder()%> .</strong>&nbsp;&nbsp; <%= workflow.getName()%> <oneit:toString value="<%= job.getWorkFlowTemplate() %>" mode="EscapeHTML"/>
</span> </span>
<%
}
%>
</div> </div>
</div> </div>
</div> </div>
......
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