J002 , J003 and J005 modifications (requrements, culture, review)

cmsWebApp/sql/CultureCriteria.xml

@@ -8,7 +8,8 @@
 			<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="importance" type="String" nullable="false" length="200"/>
+			<column name="importance" type="String" nullable="true" length="200"/>
+			<column name="is_applicable" type="Boolean" nullable="true"/>
 			<column name="culture_element_id" type="Long" length="11" nullable="false"/>
 			<column name="culture_element_rating_id" type="Long" length="11" nullable="true"/>
 			<column name="job_id" type="Long" length="11" nullable="true"/>

cmsWebApp/sql/Job.xml

@@ -30,6 +30,7 @@
 			<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="culture_statement" type="String" nullable="true" length="2000"/>
 			<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"/>

cmsWebApp/sql/ms/CultureCriteria.sql

@@ -8,7 +8,8 @@ CREATE TABLE tl_culture_criteria (
     object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
     object_created_date datetime DEFAULT getdate() NOT NULL
     ,
-    importance varchar(200) NOT NULL,
+    importance varchar(200) NULL,
+    is_applicable char(1) NULL,
     culture_element_id numeric(12)  NOT NULL,
     culture_element_rating_id numeric(12)  NULL,
     job_id numeric(12)  NULL,

cmsWebApp/sql/ms/Job.sql

@@ -30,6 +30,7 @@ CREATE TABLE tl_job (
     last_edited datetime NULL,
     is_ppj char(1) NULL,
     industry varchar(200) NULL,
+    culture_statement varchar(2000) NULL,
     level_id numeric(12)  NULL,
     client_id numeric(12)  NULL,
     job_owner_id numeric(12)  NULL,

cmsWebApp/sql/oracle/CultureCriteria.sql

@@ -9,7 +9,8 @@ CREATE TABLE tl_culture_criteria (
     object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
     object_created_date date DEFAULT SYSDATE NOT NULL
     ,
-    importance varchar2(200) NOT NULL,
+    importance varchar2(200) NULL,
+    is_applicable char(1) NULL,
     culture_element_id number(12)  NOT NULL,
     culture_element_rating_id number(12)  NULL,
     job_id number(12)  NULL,

cmsWebApp/sql/oracle/Job.sql

@@ -31,6 +31,7 @@ CREATE TABLE tl_job (
     last_edited date NULL,
     is_ppj char(1) NULL,
     industry varchar2(200) NULL,
+    culture_statement varchar2(2000) NULL,
     level_id number(12)  NULL,
     client_id number(12)  NULL,
     job_owner_id number(12)  NULL,

cmsWebApp/sql/postgres/CultureCriteria.sql

@@ -9,7 +9,8 @@ CREATE TABLE tl_culture_criteria (
     object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
     object_created_date timestamp DEFAULT NOW() NOT NULL
     ,
-    importance varchar(200) NOT NULL,
+    importance varchar(200) NULL,
+    is_applicable char(1) NULL,
     culture_element_id numeric(12)  NOT NULL,
     culture_element_rating_id numeric(12)  NULL,
     job_id numeric(12)  NULL,

cmsWebApp/sql/postgres/Job.sql

@@ -31,6 +31,7 @@ CREATE TABLE tl_job (
     last_edited timestamp NULL,
     is_ppj char(1) NULL,
     industry varchar(200) NULL,
+    culture_statement varchar(2000) NULL,
     level_id numeric(12)  NULL,
     client_id numeric(12)  NULL,
     job_owner_id numeric(12)  NULL,

cmsWebApp/src/performa/batch/CloseJobBatch.java

@@ -36,7 +36,7 @@ public class CloseJobBatch  extends ORMBatch
         }
         
         // Update closed job details to intercom
-        Set<Company>    companies   =   Job.pipesJob(expiringJobs).toCompanyUser().toCompany().uniqueVals();
+        Set<Company>    companies   =   Job.pipesJob(expiringJobs).toCreatedBy().toCompany().uniqueVals();
         
         for (Company company : companies)
         {

cmsWebApp/src/performa/form/CompleteApplicationFP.java

@@ -49,9 +49,9 @@ public class CompleteApplicationFP extends SaveFP
         jobApplication  = (JobApplication) process.getAttribute("JobApplication");
 
         // Update company in intercom
-        if(jobApplication != null && jobApplication.getJob().getCompanyUser() != null)
+        if(jobApplication != null && jobApplication.getJob().getCreatedBy() != null)
         {
-            IntercomUtils.updateCompany(jobApplication.getJob().getCompanyUser().getCompany());
+            IntercomUtils.updateCompany(jobApplication.getJob().getCreatedBy().getCompany());
         }
         
         return super.processForm(process, submission, params);

cmsWebApp/src/performa/form/ProcessCultureFP.java

@@ -36,9 +36,11 @@ public class ProcessCultureFP extends SaveFP
         
         for(CultureCriteria criteria: job.getCultureCriteriasSet())
         {
-            if(criteria.isRatingRequired())
+            if(criteria.getIsApplicable())
             {
                 BusinessObjectParser.assertFieldCondition(criteria.getCultureElementRating() != null, criteria , CultureCriteria.SINGLEREFERENCE_CultureElementRating, "mandatory", exceptions, true, request);
+                
+                BusinessObjectParser.assertFieldCondition(criteria.getImportance() != null, criteria , CultureCriteria.FIELD_Importance, "mandatory", exceptions, true, request);
             }
         }
         

cmsWebApp/src/performa/orm/CultureCriteria.xml

@@ -7,7 +7,8 @@
 
         <TABLE  name="tl_culture_criteria"  tablePrefix="object"    polymorphic="FALSE">
             
-            <ATTRIB name="Importance"   type="Importance"   dbcol="importance"  attribHelper="EnumeratedAttributeHelper"    mandatory="true"    defaultValue="Importance.NOT_APPLICABLE"/>
+            <ATTRIB name="Importance"   type="Importance"   dbcol="importance"      attribHelper="EnumeratedAttributeHelper"    />
+            <ATTRIB name="IsApplicable" type="Boolean"      dbcol="is_applicable"   defaultValue="Boolean.FALSE"    />
 
             <SINGLEREFERENCE    name="CultureElement"       type="CultureElement"           dbcol="culture_element_id"          mandatory="true"    />
             <SINGLEREFERENCE    name="CultureElementRating" type="CultureElementRating"     dbcol="culture_element_rating_id"   mandatory="false"   />

cmsWebApp/src/performa/orm/CultureCriteriaPersistenceMgr.java

@@ -28,10 +28,12 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
 
     // Private attributes corresponding to business object data
     private Importance dummyImportance;
+    private Boolean dummyIsApplicable;
     
 
     // Static constants corresponding to attribute helpers
     private static final EnumeratedAttributeHelper HELPER_Importance = new EnumeratedAttributeHelper (Importance.FACTORY_Importance);
+    private static final DefaultAttributeHelper HELPER_IsApplicable = DefaultAttributeHelper.INSTANCE;
     
 
 
@@ -39,10 +41,11 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
     public CultureCriteriaPersistenceMgr ()
     {
         dummyImportance = (Importance)(HELPER_Importance.initialise (dummyImportance));
+        dummyIsApplicable = (Boolean)(HELPER_IsApplicable.initialise (dummyIsApplicable));
         
     }
 
-    private String  SELECT_COLUMNS = "{PREFIX}tl_culture_criteria.object_id as id, {PREFIX}tl_culture_criteria.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_culture_criteria.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_culture_criteria.importance, {PREFIX}tl_culture_criteria.culture_element_id, {PREFIX}tl_culture_criteria.culture_element_rating_id, {PREFIX}tl_culture_criteria.job_id, {PREFIX}tl_culture_criteria.template_id,  1 AS commasafe ";
+    private String  SELECT_COLUMNS = "{PREFIX}tl_culture_criteria.object_id as id, {PREFIX}tl_culture_criteria.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_culture_criteria.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_culture_criteria.importance, {PREFIX}tl_culture_criteria.is_applicable, {PREFIX}tl_culture_criteria.culture_element_id, {PREFIX}tl_culture_criteria.culture_element_rating_id, {PREFIX}tl_culture_criteria.job_id, {PREFIX}tl_culture_criteria.template_id,  1 AS commasafe ";
     private String SELECT_JOINS = "";
 
     public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
@@ -94,6 +97,7 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
              // Check for persistent sets already prefetched
             if (false  || !tl_culture_criteriaPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
                     !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.FIELD_Importance)||
+                    !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.FIELD_IsApplicable)||
                     !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_CultureElement)||
                     !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_CultureElementRating)||
                     !tl_culture_criteriaPSet.containsAttrib(CultureCriteria.SINGLEREFERENCE_Job)||
@@ -187,10 +191,10 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
             {
                 int rowsUpdated = executeStatement (sqlMgr, 
                                                            "UPDATE {PREFIX}tl_culture_criteria " +
-                                                           "SET importance = ?, culture_element_id = ? , culture_element_rating_id = ? , job_id = ? , template_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
+                                                           "SET importance = ?, is_applicable = ?, culture_element_id = ? , culture_element_rating_id = ? , job_id = ? , template_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
                                                                 
                                                            "WHERE tl_culture_criteria.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
-                                                           CollectionUtils.listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_Importance))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElementRating)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Template)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
+                                                           CollectionUtils.listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_Importance))).listEntry (HELPER_IsApplicable.getForSQL(dummyIsApplicable, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_IsApplicable))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElementRating)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Template)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
 
                 if (rowsUpdated != 1)
                 {
@@ -447,6 +451,7 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
             tl_culture_criteriaPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
 
         tl_culture_criteriaPSet.setAttrib(CultureCriteria.FIELD_Importance, HELPER_Importance.getFromRS(dummyImportance, r, "importance"));
+        tl_culture_criteriaPSet.setAttrib(CultureCriteria.FIELD_IsApplicable, HELPER_IsApplicable.getFromRS(dummyIsApplicable, r, "is_applicable"));
         
         tl_culture_criteriaPSet.setAttrib(CultureCriteria.SINGLEREFERENCE_CultureElement, r.getObject ("culture_element_id"));
         tl_culture_criteriaPSet.setAttrib(CultureCriteria.SINGLEREFERENCE_CultureElementRating, r.getObject ("culture_element_rating_id"));
@@ -468,10 +473,10 @@ public class CultureCriteriaPersistenceMgr extends ObjectPersistenceMgr
         {
             executeStatement (sqlMgr, 
                                      "INSERT INTO {PREFIX}tl_culture_criteria " +
-                                     "  (importance,  culture_element_id, culture_element_rating_id, job_id, template_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
+                                     "  (importance, is_applicable,  culture_element_id, culture_element_rating_id, job_id, template_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
                                      "VALUES " +
-                                     "  (?,  ?, ?, ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
-                                     CollectionUtils.listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_Importance))) .listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElementRating)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Template)))) .listEntry (objectID.longID ()).toList().toArray());
+                                     "  (?, ?,  ?, ?, ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
+                                     CollectionUtils.listEntry (HELPER_Importance.getForSQL(dummyImportance, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_Importance))).listEntry (HELPER_IsApplicable.getForSQL(dummyIsApplicable, tl_culture_criteriaPSet.getAttrib (CultureCriteria.FIELD_IsApplicable))) .listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElement)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_CultureElementRating)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_culture_criteriaPSet.getAttrib (CultureCriteria.SINGLEREFERENCE_Template)))) .listEntry (objectID.longID ()).toList().toArray());
 
             tl_culture_criteriaPSet.setStatus (PersistentSetStatus.PROCESSED);
         }

cmsWebApp/src/performa/orm/HiringTeam.xml

@@ -9,7 +9,7 @@
         <IMPORT value="oneit.business.shopping.orm.*"/>
 
         <MULTIPLEREFERENCE  name="Users"    type="CompanyUserHiringTeamLink"    backreferenceName="HiringTeam"  />
-<!--        <MULTIPLEREFERENCE  name="Clients"  type="Client"       backreferenceName="HiringTeam"  />-->
+        <MULTIPLEREFERENCE  name="Clients"  type="Client"                       backreferenceName="HiringTeam"  />
 
         <TRANSIENT  name="IsLogoDeleted"    type="Boolean"      defaultValue="Boolean.FALSE"/>
 

cmsWebApp/src/performa/orm/Job.java

@@ -445,10 +445,10 @@ public class Job extends BaseJob
             location.append(getCountry().getDescription()).append(".");
         }
         
-        if(getRemote() != null && getRemote())
-        {
-            location.append(" (Remote OK)");
-        }
+//        if(getRemote() != null && getRemote())
+//        {
+//            location.append(" (Remote OK)");
+//        }
         
         return location.toString(); 
     }

cmsWebApp/src/performa/orm/Job.xml

@@ -53,6 +53,7 @@
             <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"/>
+            <ATTRIB name="CultureStatement"             type="String"           dbcol="culture_statement"   length="2000"/>
 
             <SINGLEREFERENCE    name="Level"        type="Level"        dbcol="level_id"    mandatory="false"/>
             <SINGLEREFERENCE    name="Client"       type="Client"       dbcol="client_id"   backreferenceName="Jobs"/>

cmsWebApp/src/performa/utils/MenuItemDisableTransformFactory.java

@@ -7,7 +7,6 @@ import oneit.components.DefaultInitialisable;
 import oneit.objstore.ObjectTransaction;
 import oneit.security.SecUser;
 import oneit.utils.ObjectTransform;
-import performa.orm.Company;
 import performa.orm.CompanyUser;
 
 
@@ -27,7 +26,6 @@ public class MenuItemDisableTransformFactory implements ContentTransformFactory,
         ObjectTransaction   transaction;
         SecUser             secUser;
         CompanyUser         companyUser;
-        Company             company;
         
         public MenuItemDisableTransform(Article article, HttpServletRequest request, ObjectTransaction transaction)
         {
@@ -35,14 +33,14 @@ public class MenuItemDisableTransformFactory implements ContentTransformFactory,
             this.request        =   request;
             this.transaction    =   transaction;
             this.secUser        =   SecUser.getTXUser(transaction);
-            this.companyUser    =   this.secUser!=null ? this.secUser.getExtension(CompanyUser.REFERENCE_CompanyUser) : null;
-            this.company        =   this.companyUser!=null ? this.companyUser.getCompany() : null;
+            this.companyUser    =   this.secUser != null ? this.secUser.getExtension(CompanyUser.REFERENCE_CompanyUser) : null;
         }
         
+        @Override
         public Object transform(Object original)
         {
             if((Boolean)article.getAdditionalAttribute("Allow Disable", Boolean.FALSE) 
-                && this.company !=null && !this.company.showHasClientSupport())
+                && this.companyUser != null && this.companyUser.getSelectedTeam() != null && !this.companyUser.getSelectedTeam().showHasClientSupport())
             {
                 return String.valueOf(original);
             }

cmsWebApp/src/performa/utils/Utils.java

@@ -86,6 +86,22 @@ public class Utils
         return importances.toArray(new Importance[0]);
     }
     
+    public static Importance[] getImportancesForCulture()
+    {
+        List<Importance>    importances =   new ArrayList<>();
+        
+        for(Importance importance : Importance.getImportanceArray())
+        {
+            if(importance.getConsiderForAssessment())
+            {
+                importances.add(importance);
+            }
+        }
+//        Collections.sort(importances, (a, b) -> b.getWeightingScore().compareTo(a.getWeightingScore()));
+       
+        return importances.toArray(new Importance[0]);
+    }
+    
     //to sort jobs list
     public static List<Job> getJobsSorted(Job[] jobs, JobSortOption jobSortOption, JobStatus jobStatus)
     {
@@ -313,12 +329,12 @@ public class Utils
     }
     
     
-    public static Client[] getClientsByCompany(ObjectTransaction transaction)
+    public static Client[] getClientsByHiringTeam(ObjectTransaction transaction)
     {
         SecUser     secUser     =   SecUser.getTXUser(transaction);
         CompanyUser companyUser =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
         
-        return companyUser.getCompany().getClientsSet().toArray(new Client[0]);
+        return companyUser.getSelectedTeam().getClientsSet().toArray(new Client[0]);
     }
     
     

cmsWebApp/webroot/css/common.css

@@ -1176,7 +1176,6 @@ span.skill-label span{
     font-weight: 500;
     color: #4e5258;
     display: inline-block;
-    width: 100%;
     margin-bottom: 5px;
 }
 .main-review-label {

cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp

@@ -7,7 +7,6 @@
 <%
     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.WORKPLACE_CULTURE);
     String  jobPage     =   WebUtils.getSamePageInRenderMode(request, "Page");
 

cmsWebApp/webroot/extensions/adminportal/edit_job.jsp

@@ -45,7 +45,7 @@
                                     <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) %>"/>
+                                            <tagfile:ormsingleasso_select obj="<%= job %>"  assocName="Client"  options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
                                         </div> 
                                     </div>
                                     <%
@@ -58,7 +58,7 @@
                                             <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) %>"/>
+                                                    <tagfile:ormsingleasso_select obj="<%= job %>"  assocName="Client"  options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
                                                 </div> 
                                             </div>              
                                     <%

cmsWebApp/webroot/extensions/adminportal/inc/job_main_tabs.jsp

@@ -10,8 +10,7 @@
     String  firstPage       =   WebUtils.getSamePageInRenderMode(request, WebUtils.CREATE_JOB);
     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);
+//    String  fifthPage       =   WebUtils.getSamePageInRenderMode(request, WebUtils.JOB_REVIEW);
     boolean savedJob        =   job.getStatus() != ObjectStatus.NEW;
     boolean fromJobMatch    =   pageNumber == "1";
 %>
@@ -50,16 +49,6 @@
                     Culture
                 </oneit:button>
             </li>
-            <li class="<%= pageNumber == "5" ? "active" : ""%>">
-                <oneit:button   value=" "   name="processCulture" skin="link"
-                                requestAttribs="<%= CollectionUtils.mapEntry("nextPage", fifthPage)
-                                                                .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).toMap())
-                                                                .mapEntry("fromJobMatch", fromJobMatch)
-                                                                .toMap() %>">
-                    <span>5</span>
-                    Review
-                </oneit:button>
-            </li>
         </ul>
     </div>
 </oneit:dynIncluded>

cmsWebApp/webroot/extensions/adminportal/inc/job_title_bar.jsp

@@ -52,7 +52,7 @@
                 <%
                     }
                 %>
-                </span> by <oneit:toString   value="<%= job.getCompanyUser() %>"  mode="EscapeHTML"  nullValue=""/>
+                </span> by <oneit:toString   value="<%= job.getCreatedBy() %>"  mode="EscapeHTML"  nullValue=""/>
             </div>
         </div>
         <div class="applicant-right-status">

cmsWebApp/webroot/extensions/adminportal/job_detail.jsp

@@ -99,7 +99,7 @@
                                 <div class="col-sm-6 col-xs-12">
                                     <label><oneit:label GUIName="Client "/><span>(Optional)</span></label>
                                     <div class="wider-select">
-                                        <tagfile:ormsingleasso_select obj="<%= job %>"  assocName="Client"  options="<%= Utils.getClientsByCompany(transaction) %>"/>
+                                        <tagfile:ormsingleasso_select obj="<%= job %>"  assocName="Client"  options="<%= Utils.getClientsByHiringTeam(transaction) %>"/>
                                     </div> 
                                 </div>
                         <%

cmsWebApp/webroot/extensions/adminportal/list_clients.jsp

@@ -10,6 +10,7 @@
     String              clientPage      =   WebUtils.getSamePageInRenderMode(request, "Page");
     ClientSortOption    clientSortOpt   =   (ClientSortOption) process.getAttribute("ClientSortOption");
     Client[]            clients         =   (Client[]) process.getAttribute("Clients");
+
     if( request.getParameter("ClientSortOption") != null)
     {
         clientSortOpt  =   ClientSortOption.forName((String) request.getParameter("ClientSortOption"));
@@ -22,7 +23,7 @@
     
     if(clients == null)
     {
-        clients =   Utils.getClientsByCompany(transaction);
+        clients =   Utils.getClientsByHiringTeam(transaction);
         
         process.setAttribute("Clients", clients);
     }

cmsWebApp/webroot/extensions/adminportal/upgrades/20181008_Alter_CultureCriteria.xml

+<?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_culture_criteria</tableName>
+            
+            <column name="is_applicable" type="Boolean" nullable="true"/>
+            
+        </NODE>
+
+    </NODE>
+</OBJECTS>
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/upgrades/20181009_Alter_CultureCriteria.sql

+-- @AutoRun
+
+ALTER TABLE tl_culture_criteria ALTER COLUMN importance DROP NOT NULL;
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/upgrades/20181009_Alter_Job.xml

+<?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="culture_statement" type="String" nullable="true" length="2000"/>
+        </NODE>
+        
+    </NODE>
+</OBJECTS>
\ No newline at end of file