Skip to content

P
PERFORMA_REPLICA
Commit a1e4b9ae by Nilu
Options

job details screen and requirements screen (J001 and J002)

parent 131621b9
Showing with 281 additions and 75 deletions
cmsWebApp/sql/Job.xml
......@@ -21,14 +21,20 @@
<column name="last_status_change_date" type="Date" nullable="true"/>
<column name="remote" type="Boolean" nullable="true"/>
<column name="city" type="String" nullable="true" length="100"/>
<column name="postcode" type="String" nullable="true" length="100"/>
<column name="location_radius" type="String" nullable="true" length="200"/>
<column name="state" type="String" nullable="true" length="200"/>
<column name="country" type="String" nullable="true" length="200"/>
<column name="require_cv" type="Boolean" nullable="true"/>
<column name="manually_closed" type="Boolean" nullable="true"/>
<column name="last_edited" type="Date" nullable="true"/>
<column name="is_ppj" type="Boolean" nullable="true"/>
<column name="industry" type="String" nullable="true" length="200"/>
<column name="level_id" type="Long" length="11" nullable="true"/>
<column name="client_id" type="Long" length="11" nullable="true"/>
<column name="job_owner_id" type="Long" length="11" nullable="true"/>
<column name="company_user_id" type="Long" length="11" nullable="true"/>
<column name="hiring_team_id" type="Long" length="11" nullable="true"/>
<column name="shortened_url_id" type="Long" length="11" nullable="true"/>
</NODE>
......
cmsWebApp/sql/ms/Job.sql
......@@ -21,14 +21,20 @@ CREATE TABLE tl_job (
last_status_change_date datetime NULL,
remote char(1) NULL,
city varchar(100) NULL,
postcode varchar(100) NULL,
location_radius varchar(200) NULL,
state varchar(200) NULL,
country varchar(200) NULL,
require_cv char(1) NULL,
manually_closed char(1) NULL,
last_edited datetime NULL,
is_ppj char(1) NULL,
industry varchar(200) NULL,
level_id numeric(12) NULL,
client_id numeric(12) NULL,
job_owner_id numeric(12) NULL,
company_user_id numeric(12) NULL,
hiring_team_id numeric(12) NULL,
shortened_url_id numeric(12) NULL
);
......
cmsWebApp/sql/oracle/Job.sql
......@@ -22,14 +22,20 @@ CREATE TABLE tl_job (
last_status_change_date date NULL,
remote char(1) NULL,
city varchar2(100) NULL,
postcode varchar2(100) NULL,
location_radius varchar2(200) NULL,
state varchar2(200) NULL,
country varchar2(200) NULL,
require_cv char(1) NULL,
manually_closed char(1) NULL,
last_edited date NULL,
is_ppj char(1) NULL,
industry varchar2(200) NULL,
level_id number(12) NULL,
client_id number(12) NULL,
job_owner_id number(12) NULL,
company_user_id number(12) NULL,
hiring_team_id number(12) NULL,
shortened_url_id number(12) NULL
);
......
cmsWebApp/sql/postgres/Job.sql
......@@ -22,14 +22,20 @@ CREATE TABLE tl_job (
last_status_change_date timestamp NULL,
remote char(1) NULL,
city varchar(100) NULL,
postcode varchar(100) NULL,
location_radius varchar(200) NULL,
state varchar(200) NULL,
country varchar(200) NULL,
require_cv char(1) NULL,
manually_closed char(1) NULL,
last_edited timestamp NULL,
is_ppj char(1) NULL,
industry varchar(200) NULL,
level_id numeric(12) NULL,
client_id numeric(12) NULL,
job_owner_id numeric(12) NULL,
company_user_id numeric(12) NULL,
hiring_team_id numeric(12) NULL,
shortened_url_id numeric(12) NULL
);
......
cmsWebApp/src/performa/orm/Company.xml
......@@ -8,6 +8,7 @@
<IMPORT value="performa.orm.types.TimeZone"/>
<IMPORT value="oneit.business.shopping.orm.*"/>
<MULTIPLEREFERENCE name="Users" type="CompanyUser" backreferenceName="Company" />
<MULTIPLEREFERENCE name="Clients" type="Client" backreferenceName="Company" />
<MULTIPLEREFERENCE name="HiringTeams" type="HiringTeam" backreferenceName="Company" />
......
cmsWebApp/src/performa/orm/HiringTeam.java
package performa.orm;
import java.util.Set;
import oneit.logging.LoggingArea;
import oneit.objstore.ValidationContext;
import oneit.objstore.rdbms.filters.EqualsFilter;
import oneit.utils.StringUtils;
import oneit.utils.filter.Filter;
public class HiringTeam extends BaseHiringTeam
......@@ -38,4 +41,13 @@ public class HiringTeam extends BaseHiringTeam
{
return StringUtils.subNulls(getHiringTeamName(), super.getToString());
}
public Set<CompanyUser> getActiveTeammates()
{
Filter<CompanyUser> filter = CompanyUser.SearchByAll()
.andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE))
.andIsDisabled(new EqualsFilter<>(Boolean.FALSE));
return CompanyUserHiringTeamLink.pipesCompanyUserHiringTeamLink(getUsersSet()).toCompanyUser(filter).uniqueVals();
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/Job.java
......@@ -58,7 +58,7 @@ public class Job extends BaseJob
//TODO: verify
SecUser txUser = SecUser.getTXUser(getTransaction());
setCompanyUser(txUser.getExtension(CompanyUser.REFERENCE_CompanyUser));
setCreatedBy(txUser.getExtension(CompanyUser.REFERENCE_CompanyUser));
}
......@@ -410,9 +410,9 @@ public class Job extends BaseJob
{
title.append(getClient()).append(" - ");
}
else if(getCompanyUser() != null && getCompanyUser().getCompany() != null)
else if(getCreatedBy() != null && getCreatedBy().getCompany() != null)
{
title.append(getCompanyUser().getCompany()).append(" - ");
title.append(getCreatedBy().getCompany()).append(" - ");
}
title.append(getJobTitle()).append(" ");
......@@ -472,7 +472,7 @@ public class Job extends BaseJob
public Boolean isClientAvailable()
{
return getClient() != null && getCompanyUser() != null && isTrue(getCompanyUser().getCompany().getHasClientSupport());
return getClient() != null && getCreatedBy() != null && isTrue(getCreatedBy().getCompany().getHasClientSupport());
}
......@@ -482,9 +482,9 @@ public class Job extends BaseJob
{
return getClient().getClientLogo();
}
else if(getCompanyUser() != null)
else if(getCreatedBy() != null)
{
return getCompanyUser().getCompany().getCompanyLogo();
return getCreatedBy().getCompany().getCompanyLogo();
}
return null;
......
cmsWebApp/src/performa/orm/Job.xml
......@@ -44,15 +44,21 @@
<ATTRIB name="LastStatusChangeDate" type="Date" dbcol="last_status_change_date"/>
<ATTRIB name="Remote" type="Boolean" dbcol="remote" defaultValue="Boolean.FALSE"/>
<ATTRIB name="City" type="String" dbcol="city" length="100"/>
<ATTRIB name="PostCode" type="String" dbcol="postcode" length="100"/>
<ATTRIB name="ExpectedCandidateRadius" type="LocationRadius" dbcol="location_radius" attribHelper="EnumeratedAttributeHelper" />
<ATTRIB name="State" type="State" dbcol="state" defaultValue="State.WA" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="Country" type="Countries" dbcol="country" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="RequireCV" type="Boolean" dbcol="require_cv" defaultValue="Boolean.FALSE"/>
<ATTRIB name="IsManuallyClosed" type="Boolean" dbcol="manually_closed" defaultValue="Boolean.FALSE"/>
<ATTRIB name="LastEdited" type="Date" dbcol="last_edited" />
<ATTRIB name="IsPPJ" type="Boolean" dbcol="is_ppj" defaultValue="Boolean.FALSE"/>
<ATTRIB name="Industry" type="Industry" dbcol="industry" attribHelper="EnumeratedAttributeHelper"/>
<SINGLEREFERENCE name="Level" type="Level" dbcol="level_id" mandatory="false"/>
<SINGLEREFERENCE name="Client" type="Client" dbcol="client_id" backreferenceName="Jobs"/>
<SINGLEREFERENCE name="CompanyUser" type="CompanyUser" dbcol="company_user_id" />
<SINGLEREFERENCE name="JobOwner" type="CompanyUser" dbcol="job_owner_id" />
<SINGLEREFERENCE name="CreatedBy" type="CompanyUser" dbcol="company_user_id" />
<SINGLEREFERENCE name="HiringTeam" type="HiringTeam" dbcol="hiring_team_id" />
<SINGLEREFERENCE name="ShortenedURL" type="ShortenedURL" dbcol="shortened_url_id" />
</TABLE>
......
cmsWebApp/src/performa/orm/types/CultureClass.java
......@@ -35,11 +35,18 @@ public class CultureClass extends AbstractEnumerated
return allCultureClasss;
}
private transient String ClassDescription;
private CultureClass (String name, String value, String description, boolean disabled)
{
super (name, value, description, disabled);
}
public String getClassDescription()
{
return ClassDescription;
}
public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allCultureClasss);
......@@ -107,6 +114,9 @@ public class CultureClass extends AbstractEnumerated
public static void defineAdditionalData ()
{
BELONGING.ClassDescription = "Belonging is a sense of fitting in or feeling like you are an important member of a group. A tight-knit organisation gives each of its members a strong sense of belonging.";
CLIMATE.ClassDescription = "The prevailing conditions and general culture of the organisation.";
PERFORMANCE.ClassDescription = "The extent to which there is emphasis within the organisation on performance via outcomes and productivity.";
}
......@@ -134,6 +144,7 @@ public class CultureClass extends AbstractEnumerated
{
Map attribs = new HashMap ();
attribs.put ("ClassDescription", ArrayFormatter.toObject(getClassDescription()));
return attribs;
}
......
cmsWebApp/src/performa/orm/types/CultureClass.xml
......@@ -3,9 +3,11 @@
<ROOT>
<CONSTANT package="performa.orm.types" name="CultureClass">
<VALUE name="BELONGING" description="Belonging" />
<VALUE name="CLIMATE" description="Climate" />
<VALUE name="PERFORMANCE" description="Performance"/>
<DATA name="ClassDescription" type="String"/>
<VALUE name="BELONGING" description="Belonging" ClassDescription='"Belonging is a sense of fitting in or feeling like you are an important member of a group. A tight-knit organisation gives each of its members a strong sense of belonging."'/>
<VALUE name="CLIMATE" description="Climate" ClassDescription='"The prevailing conditions and general culture of the organisation."'/>
<VALUE name="PERFORMANCE" description="Performance" ClassDescription='"The extent to which there is emphasis within the organisation on performance via outcomes and productivity."'/>
</CONSTANT>
</ROOT>
\ No newline at end of file
cmsWebApp/src/performa/orm/types/LocationRadius.java 0 → 100644
package performa.orm.types;
import java.util.*;
import oneit.utils.*;
/**
* This class was generated using constGen.bat.
* DO NOT MODIFY THIS CODE.
* Edit the associated .xml file, and regenerate this file
* constGen (directory) (file minus extension)
* e.g. constGen C:\...\sql FieldType
*/
public class LocationRadius extends AbstractEnumerated
{
public static final EnumeratedFactory FACTORY_LocationRadius = new LocationRadiusFactory();
public static final LocationRadius KM100 = new LocationRadius ("KM100", "KM100", "100 km", false);
private static final LocationRadius[] allLocationRadiuss =
new LocationRadius[] { KM100};
private static LocationRadius[] getAllLocationRadiuss ()
{
return allLocationRadiuss;
}
private LocationRadius (String name, String value, String description, boolean disabled)
{
super (name, value, description, disabled);
}
public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allLocationRadiuss);
static
{
defineAdditionalData ();
}
public boolean isEqual (LocationRadius other)
{
return this.name.equals (other.name);
}
public Enumeration getAllInstances ()
{
return LocationRadius.getAll ();
}
private Object readResolve() throws java.io.ObjectStreamException
{
return LocationRadius.forName (this.name);
}
public EnumeratedFactory getFactory ()
{
return FACTORY_LocationRadius;
}
public static LocationRadius forName (String name)
{
if (name == null) { return null; }
LocationRadius[] all = getAllLocationRadiuss();
int enumIndex = AbstractEnumerated.getIndexForName (all, name);
return all[enumIndex];
}
public static LocationRadius forValue (String value)
{
if (value == null) { return null; }
LocationRadius[] all = getAllLocationRadiuss();
int enumIndex = AbstractEnumerated.getIndexForValue (getAllLocationRadiuss (), value);
return all[enumIndex];
}
public static java.util.Enumeration getAll ()
{
return AbstractEnumerated.getAll (getAllLocationRadiuss());
}
public static LocationRadius[] getLocationRadiusArray ()
{
return (LocationRadius[])getAllLocationRadiuss().clone ();
}
public static void defineAdditionalData ()
{
}
static class LocationRadiusFactory implements EnumeratedFactory
{
public AbstractEnumerated getForName (String name)
{
return LocationRadius.forName (name);
}
public AbstractEnumerated getForValue (String name)
{
return LocationRadius.forValue (name);
}
public Enumeration getAll ()
{
return LocationRadius.getAll ();
}
}
public Map getAdditionalAttributes ()
{
Map attribs = new HashMap ();
return attribs;
}
}
cmsWebApp/src/performa/orm/types/LocationRadius.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<ROOT>
<CONSTANT package="performa.orm.types" name="LocationRadius">
<VALUE name="KM100" value="KM100" description="100 km"/>
</CONSTANT>
</ROOT>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp
......@@ -7,7 +7,8 @@
<%
Job job = (Job) process.getAttribute("Job");
String samePage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
// String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
String nextPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String jobPage = WebUtils.getSamePageInRenderMode(request, "Page");
Debug.assertion(job != null, "Job is null in admin portal create job");
......@@ -68,7 +69,7 @@
<h1 class="page-title">Create a job</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.setCompletedRequirements(Boolean.TRUE);
......@@ -189,7 +190,7 @@
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", jobPage)
.mapEntry(UpdateMappedObjFP.FAIL_VALIDATION_ERRORS, Boolean.FALSE)
.toMap() %>"/>
<oneit:button value="Review Details" 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)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.toMap() %>" />
......
cmsWebApp/webroot/extensions/adminportal/billing.jsp
......@@ -18,7 +18,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/card_payment.jsp
......@@ -18,7 +18,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/edit_card.jsp
......@@ -17,7 +17,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/edit_card_payment.jsp
......@@ -18,7 +18,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
......@@ -27,7 +27,7 @@
<script>
$(document).ready(function()
{
recalcFunction = setupRecalc ($("editClient"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#editClient"), {'recalcOnError':true});
$("#upload").change(function(){
readURL(this);
......
cmsWebApp/webroot/extensions/adminportal/edit_job.jsp
......@@ -40,8 +40,14 @@
<label><oneit:label GUIName="Job Type" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="JobType" cssClass="form-control"/>
</div>
<div class="optional-title">OPTIONAL</div>
<!--<div class="optional-title">OPTIONAL</div>-->
<div class="row">
<div class="col-sm-6 col-xs-12 form-group">
<label><oneit:label GUIName="Client"/></label>
<div class="wider-select">
<tagfile:ormsingleasso_select obj="<%= job %>" assocName="Client" options="<%= Utils.getClientsByCompany(transaction) %>"/>
</div>
</div>
<%
SecUser txUser = SecUser.getTXUser(process.getTransaction());
CompanyUser companyUser = txUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
......
cmsWebApp/webroot/extensions/adminportal/forgot_password.jsp
......@@ -10,7 +10,7 @@
<script type="text/javascript">
$(document).ready(function() {
recalcFunction = setupRecalc ($("forgotPassword"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#forgotPassword"), {'recalcOnError':true});
$('input[type="text"]').keyup(function() {
$(this).change();
......
cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp
......@@ -8,12 +8,12 @@
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.JOB_MATCH);
String secondPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String thirdPage = WebUtils.getSamePageInRenderMode(request, WebUtils.WORKPLACE_CULTURE);
String fourthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.ASSESSMENT_CRITERIA);
String fifthPage = WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
boolean savedJob = job.getStatus() != ObjectStatus.NEW;
boolean fromJobMatch = pageNumber == "2";
boolean fromJobMatch = pageNumber == "1";
%>
<oneit:dynIncluded>
......@@ -30,14 +30,14 @@
Job Detail
</oneit:button>
</li>
<li class="<%= pageNumber == "2" ? "active" : CollectionUtils.equals(job.getCompletedAssessmentType(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<li class="<%= pageNumber == "2" ? "active" : CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="processCulture" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", secondPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.mapEntry("fromJobMatch", fromJobMatch)
.toMap() %>">
<span><%= CollectionUtils.equals(job.getCompletedAssessmentType(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Role
<span><%= CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "2"%></span>
Requirements
</oneit:button>
</li>
<li class="<%= pageNumber == "3" ? "active" : CollectionUtils.equals(job.getCompletedCulture(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
......@@ -50,16 +50,6 @@
Culture
</oneit:button>
</li>
<li class="<%= pageNumber == "4" ? "active" : CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "complate" : ""%>">
<oneit:button value=" " name="processCulture" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fourthPage)
.mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
.mapEntry("fromJobMatch", fromJobMatch)
.toMap() %>">
<span><%= CollectionUtils.equals(job.getCompletedRequirements(), Boolean.TRUE) || savedJob ? "<img src=\"images/right-mark.png\" />" : "4"%></span>
Requirements
</oneit:button>
</li>
<li class="<%= pageNumber == "5" ? "active" : ""%>">
<oneit:button value=" " name="processCulture" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fifthPage)
......
cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp
......@@ -13,7 +13,7 @@
%>
<script>
$(document).ready(function(){
setupRecalc ($("editJob"), {'recalcOnError':true});
setupRecalc ($("form#editJob"), {'recalcOnError':true});
});
</script>
<oneit:form name="editJob" method="post" enctype="multipart/form-data">
......
cmsWebApp/webroot/extensions/adminportal/job_payment.jsp
......@@ -36,7 +36,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#editJob"), {'recalcOnError':true});
addPostRecalcHandler(function ($fieldThatChanged) {
if (! $fieldThatChanged) {
......
cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp
......@@ -33,7 +33,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("editCompany"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#editCompany"), {'recalcOnError':true});
$("#upload").change(function(){
readURL(this);
......
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
......@@ -115,7 +115,7 @@
<div class="dash-count c-gray">
<%
Job[] filledJobs = Job.SearchByAll().andJobStatus(new EqualsFilter<>(JobStatus.FILLED))
.andCompanyUser(new EqualsFilter<>(secUser.getExtension(CompanyUser.REFERENCE_CompanyUser)))
.andCreatedBy(new EqualsFilter<>(secUser.getExtension(CompanyUser.REFERENCE_CompanyUser)))
.search(transaction);
int filledCount = filledJobs != null ? filledJobs.length : 0;
......
cmsWebApp/webroot/extensions/adminportal/replace_card.jsp
......@@ -17,7 +17,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/replace_card_payment.jsp
......@@ -17,7 +17,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("makePayment"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#makePayment"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20181006_alter_Job.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_job</tableName>
<column name="job_owner_id" type="Long" length="11" nullable="true"/>
<column name="hiring_team_id" type="Long" length="11" nullable="true"/>
<column name="postcode" type="String" nullable="true" length="100"/>
<column name="location_radius" type="String" nullable="true" length="200"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/upgrades/20181008_Alter_Job.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!-- @AutoRun -->
<OBJECTS name="" xmlns:oneit="http://www.1iT.com.au">
<NODE name="Script" factory="Vector">
<NODE name="DDL" factory="Participant" class="oneit.sql.transfer.RedefineTableOperation">
<tableName factory="String">tl_job</tableName>
<column name="require_cv" type="Boolean" nullable="true"/>
<column name="industry" type="String" nullable="true" length="200"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist.jsp
......@@ -47,7 +47,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#viewApplicants"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp
......@@ -84,7 +84,7 @@
]
});
recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#viewApplicants"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicants_unsuitable.jsp
......@@ -52,7 +52,7 @@
<script type="text/javascript">
$(document).ready(function()
{
recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#viewApplicants"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/view_applicantss_grid.jsp
......@@ -87,7 +87,7 @@
]
});
recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#viewApplicants"), {'recalcOnError':true});
});
</script>
......
cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp
......@@ -38,7 +38,7 @@
$(document).ready(function(){
recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
recalcFunction = setupRecalc ($("form#editJob"), {'recalcOnError':true});
$(".importance_radio").change(function(){
enableElementRating(this);
......@@ -102,36 +102,7 @@
<%
}
%>
<div class="form-group row">
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= job %>" field="Country" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="Country" cssClass="form-control"/>
</div>
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= job %>" field="State" /></label>
<oneit:ormEnum obj="<%= job %>" attributeName="State" cssClass="form-control"/>
</div>
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= job %>" field="City" /></label>
<oneit:ormInput obj="<%= job %>" type="text" attributeName="City" cssClass="form-control" />
</div>
</div>
<div class="form-group row">
<div class="col-md-4">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= job %>" id="is-remote" attributeName="Remote" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="job.getRemote() != null && job.getRemote() ? 'checked': 'unchecked'" job="<%= job %>">
<label for="is-remote">
<oneit:label GUIName="Working remotely is an option" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
</div>
<div class="form-brack-line-sub"></div>
<%
FormTag jobForm = FormTag.getActiveFormTag(request);
FormBuilder formBuilder = jobForm.getFormBuilder();
......@@ -145,6 +116,7 @@
<div class="work-belonging">
<oneit:toString value="<%= cultureClass %>" mode="EscapeHTML"/>
</div>
<div><%= cultureClass.getClassDescription()%></div>
<%
for(CultureCriteria criteria : job.getCultureCriteriasForClass(cultureClass))
{
......
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