Skip to content

P
PERFORMA_REPLICA
Commit 832c9a82 by Nilu Committed by Harsh Shah
Options

corrections in job creation flow buttons and tab numbers 

template saving validation fixes (name not null and unique constraint for name and user)
parent 9739e063
Showing with 54 additions and 66 deletions
cmsWebApp/src/performa/form/SaveCultureTemplateFP.java
...@@ -12,6 +12,7 @@ import oneit.logging.LogMgr; ...@@ -12,6 +12,7 @@ import oneit.logging.LogMgr;
import oneit.logging.LoggingArea; import oneit.logging.LoggingArea;
import oneit.objstore.ObjectTransaction; import oneit.objstore.ObjectTransaction;
import oneit.objstore.StorageException; import oneit.objstore.StorageException;
import oneit.objstore.parser.BusinessObjectParser;
import oneit.security.SecUser; import oneit.security.SecUser;
import oneit.servlets.forms.RedisplayResult; import oneit.servlets.forms.RedisplayResult;
import oneit.servlets.forms.SubmissionDetails; import oneit.servlets.forms.SubmissionDetails;
...@@ -34,23 +35,26 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor ...@@ -34,23 +35,26 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor
{ {
final HttpServletRequest request = submission.getRequest(); final HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction(); ObjectTransaction objTran = process.getTransaction();
CultureCriteriaTemplate template = (CultureCriteriaTemplate) request.getAttribute("CultureCriteriaTemplate"); Job job = (Job) request.getAttribute("Job");
Job job = (Job) process.getAttribute("Job");
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Inside SaveCultureTemplateFP for create new template."); LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Inside SaveCultureTemplateFP for create new template.");
BusinessObjectParser.assertFieldCondition(job.getCultureTemplateName() != null, job , Job.FIELD_CultureTemplateName, "mandatory");
objTran.runInNewTX((ObjectTransaction newObjTran) -> { objTran.runInNewTX((ObjectTransaction newObjTran) -> {
CultureCriteriaTemplate newTemplate = CultureCriteriaTemplate.createCultureCriteriaTemplate(newObjTran); CultureCriteriaTemplate newTemplate = CultureCriteriaTemplate.createCultureCriteriaTemplate(newObjTran);
newTemplate.setTemplateName(template.getTemplateName());
newTemplate.setUser(SecUser.getTXUser(newObjTran)); newTemplate.setUser(SecUser.getTXUser(newObjTran));
newTemplate.setTemplateName(job.getCultureTemplateName());
for(CultureCriteria criteria : job.getCultureCriteriasSet()) for(CultureCriteria criteria : job.getCultureCriteriasSet())
{ {
CultureCriteria criteriaCopy = CultureCriteria.createCultureCriteria(newObjTran); CultureCriteria criteriaCopy = CultureCriteria.createCultureCriteria(newObjTran);
criteriaCopy.copyAttributesFrom(criteria); criteriaCopy.setCultureElement(criteria.getCultureElement().getInTransaction(newObjTran));
criteriaCopy.setImportance(criteria.getImportance());
criteriaCopy.setCultureElementRating(criteria.getCultureElementRating().getInTransaction(newObjTran));
newTemplate.addToCultureCriterias(criteriaCopy); newTemplate.addToCultureCriterias(criteriaCopy);
} }
......
cmsWebApp/src/performa/form/SaveRequirementsTemplateFP.java
...@@ -12,6 +12,7 @@ import oneit.logging.LogMgr; ...@@ -12,6 +12,7 @@ import oneit.logging.LogMgr;
import oneit.logging.LoggingArea; import oneit.logging.LoggingArea;
import oneit.objstore.ObjectTransaction; import oneit.objstore.ObjectTransaction;
import oneit.objstore.StorageException; import oneit.objstore.StorageException;
import oneit.objstore.parser.BusinessObjectParser;
import oneit.security.SecUser; import oneit.security.SecUser;
import oneit.servlets.forms.RedisplayResult; import oneit.servlets.forms.RedisplayResult;
import oneit.servlets.forms.SubmissionDetails; import oneit.servlets.forms.SubmissionDetails;
...@@ -34,17 +35,18 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor ...@@ -34,17 +35,18 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor
{ {
final HttpServletRequest request = submission.getRequest(); final HttpServletRequest request = submission.getRequest();
ObjectTransaction objTran = process.getTransaction(); ObjectTransaction objTran = process.getTransaction();
AssessmentCriteriaTemplate template = (AssessmentCriteriaTemplate) request.getAttribute("AssessmentCriteriaTemplate"); Job job = (Job) request.getAttribute("Job");
Job job = (Job) process.getAttribute("Job");
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Inside SaveRequirementsTemplateFP for create new template."); LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Inside SaveRequirementsTemplateFP for create new template.");
BusinessObjectParser.assertFieldCondition(job.getAssessmentTemplateName()!= null, job , Job.FIELD_AssessmentTemplateName, "mandatory");
objTran.runInNewTX((ObjectTransaction newObjTran) -> { objTran.runInNewTX((ObjectTransaction newObjTran) -> {
AssessmentCriteriaTemplate newTemplate = AssessmentCriteriaTemplate.createAssessmentCriteriaTemplate(newObjTran); AssessmentCriteriaTemplate newTemplate = AssessmentCriteriaTemplate.createAssessmentCriteriaTemplate(newObjTran);
newTemplate.setTemplateName(template.getTemplateName());
newTemplate.setUser(SecUser.getTXUser(newObjTran)); newTemplate.setUser(SecUser.getTXUser(newObjTran));
newTemplate.setTemplateName(job.getAssessmentTemplateName());
for (AssessmentCriteria criteria : job.getAssessmentCriteriasSet()) for (AssessmentCriteria criteria : job.getAssessmentCriteriasSet())
{ {
......
cmsWebApp/src/performa/orm/Job.xml
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
<TRANSIENT name="CompletedCulture" type="Boolean" defaultValue="Boolean.FALSE"/> <TRANSIENT name="CompletedCulture" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="CompletedAssessmentType" type="Boolean" defaultValue="Boolean.FALSE"/> <TRANSIENT name="CompletedAssessmentType" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="SaveAssessmentTemplate" type="Boolean" defaultValue="Boolean.FALSE"/> <TRANSIENT name="SaveAssessmentTemplate" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="SaveCriteriaTemplate" type="Boolean" defaultValue="Boolean.FALSE"/> <TRANSIENT name="SaveCultureTemplate" type="Boolean" defaultValue="Boolean.FALSE"/>
<TRANSIENT name="AssessmentTemplateName" type="String"/>
<TRANSIENT name="CultureTemplateName" type="String"/>
<TRANSIENTSINGLE name="AssessmentTemplate" type="AssessmentCriteriaTemplate" /> <TRANSIENTSINGLE name="AssessmentTemplate" type="AssessmentCriteriaTemplate" />
<TRANSIENTSINGLE name="CultureTemplate" type="CultureCriteriaTemplate" /> <TRANSIENTSINGLE name="CultureTemplate" type="CultureCriteriaTemplate" />
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
Debug.assertion(job != null, "Job is null in admin portal create job"); Debug.assertion(job != null, "Job is null in admin portal create job");
AssessmentCriteriaTemplate[] templates = job.getAssessmentTemplates(); AssessmentCriteriaTemplate[] templates = job.getAssessmentTemplates();
AssessmentCriteriaTemplate template = AssessmentCriteriaTemplate.createAssessmentCriteriaTemplate(transaction);
process.setAttribute("AssessmentCriteriaTemplate", template);
%> %>
<script type="text/javascript"> <script type="text/javascript">
...@@ -172,33 +169,21 @@ ...@@ -172,33 +169,21 @@
</div> </div>
</div> </div>
</div> </div>
<oneit:button value=" " name="changeAssessmentTemplate" cssClass="hide" <div class="form-group template-save">
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job) <div class="input-group input-group-lg">
.mapEntry ("AssessmentCriteriaTemplate", template) <div class="icon-addon addon-lg">
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) <oneit:ormInput obj="<%= job %>" type="text" attributeName="AssessmentTemplateName" cssClass="form-control" />
.toMap() %>" />
<%
if(template != null)
{
%>
<div class="form-group template-save">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<oneit:ormInput obj="<%= template %>" type="text" attributeName="TemplateName" cssClass="form-control" />
</div>
<span class="input-group-btn">
<oneit:button value="SAVE" name="requirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("AssessmentCriteriaTemplate", template)
.toMap() %>" />
</span>
</div>
</div> </div>
<% <span class="input-group-btn">
} <oneit:button value="SAVE" name="requirementTemplate" cssClass="btn btn-primary"
%> requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.toMap() %>" />
</span>
</div>
</div>
</div> </div>
<div class="text-center"> <div class="text-center">
<oneit:button value="Proceed to Workplace Culture" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn" <oneit:button value="Review Details" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" /> .toMap() %>" />
......
cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"> .toMap() %>">
<span><%= job.getCompletedAssessmentType() || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span> <span><%= job.getCompletedAssessmentType() || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Profile Assessment Profile Assessment
</oneit:button> </oneit:button>
</li> </li>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"> .toMap() %>">
<span><%= job.getCompletedRequirements() || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span> <span><%= job.getCompletedRequirements() || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span>
Requirements Requirements
</oneit:button> </oneit:button>
</li> </li>
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</div> </div>
</div> </div>
<div class="text-center"> <div class="text-center">
<oneit:button value="Proceed to Assessment Criteria" name="gotoPage" cssClass="btn btn-primary largeBtn" <oneit:button value="Proceed to Profile" name="gotoPage" cssClass="btn btn-primary largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/> .toMap() %>"/>
......
cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
} }
%> %>
<div class="text-center"> <div class="text-center">
<oneit:button value="Review Details" name="gotoPage" cssClass="btn btn-primary top-margin-37 largeBtn" <oneit:button value="Proceed to Culture" name="gotoPage" cssClass="btn btn-primary top-margin-37 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>"/> .toMap() %>"/>
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
...@@ -3,7 +3,13 @@ Job.JobTitle = Job Title ...@@ -3,7 +3,13 @@ Job.JobTitle = Job Title
Job.JobDescription = Job Description Job.JobDescription = Job Description
Job.Level = Role Type Job.Level = Role Type
Job.SaveAssessmentTemplate = Save these requirements as a template Job.SaveAssessmentTemplate = Save these requirements as a template
Job.SaveCriteriaTemplate = Save this Culture as a template Job.SaveCultureTemplate = Save this Culture as a template
Job.AssessmentTemplateName = Template Name
Job.CultureTemplateName = Template Name
CultureCriteria.Importance = Rate Importance CultureCriteria.Importance = Rate Importance
CultureCriteria.CultureElementRating = Rating CultureCriteria.CultureElementRating = Rating
AssessmentCriteriaTemplate.TemplateName = Template Name
CultureCriteriaTemplate.TemplateName = Template Name
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
Debug.assertion(job != null, "Job is null in admin portal create job"); Debug.assertion(job != null, "Job is null in admin portal create job");
CultureCriteriaTemplate[] templates = job.getCultureTemplates(); CultureCriteriaTemplate[] templates = job.getCultureTemplates();
CultureCriteriaTemplate template = CultureCriteriaTemplate.createCultureCriteriaTemplate(transaction);
%> %>
<script type="text/javascript"> <script type="text/javascript">
...@@ -177,38 +176,27 @@ ...@@ -177,38 +176,27 @@
<div class="form-group"> <div class="form-group">
<div class="styled_checkboxes"> <div class="styled_checkboxes">
<div class="checkbox checkbox-primary"> <div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveCriteriaTemplate" type="checkbox"/> <oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveCultureTemplate" type="checkbox"/>
<label for="save-assess-check"> <label for="save-assess-check">
<oneit:ormlabel obj="<%= job %>" field="SaveCriteriaTemplate" /> <oneit:ormlabel obj="<%= job %>" field="SaveCultureTemplate" />
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<oneit:button value=" " name="changeCultureTemplate" cssClass="hide" <div class="form-group template-save">
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job) <div class="input-group input-group-lg">
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) <div class="icon-addon addon-lg">
.toMap() %>" /> <oneit:ormInput obj="<%= job %>" type="text" attributeName="CultureTemplateName" cssClass="form-control" />
<%
if(template != null)
{
%>
<div class="form-group template-save">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<oneit:ormInput obj="<%= template %>" type="text" attributeName="TemplateName" cssClass="form-control" />
</div>
<span class="input-group-btn">
<oneit:button value="SAVE" name="cultureTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("CultureCriteriaTemplate", template)
.toMap() %>" />
</span>
</div>
</div> </div>
<% <span class="input-group-btn">
} <oneit:button value="SAVE" name="cultureTemplate" cssClass="btn btn-primary"
%> requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.toMap() %>" />
</span>
</div>
</div>
<div class="text-center"> <div class="text-center">
<oneit:button value="Proceed to Job Match" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn" <oneit:button value="Proceed to Requirements" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap()) .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" /> .toMap() %>" />
......
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