Skip to content

P
PERFORMA_REPLICA
Commit ea648583 by Nilu
Options

HT001 - Dashboard - Replace 'Open Jobs' with 'Recent Jobs'

parent a101556e
Showing with 25 additions and 2 deletions
cmsWebApp/sql/Job.xml
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<column name="state" 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="country" type="String" nullable="true" length="200"/>
<column name="manually_closed" type="Boolean" nullable="true"/> <column name="manually_closed" type="Boolean" nullable="true"/>
<column name="last_edited" type="Date" nullable="true"/>
<column name="level_id" type="Long" length="11" nullable="true"/> <column name="level_id" type="Long" length="11" nullable="true"/>
<column name="client_id" type="Long" length="11" nullable="true"/> <column name="client_id" type="Long" length="11" nullable="true"/>
<column name="company_user_id" type="Long" length="11" nullable="true"/> <column name="company_user_id" type="Long" length="11" nullable="true"/>
......
cmsWebApp/sql/ms/Job.sql
...@@ -24,6 +24,7 @@ CREATE TABLE tl_job ( ...@@ -24,6 +24,7 @@ CREATE TABLE tl_job (
state varchar(200) NULL, state varchar(200) NULL,
country varchar(200) NULL, country varchar(200) NULL,
manually_closed char(1) NULL, manually_closed char(1) NULL,
last_edited datetime NULL,
level_id numeric(12) NULL, level_id numeric(12) NULL,
client_id numeric(12) NULL, client_id numeric(12) NULL,
company_user_id numeric(12) NULL, company_user_id numeric(12) NULL,
......
cmsWebApp/sql/oracle/Job.sql
...@@ -25,6 +25,7 @@ CREATE TABLE tl_job ( ...@@ -25,6 +25,7 @@ CREATE TABLE tl_job (
state varchar2(200) NULL, state varchar2(200) NULL,
country varchar2(200) NULL, country varchar2(200) NULL,
manually_closed char(1) NULL, manually_closed char(1) NULL,
last_edited date NULL,
level_id number(12) NULL, level_id number(12) NULL,
client_id number(12) NULL, client_id number(12) NULL,
company_user_id number(12) NULL, company_user_id number(12) NULL,
......
cmsWebApp/sql/postgres/Job.sql
...@@ -25,6 +25,7 @@ CREATE TABLE tl_job ( ...@@ -25,6 +25,7 @@ CREATE TABLE tl_job (
state varchar(200) NULL, state varchar(200) NULL,
country varchar(200) NULL, country varchar(200) NULL,
manually_closed char(1) NULL, manually_closed char(1) NULL,
last_edited timestamp NULL,
level_id numeric(12) NULL, level_id numeric(12) NULL,
client_id numeric(12) NULL, client_id numeric(12) NULL,
company_user_id numeric(12) NULL, company_user_id numeric(12) NULL,
......
cmsWebApp/src/performa/form/SaveJobFP.java
...@@ -71,6 +71,8 @@ public class SaveJobFP extends SaveFP ...@@ -71,6 +71,8 @@ public class SaveJobFP extends SaveFP
job.setIsManuallyClosed(Boolean.TRUE); job.setIsManuallyClosed(Boolean.TRUE);
} }
job.setLastEdited(new Date());
// restarting process as custom attributes needs to be updated to intercom // restarting process as custom attributes needs to be updated to intercom
completeProcessRestartAndRestoreAttribs(process, request); completeProcessRestartAndRestoreAttribs(process, request);
......
cmsWebApp/src/performa/orm/Job.xml
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<ATTRIB name="State" type="State" dbcol="state" defaultValue="State.WA" 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="Country" type="Countries" dbcol="country" defaultValue="Countries.AU" attribHelper="EnumeratedAttributeHelper"/>
<ATTRIB name="IsManuallyClosed" type="Boolean" dbcol="manually_closed" defaultValue="Boolean.FALSE"/> <ATTRIB name="IsManuallyClosed" type="Boolean" dbcol="manually_closed" defaultValue="Boolean.FALSE"/>
<ATTRIB name="LastEdited" type="Date" dbcol="last_edited" />
<SINGLEREFERENCE name="Level" type="Level" dbcol="level_id" mandatory="false"/> <SINGLEREFERENCE name="Level" type="Level" dbcol="level_id" mandatory="false"/>
<SINGLEREFERENCE name="Client" type="Client" dbcol="client_id" backreferenceName="Jobs"/> <SINGLEREFERENCE name="Client" type="Client" dbcol="client_id" backreferenceName="Jobs"/>
......
cmsWebApp/webroot/extensions/adminportal/page_admin_home.jsp
...@@ -53,8 +53,10 @@ ...@@ -53,8 +53,10 @@
.search(transaction); .search(transaction);
List<Job> recentJobs = ObjstoreUtils.sort(Arrays.asList(allJobs), List<Job> recentJobs = ObjstoreUtils.sort(Arrays.asList(allJobs),
new ObjectTransform[]{ Job.pipesJob().toObjectLastModified() }, new ObjectTransform[]{ Job.pipesJob().toLastEdited() ,
new Comparator[]{ CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR) });
Job.pipesJob().toObjectLastModified()},
new Comparator[]{ CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR), CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR), CollectionUtils.reverse(CollectionUtils.DEFAULT_COMPARATOR) });
Article jobsArticle = WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS); Article jobsArticle = WebUtils.getArticleByShortCut(transaction, WebUtils.JOBS);
String nextPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.VIEW_APPLICANTS).toMap()); String nextPage = jobsArticle.getLink(request, CollectionUtils.mapEntry("cms.rm", WebUtils.VIEW_APPLICANTS).toMap());
......
cmsWebApp/webroot/extensions/adminportal/upgrades/20180327_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="last_edited" type="Date" nullable="true"/>
</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