Skip to content

P
PERFORMA_REPLICA
Commit cbd943cf by Harsh Shah
Options

Admin Portal - issue fixes, review changes

parent 42e04ce9
Showing with 151 additions and 241 deletions
cmsWebApp/src/performa/form/LoadCultureFromTemplateFP.java
......@@ -35,8 +35,10 @@ public class LoadCultureFromTemplateFP extends ORMProcessFormProcessor
Job job = (Job) request.getAttribute("Job");
CultureCriteriaTemplate template = job.getCultureTemplate();
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside LoadCultureFromTemplateFP for ", job, " load from template:", template);
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside LoadCultureFromTemplateFP for ", job.getObjectID(), " load from template:", template);
if(template != null)
{
for(CultureCriteria criteria : job.getCultureCriteriasSet())
{
criteria.delete();
......@@ -46,15 +48,15 @@ public class LoadCultureFromTemplateFP extends ORMProcessFormProcessor
{
CultureCriteria criteriaCopy = CultureCriteria.createCultureCriteria(objTran);
criteriaCopy.setCultureElement(criteria.getCultureElement());
criteriaCopy.setImportance(criteria.getImportance());
criteriaCopy.setCultureElementRating(criteria.getCultureElementRating());
criteriaCopy.setJob(job);
}
criteriaCopy.copyAttributesFrom(criteria);
criteriaCopy.copySingleAssociationsFrom(criteria, false);
criteriaCopy.setTemplate(null);
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "LoadCultureFromTemplateFP completed for ", job);
job.addToCultureCriterias(criteriaCopy);
}
}
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "LoadCultureFromTemplateFP completed for ", job.getObjectID());
return RedisplayResult.getInstance();
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/LoadJobFromTemplateFP.java
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package performa.form;
import java.util.Calendar;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import oneit.logging.LogLevel;
......@@ -17,9 +11,7 @@ import oneit.servlets.forms.SuccessfulResult;
import oneit.servlets.process.ORMProcessFormProcessor;
import oneit.servlets.process.ORMProcessState;
import oneit.utils.BusinessException;
import oneit.utils.DateDiff;
import performa.orm.CultureCriteria;
import performa.orm.Job;
import performa.orm.*;
/**
*
......@@ -32,18 +24,23 @@ public class LoadJobFromTemplateFP extends ORMProcessFormProcessor
{
HttpServletRequest request = submission.getRequest();
Job job = (Job) request.getAttribute("Job");
Job template = job.getJobTemplate();
Job jobTemplate = job.getJobTemplate();
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside LoadJobFromTemplateFP for ", job, " load from template:", template);
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside LoadJobFromTemplateFP for ", job, " load from template:", jobTemplate);
for(CultureCriteria criteria : job.getCultureCriteriasSet())
{
criteria.delete();
}
template.cloneJob(job);
for(AssessmentCriteria criteria : job.getAssessmentCriteriasSet())
{
criteria.delete();
}
jobTemplate.cloneJob(job);
job.setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
job.initAttribs();
job.setCompletedDetails(Boolean.TRUE);
job.setCompletedAssessmentType(Boolean.TRUE);
job.setCompletedRequirements(Boolean.TRUE);
......
cmsWebApp/src/performa/form/LoadRequirementsFromTemplateFP.java
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package performa.form;
import java.util.Map;
......@@ -37,19 +32,24 @@ public class LoadRequirementsFromTemplateFP extends ORMProcessFormProcessor
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside LoadRequirementsFromTemplateFP for ", job, " load from template:", template);
if(template != null)
{
for(AssessmentCriteria criteria : job.getAssessmentCriteriasSet())
{
criteria.delete();
}
for(AssessmentCriteria criteria : template.getAssessmentCriteriasSet())
{
AssessmentCriteria criteriaCopy = AssessmentCriteria.createAssessmentCriteria(objTran);
criteriaCopy.setName(criteria.getName());
criteriaCopy.setImportance(criteria.getImportance());
criteriaCopy.setCriteriaType(criteria.getCriteriaType());
criteriaCopy.setJob(job);
}
criteriaCopy.copyAttributesFrom(criteria);
job.addToAssessmentCriterias(criteriaCopy);
}
}
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "LoadRequirementsFromTemplateFP completed for ", job);
return RedisplayResult.getInstance();
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/SaveCultureTemplateFP.java
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package performa.form;
import java.util.Map;
......@@ -19,7 +14,7 @@ import oneit.servlets.forms.SubmissionDetails;
import oneit.servlets.forms.SuccessfulResult;
import oneit.servlets.process.ORMProcessFormProcessor;
import oneit.servlets.process.ORMProcessState;
import oneit.utils.BusinessException;
import oneit.utils.*;
import performa.orm.CultureCriteria;
import performa.orm.CultureCriteriaTemplate;
import performa.orm.Job;
......@@ -37,9 +32,7 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor
ObjectTransaction objTran = process.getTransaction();
Job job = (Job) request.getAttribute("Job");
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Inside SaveCultureTemplateFP for create new template.");
BusinessObjectParser.assertFieldCondition(job.getCultureTemplateName() != null, job , Job.FIELD_CultureTemplateName, "mandatory");
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside SaveCultureTemplateFP for create new template for ", job);
objTran.runInNewTX((ObjectTransaction newObjTran) -> {
......@@ -58,9 +51,20 @@ public class SaveCultureTemplateFP extends ORMProcessFormProcessor
newTemplate.addToCultureCriterias(criteriaCopy);
}
});
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "SaveCultureTemplateFP completed for ", job);
return RedisplayResult.getInstance();
}
@Override
public void validate(ORMProcessState process, SubmissionDetails submission, MultiException exceptions, Map params) throws StorageException
{
HttpServletRequest request = submission.getRequest();
Job job = (Job) request.getAttribute("Job");
BusinessObjectParser.assertFieldCondition(job.getCultureTemplateName() != null, job , Job.FIELD_CultureTemplateName, "mandatory", exceptions, true, request);
super.validate(process, submission, exceptions, params);
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/SaveRequirementsTemplateFP.java
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package performa.form;
import java.util.Map;
......@@ -19,7 +14,7 @@ import oneit.servlets.forms.SubmissionDetails;
import oneit.servlets.forms.SuccessfulResult;
import oneit.servlets.process.ORMProcessFormProcessor;
import oneit.servlets.process.ORMProcessState;
import oneit.utils.BusinessException;
import oneit.utils.*;
import performa.orm.AssessmentCriteria;
import performa.orm.AssessmentCriteriaTemplate;
import performa.orm.Job;
......@@ -37,9 +32,7 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor
ObjectTransaction objTran = process.getTransaction();
Job job = (Job) request.getAttribute("Job");
LogMgr.log(LoggingArea.ALL, LogLevel.PROCESSING1, "Inside SaveRequirementsTemplateFP for create new template.");
BusinessObjectParser.assertFieldCondition(job.getAssessmentTemplateName()!= null, job , Job.FIELD_AssessmentTemplateName, "mandatory");
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside SaveRequirementsTemplateFP for create new template.", job);
objTran.runInNewTX((ObjectTransaction newObjTran) -> {
......@@ -56,9 +49,20 @@ public class SaveRequirementsTemplateFP extends ORMProcessFormProcessor
newTemplate.addToAssessmentCriterias(criteriaCopy);
}
});
LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "SaveRequirementsTemplateFP completed for create new template.", job);
return RedisplayResult.getInstance();
}
@Override
public void validate(ORMProcessState process, SubmissionDetails submission, MultiException exceptions, Map params) throws StorageException
{
HttpServletRequest request = submission.getRequest();
Job job = (Job) request.getAttribute("Job");
BusinessObjectParser.assertFieldCondition(job.getAssessmentTemplateName() != null, job , Job.FIELD_AssessmentTemplateName, "mandatory", exceptions, true, request);
super.validate(process, submission, exceptions, params);
}
}
\ No newline at end of file
cmsWebApp/src/performa/form/UserLoginFP.java
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package performa.form;
import java.util.Map;
......@@ -27,7 +22,7 @@ public class UserLoginFP extends LoginProcessor
if(!Utils.checkAdminPortalAccess(userToCheck))
{
throw new FieldException("You're not an authorised user to access admin portal.", SecUser.FIELD_UserName);
throw new FieldException("You're not an authorised user to access this portal.", SecUser.FIELD_UserName);
}
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/Job.java
......@@ -37,9 +37,7 @@ public class Job extends BaseJob
{
super.postInitNewObj();
setRandomKey(RandomStringGen.getRandomStringGen().generateAlphaNum(4));
setSecUser(SecUser.getTXUser(getTransaction()));
setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
initAttribs();
for(CultureElement cultureElement : CultureElement.searchAll(getTransaction()))
{
......@@ -50,6 +48,12 @@ public class Job extends BaseJob
}
}
public void initAttribs() throws BusinessException
{
setRandomKey(RandomStringGen.getRandomStringGen().generateAlphaNum(4));
setSecUser(SecUser.getTXUser(getTransaction()));
setApplyBy(DateDiff.add(DateDiff.getToday(), Calendar.DATE, 30));
}
@Override
public void validate(ValidationContext context)
......@@ -267,12 +271,32 @@ public class Job extends BaseJob
/* Create a copy of 'to' */
return BusinessCopyHelper.copyBusinessObject (to, copyType, newObjectRefs, this);
}
else
else if (to instanceof JobApplication)
{
/* Do not create a copy of 'to' */
return null;
}
else
{
/* Do not create a copy of 'to' BUT use original object */
return to;
}
}
});
}
public boolean showSaveCultureTemplate()
{
return isTrue(getSaveCultureTemplate());
}
public boolean showSaveAssessmentTemplate()
{
return isTrue(getSaveAssessmentTemplate());
}
public boolean showAssessmentCriteriaSection()
{
return isTrue(getIncludeAssessmentCriteria());
}
}
\ No newline at end of file
cmsWebApp/webroot/css/common.css
......@@ -341,7 +341,7 @@ span.active-time {
float: left;
width: 83.75%;
background-color: #e9ecef;
padding: 3% 11.56% 0;
padding: 3% 11.56% 3%;
}
.page-title{
color: #1a2531;
......@@ -700,7 +700,7 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms-
.checkbox input[type="checkbox"]:focus + label::before {
outline: none;
outline-offset: 0; }
.checkbox input[type="checkbox"]:checked + label::after , .styled_checkboxes label.checked:after{
.checkbox input[type="checkbox"]:checked + label::after , .styled_checkboxes span.checked label:after{
content: "";
background-image: url('../images/checkbox-mark.png');
background-repeat: no-repeat;
......@@ -714,7 +714,7 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms-
.checkbox.checkbox-circle label::before {
border-radius: 50%; }
.checkbox.checkbox-inline {margin-top: 0; }
.checkbox-primary input[type="checkbox"]:checked + label::before , .styled_checkboxes label.checked:before {background-color: #03a0e7;border-color: #03a0e7; }
.checkbox-primary input[type="checkbox"]:checked + label::before , .styled_checkboxes span.checked label:before {background-color: #03a0e7;border-color: #03a0e7; }
.checkbox-primary input[type="checkbox"]:checked + label::after {color: #fff; }
/*InputBox with btn*/
......@@ -810,7 +810,7 @@ span.checkbox.checked + .slider:before {-webkit-transform: translateX(18px);-ms-
}
.help-support {
float: left;
width: 16.25%;
width: 100%;
background: #f5f7f8;
font-size: 13px;
text-align: center;
......@@ -2129,7 +2129,7 @@ a.forgot-pass {
.dashboard-content-area {
background-color: #e9ecef;
float: left;
padding: 2.2% 5% 0;
padding: 2.2% 5% 2.2%;
width: 83.75%;
position: relative;
}
......@@ -4263,5 +4263,4 @@ img.alert-icon {float: left;}
bottom: 0;
left: 0;
height: 59px;
width: 100%;
}
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml
......@@ -16,15 +16,15 @@
<AUTHENTICATOR factory="Participant" class="oneit.security.SecurityAuthenticator">
<PRIVILEGE factory="Parameter" param="priv"/>
<FAILED_URL factory="String" value="RestrictedAccess.jsp"/>
<NO_USER_URL factory="String" value="extensions/adminportal/signin.jsp"/>
<NO_USER_URL factory="String" value="extensions/adminportal/sign_in.jsp"/>
</AUTHENTICATOR>
</NODE>
<NODE name="dynamic_content_form::ADMIN_PORTAL" factory="Participant">
<FORM name="*.changeAssessmentCriteria" factory="Participant" class="performa.form.ChangeAssessmentCriteriaFP"/>
<FORM name="*.saveJob" factory="Participant" class="performa.form.SaveJobFP"/>
<FORM name="*.requirementTemplate" factory="Participant" class="performa.form.SaveRequirementsTemplateFP"/>
<FORM name="*.cultureTemplate" factory="Participant" class="performa.form.SaveCultureTemplateFP"/>
<FORM name="*.saveRequirementTemplate" factory="Participant" class="performa.form.SaveRequirementsTemplateFP"/>
<FORM name="*.saveCultureTemplate" factory="Participant" class="performa.form.SaveCultureTemplateFP"/>
<FORM name="*.loadJobFromTemplate" factory="Participant" class="performa.form.LoadJobFromTemplateFP"/>
<FORM name="*.loadRequirementsFromTemplate" factory="Participant" class="performa.form.LoadRequirementsFromTemplateFP"/>
<FORM name="*.loadCultureFromTemplate" factory="Participant" class="performa.form.LoadCultureFromTemplateFP"/>
......@@ -40,10 +40,10 @@
<NODE name="loginFailureMessage" factory="String" value="Invalid password, please re-check your login details ... "/>
<NODE name="onSuccessURL" factory="String" value="frame.jsp"/>
<PARSER name="username" factory="Participant" class="oneit.utils.parsers.StringParser">
<NODE name="nonExistErrorMessage" factory="String" value="Please enter a user name"/>
<NODE name="nonExistErrorMessage" factory="String" value="Please enter a value for user name"/>
</PARSER>
<PARSER name="password" factory="Participant" class="oneit.utils.parsers.StringParser">
<NODE name="nonExistErrorMessage" factory="String" value="Please enter a password"/>
<NODE name="nonExistErrorMessage" factory="String" value="Please enter a value for password"/>
</PARSER>
</FORM>
</NODE>
......
cmsWebApp/webroot/extensions/adminportal/GeneralConfig_adminPortal.xml
......@@ -42,7 +42,7 @@
</NODE>
</MAP>
<MAP value="CANDIDATES" description="Candidates" TemplatePage="dynamic_content_form.jsp">
<MAP value="CANDIDATES" description="Candidates" TemplatePage="dynamic_content_form_client.jsp">
<NODE name="Config" factory="Participant" class="oneit.business.content.ArticleConfiguration">
<INHERITS nodename="StandardJSP"/>
......@@ -50,7 +50,7 @@
</NODE>
</MAP>
<MAP value="CLIENTS" description="Clients" TemplatePage="dynamic_content_form.jsp">
<MAP value="CLIENTS" description="Clients" TemplatePage="dynamic_content_form_client.jsp">
<NODE name="Config" factory="Participant" class="oneit.business.content.ArticleConfiguration">
<INHERITS nodename="StandardJSP"/>
......@@ -58,7 +58,7 @@
</NODE>
</MAP>
<MAP value="MANAGE_USERS" description="Manage Users" TemplatePage="dynamic_content_form.jsp">
<MAP value="MANAGE_USERS" description="Manage Users" TemplatePage="dynamic_content_form_client.jsp">
<NODE name="Config" factory="Participant" class="oneit.business.content.ArticleConfiguration">
<INHERITS nodename="StandardJSP"/>
......@@ -66,7 +66,7 @@
</NODE>
</MAP>
<MAP value="MY_COMPANY" description="My Company" TemplatePage="dynamic_content_form.jsp">
<MAP value="MY_COMPANY" description="My Company" TemplatePage="dynamic_content_form_client.jsp">
<NODE name="Config" factory="Participant" class="oneit.business.content.ArticleConfiguration">
<INHERITS nodename="StandardJSP"/>
......@@ -74,7 +74,7 @@
</NODE>
</MAP>
<MAP value="BILLING" description="Billing" TemplatePage="dynamic_content_form.jsp">
<MAP value="BILLING" description="Billing" TemplatePage="dynamic_content_form_client.jsp">
<NODE name="Config" factory="Participant" class="oneit.business.content.ArticleConfiguration">
<INHERITS nodename="StandardJSP"/>
......
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
......@@ -17,24 +17,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc($("form"));
$(".switch input[type='checkbox']").each(function()
{
$(this).parent('span').removeClass("checked" );
$(this).parent('span').removeClass("unchecked" );
if($(this).is(":checked"))
{
$(this).parent('span').addClass("checked" );
$( ".assessment-criteria-details" ).css( "display", "block" );
}
else
{
$(this).parent('span').addClass("unchecked");
$( ".assessment-criteria-details" ).css( "display", "none" );
}
});
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
$(".switch input[type='checkbox']").change(function() {
$("button[name$='changeAssessmentCriteria']").click();
......@@ -79,11 +62,6 @@
job.setCompletedRequirements(Boolean.TRUE);
%>
<oneit:button value=" " name="loadRequirementsFromTemplate" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
<div class="form-page-area">
<div class="create-job">
<div class="assessment-criteria">
......@@ -91,7 +69,9 @@
<label>Include Assessment Criteria for this position? <a href="#" class="info-icon"><img src="images/info-icon.png" /></a> </label>
<span class="pull-right">
<label class="switch">
<oneit:recalcClass htmlTag="span" classScript="job.showAssessmentCriteriaSection() ? 'checkbox checked': 'checkbox unchecked'" job="<%= job %>">
<oneit:ormInput obj="<%= job %>" attributeName="IncludeAssessmentCriteria" type="checkbox"/>
</oneit:recalcClass>
<div class="slider round"></div>
</label>
<oneit:button value=" " name="changeAssessmentCriteria" cssClass="hide"
......@@ -101,11 +81,16 @@
</span>
</div>
<div class="assessment-criteria-details">
<oneit:recalcClass htmlTag="div" classScript="job.showAssessmentCriteriaSection() ? 'show': 'hide'" job="<%= job %>">
<%
if(templates.length > 0)
{
%>
<oneit:button value=" " name="loadRequirementsFromTemplate" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
<div class="form-group wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="AssessmentTemplate" options="<%= templates %>"
blankValue="Optional: Select from previously defined Requirements"/>
......@@ -160,29 +145,30 @@
<%
}
%>
<div class="form-group">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveAssessmentTemplate" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.showSaveAssessmentTemplate() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="save-assess-check">
<oneit:ormlabel obj="<%= job %>" field="SaveAssessmentTemplate" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
<div class="form-group template-save">
<oneit:recalcClass htmlTag="div" classScript="job.showSaveAssessmentTemplate() ? 'form-group template-save show': 'form-group template-save hide'" job="<%= job %>">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<oneit:ormInput obj="<%= job %>" type="text" attributeName="AssessmentTemplateName" cssClass="form-control" />
</div>
<span class="input-group-btn">
<oneit:button value="SAVE" name="requirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.toMap() %>" />
<oneit:button value="SAVE" name="saveRequirementTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job).toMap() %>" />
</span>
</div>
</div>
</oneit:recalcClass>
</oneit:recalcClass>
</div>
<div class="text-center">
<oneit:button value="Review Details" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
......@@ -193,6 +179,5 @@
</div>
</div>
</div>
</div>
</oneit:form>
</oneit:dynIncluded>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/inc/htmlfooter.jsp
......@@ -9,7 +9,7 @@
%>
</div>
</div>
<footer class="container-fluid footer">
<footer class="container-fluid footer sidebar-menu">
<div class="row">
<div class="help-support">
<a href="#">Help & Support</a>
......
cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp
......@@ -17,7 +17,7 @@
<oneit:toString value="<%= job.getJobTitle() %>" mode="EscapeHTML" />
</div>
<div class="off-name">
<span class="austr-post">Australia Post</span> by Dan Moore <span class="ex-management">&bull;&nbsp;
<span class="austr-post">Australia Post</span> by <oneit:toString value="<%= SecUserToNameTransform.INSTANCE.transform(job.getSecUser()) %>" mode="EscapeHTML"/><span class="ex-management">&bull;&nbsp;
<oneit:toString value="<%= job.getLevel() %>" mode="EscapeHTML" />
</span>
</div>
......
cmsWebApp/webroot/extensions/adminportal/job_detail.jsp
<%@ page extends="oneit.servlets.jsp.JSPInclude" %>
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
......@@ -9,9 +8,6 @@
<%
boolean toRedirect = GenericObjDF.getOrCreateObject (request, "Job", Job.REFERENCE_Job);
Job job = (Job) process.getAttribute("Job");
Job[] jobs = Job.SearchByAll()
.andSecUser(new EqualsFilter<>(SecUser.getTXUser(transaction)))
.search(transaction);
Debug.assertion(job != null, "Job is null in admin portal create job");
......@@ -47,16 +43,19 @@
job.setCompletedDetails(Boolean.TRUE);
%>
<oneit:button value=" " name="loadJobFromTemplate" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
<div class="form-page-area">
<div class="create-job">
<%
Job[] jobs = Job.SearchByAll().andSecUser(new EqualsFilter<>(SecUser.getTXUser(transaction))).search(transaction);
if(jobs.length > 0)
{
%>
<oneit:button value=" " name="loadJobFromTemplate" cssClass="hide"
requestAttribs="<%= CollectionUtils.mapEntry ("Job", job)
.mapEntry (UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>" />
<div class="form-group wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="JobTemplate" options="<%= jobs %>"
blankValue="Optional: Use another Job as a starting point"/>
......
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
......@@ -20,7 +20,7 @@
<div class="dashboard-content-area first-part">
<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>
<div class="welcome-text"> Welcome <br/> back <oneit:toString value="<%= SecUserToNameTransform.INSTANCE.transform(SecUser.getTXUser(transaction)) + "!" %>" mode="EscapeHTML"/></div>
<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">
......
cmsWebApp/webroot/extensions/adminportal/signin.jsp → cmsWebApp/webroot/extensions/adminportal/sign_in.jsp
<%@ page extends="oneit.servlets.jsp.FormJSP" %>
<%@ include file="/setuprequest.jsp" %>
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
<%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<%! protected String getName (ServletConfig config) { return "signin_jsp"; } %>
<%@ include file="/setuprequest.jsp" %>
<html lang="en">
<head>
<meta charset="utf-8"></meta>
......@@ -24,21 +23,9 @@
<div class="main-verify-identity">
<div class="login-logo"><img src="<%= request.getContextPath() %>/images/logo.png" /></div>
<oneit:form name="login" method="post">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
<div class="main-box-layout login-box">
<%
oneit.servlets.jsp.FormInformation fi2 = oneit.servlets.jsp.FormJSP.getFormInformation (request);
if (fi2 != null && fi2.hasErrors ())
{
%>
<div class="alert alert-danger margin-bottom--10px">
<oneit:multifieldtext prefixTextName="pageHeader_errorPrefix"
suffixTextName="pageHeader_errorSuffix"
fieldTextName="pageHeader_errorText" deriveAllFields="true"/>
</div>
<%
}
%>
<div class="form-group text-left">
<label>Username</label>
<input type="text" class="form-control" name="username">
......@@ -67,7 +54,7 @@
<footer class="power-footer">
<div class="footer-link text-center">
<ul>
<li><a href="#"> 2017 Talentology</a></li>
<li><a href="#">&COPY; <%= Calendar.getInstance().get(Calendar.YEAR) %> Talentology</a></li>
<li><a href="#">Privacy Policy</a></li>
</ul>
</div>
......
cmsWebApp/webroot/extensions/adminportal/view_application.jsp
......@@ -61,7 +61,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", samePage )
.mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jA).toMap())
.toMap() %>">
<%= jA.getCandidate() %>
<oneit:toString value="<%= SecUserToNameTransform.INSTANCE.transform(jA.getCandidate() != null ? jA.getCandidate().getUser() : null) %>" mode="EscapeHTML"/>
<span class="<%= ratingClass %>">
<oneit:toString value="<%= jA.getOverallSuitability() %>" mode="PercentageWholeNumber" />
</span>
......
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
......@@ -31,6 +31,8 @@
$(document).ready(function(){
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
$(".element_rating_radio").each(function (){
moveImportanceSection(this);
});
......@@ -177,24 +179,25 @@
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="save-assess-check" attributeName="SaveCultureTemplate" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.showSaveCultureTemplate() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="save-assess-check">
<oneit:ormlabel obj="<%= job %>" field="SaveCultureTemplate" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
<div class="form-group template-save">
<oneit:recalcClass htmlTag="div" classScript="job.showSaveCultureTemplate() ? 'form-group template-save show': 'form-group template-save hide'" job="<%= job %>">
<div class="input-group input-group-lg">
<div class="icon-addon addon-lg">
<oneit:ormInput obj="<%= job %>" type="text" attributeName="CultureTemplateName" cssClass="form-control" />
</div>
<span class="input-group-btn">
<oneit:button value="SAVE" name="cultureTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job)
.toMap() %>" />
<oneit:button value="SAVE" name="saveCultureTemplate" cssClass="btn btn-primary"
requestAttribs="<%= CollectionUtils.mapEntry("Job", job).toMap() %>" />
</span>
</div>
</div>
</oneit:recalcClass>
<div class="text-center">
<oneit:button value="Proceed to Requirements" name="gotoPage" cssClass="btn btn-primary top-margin-25 largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
......
cmsWebApp/webroot/extensions/applicantportal/inc/multifieldtext.jsp
<%@ page extends="oneit.servlets.jsp.JSPInclude" %>
<%@ include file="/inc/stdimports50.jsp" %><%-- This is in cougar --%>
<%@ include file="/inc/stdcms.jsp" %><%-- This is in cougar --%>
<%@ include file="/extensions/performa/inc/stdimports.jsp" %>
<oneit:dynIncluded>
......@@ -14,6 +13,7 @@
<oneit:multifieldtext prefixTextName="pageHeader_errorPrefix"
suffixTextName="pageHeader_errorSuffix"
fieldTextName="pageHeader_errorText"
fieldDelimiterTextName="pageHeader_errorDelimiter"
deriveAllFields="true"/>
</div>
<%
......
cmsWebApp/webroot/extensions/performa/inc/stdimports.jsp
<%@ page import="performa.orm.*, performa.orm.types.*, performa.form.*, performa.utils.*"%>
<%@ page import="oneit.objstore.rdbms.filters.*"%>
<%@ page import="oneit.objstore.rdbms.filters.*, oneit.security.jsp.SecUserToNameTransform "%>
cmsWebApp/webroot/scripts/common.js
......@@ -19,31 +19,8 @@ $(document).ready(function () {
$('.section-btn .box-btn').attr('value', 'Proceed');
$(".app-out-btn .box-btn").text('Verify and proceed')
}
$(".styled_checkboxes input[type='checkbox']").each(function(){
saveTemplateCheckboxChange($(this));
});
$(".styled_checkboxes input[type='checkbox']").change(function(){
saveTemplateCheckboxChange($(this));
});
});
function saveTemplateCheckboxChange(element) {
element.parent('span').next('label').removeClass("checked" );
element.parent('span').next('label').removeClass("unchecked" );
if(element.is(":checked")){
element.parent('span').next('label').addClass("checked" );
$( ".template-save" ).css( "display", "block" );
} else {
element.parent('span').next('label').addClass("unchecked");
$( ".template-save" ).css( "display", "none" );
}
}
function addUserPic(opt) {
if (!opt.id) {
return opt.text;
......
cmsWebApp/webroot/testsso.jsp
<%@page import="oneit.utils.*,oneit.logging.*"%>
<%@page import="oneit.security.*, oneit.servlets.security.SessionSecUserDecorator"%>
<%@page import="java.util.Date"%>
<%@page import="oneit.objstore.services.TransactionServicesFactory"%>
<%@page import="performa.utils.*, oneit.objstore.*, oneit.appservices.config.*" %>
<%
SecUser pageUser = (SecUser)(session.getAttribute(SecUser.SEC_USER_ID));
String userName = request.getParameter("userName");
if (userName != null)
{
if(ConfigMgr.getKeyfileBoolean("test.sso", false))
{
TransactionServicesFactory tsf = (TransactionServicesFactory)ConfigMgr.getConfigObject(ConfigMgr.GLOBAL_CONFIG_SYSTEM, "TransactionServices");
ObjectTransaction objTran = new ObjectTransaction (tsf);
try
{
SecUser secUser = SecUser.searchNAME(objTran, userName);
if(Utils.checkAdminPortalAccess(secUser))
{
request.getSession().invalidate();
request.getSession().setAttribute (AuthorisationToken.AUTH_TOKEN_ID, secUser);
// place the user on the session
request.getSession ().setAttribute (SecUser.SEC_USER_ID, secUser);
// This is only to help with the tomcat manager, so you can see which user belongs to which session
request.getSession ().setAttribute (SecUser.SEC_USER_ID+".desc", secUser.getDescription());
request.getSession ().setAttribute (SecUser.SEC_USER_ID+".loggedin", ""+new Date());
request.getSession ().setAttribute (SessionSecUserDecorator.REFRESH_SECURITY, Boolean.TRUE);
String url = WebUtils.getArticleLink(request, objTran, WebUtils.ADMIN_HOME, "Page");
objTran.commit();
objTran.commitResources();
response.sendRedirect(url);
}
else
{
response.setStatus(404);
return;
}
}
finally
{
objTran.releaseResources();
}
}
else
{
response.setStatus(404);
return;
}
}
%>
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
</head>
<body>
<form method="POST">
<input name="userName" value="" required="required" >
<input type="submit" name="Go" value="Submit">
</form>
</body>
</html>
<!-- DELETED -->
\ No newline at end of file
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