Skip to content

P
PERFORMA_REPLICA
Commit 3a28fc44 by Nilu
Options

HT013 My company screen without tabs. Need to work on styles

parent 306a313f
Showing with 167 additions and 2 deletions
cmsWebApp/sql/Company.xml
......@@ -12,6 +12,11 @@
<column name="hiring_team_type" type="String" nullable="true" length="200"/>
<column name="industry" type="String" nullable="true" length="200"/>
<column name="time_zone" 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="post_code" type="String" nullable="true" length="10"/>
<column name="city" type="String" nullable="true" length="100"/>
<column name="has_client_support" type="Boolean" nullable="true"/>
<column name="added_by_user_id" type="Long" length="11" nullable="false"/>
</NODE>
......
cmsWebApp/sql/ms/Company.sql
......@@ -12,6 +12,11 @@ CREATE TABLE tl_company (
hiring_team_type varchar(200) NULL,
industry varchar(200) NULL,
time_zone varchar(200) NULL,
state varchar(200) NULL,
country varchar(200) NULL,
post_code varchar(10) NULL,
city varchar(100) NULL,
has_client_support char(1) NULL,
added_by_user_id numeric(12) NOT NULL
);
......
cmsWebApp/sql/oracle/Company.sql
......@@ -13,6 +13,11 @@ CREATE TABLE tl_company (
hiring_team_type varchar2(200) NULL,
industry varchar2(200) NULL,
time_zone varchar2(200) NULL,
state varchar2(200) NULL,
country varchar2(200) NULL,
post_code varchar2(10) NULL,
city varchar2(100) NULL,
has_client_support char(1) NULL,
added_by_user_id number(12) NOT NULL
);
......
cmsWebApp/sql/postgres/Company.sql
......@@ -13,6 +13,11 @@ CREATE TABLE tl_company (
hiring_team_type varchar(200) NULL,
industry varchar(200) NULL,
time_zone varchar(200) NULL,
state varchar(200) NULL,
country varchar(200) NULL,
post_code varchar(10) NULL,
city varchar(100) NULL,
has_client_support char(1) NULL,
added_by_user_id numeric(12) NOT NULL
);
......
cmsWebApp/src/performa/orm/Company.java
......@@ -10,4 +10,10 @@ public class Company extends BaseCompany
{
// Do not add any code to this, always put it in initialiseNewObject
}
public boolean showHasClientSupport()
{
return isTrue(getHasClientSupport());
}
}
\ No newline at end of file
cmsWebApp/src/performa/orm/Company.xml
......@@ -6,6 +6,7 @@
<IMPORT value="performa.orm.types.*"/>
<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"/>
......@@ -16,6 +17,11 @@
<ATTRIB name="HiringTeamType" type="HiringTeamType" dbcol="hiring_team_type" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="Industry" type="Industry" dbcol="industry" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="TimeZone" type="TimeZone" dbcol="time_zone" mandatory="false" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="State" type="State" dbcol="state" mandatory="false" defaultValue="State.WA" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="Country" type="Countries" dbcol="country" mandatory="false" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="PostCode" type="String" dbcol="post_code" mandatory="false" length="10"/>
<ATTRIB name="City" type="String" dbcol="city" mandatory="false" length="100"/>
<ATTRIB name="HasClientSupport" type="Boolean" dbcol="has_client_support" mandatory="false" defaultValue="Boolean.FALSE"/>
<SINGLEREFERENCE name="AddedByUser" type="CompanyUser" dbcol="added_by_user_id" mandatory="true"/>
......
cmsWebApp/webroot/extensions/adminportal/edit_client.jsp
......@@ -70,11 +70,11 @@
<oneit:ormEnum obj="<%= client %>" attributeName="Country" cssClass="form-control"/>
</div>
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= client %>" field="State or Province" /></label>
<label><oneit:ormlabel obj="<%= client %>" field="State" /></label>
<oneit:ormEnum obj="<%= client %>" attributeName="State" cssClass="form-control"/>
</div>
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= client %>" field="Postal Code" /></label>
<label><oneit:ormlabel obj="<%= client %>" field="PostCode" /></label>
<oneit:ormInput obj="<%= client %>" type="text" attributeName="PostCode" cssClass="form-control" />
</div>
</div>
......
cmsWebApp/webroot/extensions/adminportal/messages/fieldnamesOverride.txt
......@@ -15,3 +15,5 @@ CultureCriteria.CultureElementRating = Rating
AssessmentCriteriaTemplate.TemplateName = Template Name
CultureCriteriaTemplate.TemplateName = Template Name
Company.HasClientSupport = We help clients with hiring
\ No newline at end of file
cmsWebApp/webroot/extensions/adminportal/my_company.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>
<%
SecUser loggedInUser = SecUser.getTXUser(transaction);
CompanyUser companyUser = loggedInUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
Company company = companyUser.getCompany();
Debug.assertion(company != null , "Invalid company in admin portal my company");
String nextPage = WebUtils.getSamePageInRenderMode(request, "Page");
%>
<script type="text/javascript">
$(document).ready(function(){
recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
});
</script>
<div class="container-fluid">
<div class="row content">
<div class="main-content-area">
<h1 class="page-title">Manage Company</h1>
<oneit:form name="editCompany" method="post" enctype="multipart/form-data">
<div style="padding-left: 15px; padding-right: 15px;">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
</div>
<div class="form-page-area">
<div class="create-job">
<div class="assessment-criteria">
<div class="form-group">
<label class="label-16">Company Details</label>
</div>
<div class="form-group">
<label><oneit:label GUIName="Company Name" /></label>
<oneit:ormInput obj="<%= company %>" type="text" attributeName="CompanyName" cssClass="form-control" />
</div>
<div class="form-group row">
<div class="col-md-6">
<label><oneit:label GUIName="Industry" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="Industry" cssClass="form-control"/>
</div>
</div>
<div class="form-group">
<div class="styled_checkboxes">
<div class="checkbox checkbox-primary">
<oneit:ormInput obj="<%= company %>" id="has-client-support" attributeName="HasClientSupport" type="checkbox"/>
<oneit:recalcClass htmlTag="span" classScript="company.showHasClientSupport() ? 'checked': 'unchecked'" company="<%= company %>">
<label for="has-client-support">
<oneit:ormlabel obj="<%= company %>" field="HasClientSupport" />
</label>
</oneit:recalcClass>
</div>
</div>
</div>
<div class="form-brack-line-sub"></div>
<div class="form-group row">
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= company %>" field="Country" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="Country" cssClass="form-control"/>
</div>
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= company %>" field="State" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="State" cssClass="form-control"/>
</div>
<div class="col-md-4">
<label><oneit:ormlabel obj="<%= company %>" field="PostCode" /></label>
<oneit:ormInput obj="<%= company %>" type="text" attributeName="PostCode" cssClass="form-control" />
</div>
</div>
<div class="form-group row">
<div class="col-md-6">
<label><oneit:ormlabel obj="<%= company %>" field="City" /></label>
<oneit:ormInput obj="<%= company %>" type="text" attributeName="City" cssClass="form-control" />
</div>
<div class="col-md-6">
<label><oneit:label GUIName="Default Timezone" /></label>
<oneit:ormEnum obj="<%= company %>" attributeName="TimeZone" cssClass="form-control"/>
</div>
</div>
<div class="text-center form-group">
<oneit:button value="Save Updates" name="save" cssClass="btn btn-primary largeBtn"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" />
</div>
</div>
</div>
</div>
</oneit:form>
</div>
</div>
</div>
</oneit:dynIncluded>
cmsWebApp/webroot/extensions/performa/upgrades/20170906_Alter_Company.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_company</tableName>
<column name="state" type="String" nullable="true" length="200"/>
<column name="country" type="String" nullable="true" length="200"/>
<column name="post_code" type="String" nullable="true" length="10"/>
<column name="city" type="String" nullable="true" length="100"/>
<column name="has_client_support" type="Boolean" nullable="true"/>
</NODE>
</NODE>
</OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/performa/upgrades/20170906_BO_Industry.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.DefineTableOperation">
<tableName factory="String">tl_industry</tableName>
<column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="NAME" type="String" nullable="false" length="200"/>
<column name="VALUE" type="String" nullable="false" length="200"/>
<column name="DESCRIPTION" type="String" nullable="true" length="200"/>
<column name="SORT_ORDER" type="Long" nullable="false"/>
<column name="DISABLED" type="Boolean" nullable="false"/>
</NODE>
</NODE>
</OBJECTS>
\ 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