Skip to content

P
PERFORMA_REPLICA
Commit e47f71ed by Nilu
Options

S18686422 # Client - Incoming Issues (raised by Client) #Disable should not hide Save Template

parent ba8d5c27
Showing with 44 additions and 39 deletions
cmsWebApp/src/performa/form/SaveRequirementsTemplateFP.java
...@@ -71,13 +71,18 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor ...@@ -71,13 +71,18 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor
newTemplate.addToWorkFlows(workflowCopy); newTemplate.addToWorkFlows(workflowCopy);
} }
for (AssessmentCriteria criteria : job.getAssessmentCriteriasSet()) newTemplate.setIncludeAssessmentCriteria(job.getIncludeAssessmentCriteria());
{
AssessmentCriteria criteriaCopy = AssessmentCriteria.createAssessmentCriteria(newObjTran);
criteriaCopy.copyAttributesFrom(criteria); if(job.getIncludeAssessmentCriteria())
{
for (AssessmentCriteria criteria : job.getAssessmentCriteriasSet())
{
AssessmentCriteria criteriaCopy = AssessmentCriteria.createAssessmentCriteria(newObjTran);
criteriaCopy.copyAttributesFrom(criteria);
newTemplate.addToAssessmentCriterias(criteriaCopy); newTemplate.addToAssessmentCriterias(criteriaCopy);
}
} }
}); });
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
...@@ -158,47 +158,47 @@ ...@@ -158,47 +158,47 @@
<% <%
} }
%> %>
</oneit:recalcClass>
<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="SaveAssessmentTemplate" type="checkbox"/> <oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveAssessmentTemplate" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.showSaveAssessmentTemplate() ? 'checked': 'unchecked'" job="<%= job %>"> <oneit:recalcClass htmlTag="span" classScript="job.showSaveAssessmentTemplate() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="save-assess-check"> <label for="save-assess-check">
<oneit:label GUIName="Save Job Details and Requirements as a new template (this will not publish the Job)" /> <oneit:label GUIName="Save Job Details and Requirements as a new template (this will not publish the Job)" />
</label> </label>
</oneit:recalcClass> </oneit:recalcClass>
</div>
</div> </div>
</div> </div>
<oneit:recalcClass htmlTag="div" classScript="job.showSaveAssessmentTemplate() ? 'form-group template-save show': 'form-group template-save hide'" job="<%= job %>"> </div>
<div class="input-group input-group-lg"> <oneit:recalcClass htmlTag="div" classScript="job.showSaveAssessmentTemplate() ? 'form-group template-save show': 'form-group template-save hide'" job="<%= job %>">
<div class="icon-addon addon-lg"> <div class="input-group input-group-lg">
<oneit:ormInput obj="<%= job %>" type="text" attributeName="AssessmentTemplateName" cssClass="form-control" /> <div class="icon-addon addon-lg">
</div> <oneit:ormInput obj="<%= job %>" type="text" attributeName="AssessmentTemplateName" cssClass="form-control" />
<span class="input-group-btn">
<oneit:button value="SAVE" name="saveRequirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
</span>
</div> </div>
</oneit:recalcClass> <span class="input-group-btn">
<oneit:button value="SAVE" name="saveRequirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
</span>
</div>
</oneit:recalcClass> </oneit:recalcClass>
<div class="text-center"> <div class="text-center">
<oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn greyBtn" <oneit:button value="Save as draft" name="saveJob" cssClass="btn btn-primary top-margin-25 largeBtn greyBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage) requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
.mapEntry("DraftLocation", DraftLocation.ASSESSMENT) .mapEntry("DraftLocation", DraftLocation.ASSESSMENT)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE) .mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/> .toMap() %>"/>
<oneit:button value="Proceed to Culture" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn" <oneit:button value="Proceed to Culture" 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())
.mapEntry("fromAssessment", true) .mapEntry("fromAssessment", true)
.toMap() %>" /> .toMap() %>" />
</div>
</div> </div>
</div>
</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