Role Fit algorithm implementation

cmsWebApp/sql/CandidateClassScore.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.DefineTableOperation">
+			<tableName factory="String">tl_candidate_class_score</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="class_score" type="Long" nullable="true"/>
+			<column name="wghtd_class_score" type="Long" nullable="true"/>
+			<column name="max_wghtd_class_score" type="Long" nullable="true"/>
+			<column name="color_code" type="String" nullable="true" length="200"/>
+			<column name="wghtd_color_code" type="String" nullable="true" length="200"/>
+			<column name="factor_class" type="String" nullable="false" length="200"/>
+			<column name="test_analysis_id" type="Long" length="11" nullable="true"/>
+			</NODE>
+        
+    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_candidate_class_score" indexName="idx_tl_candidate_class_score_test_analysis_id" isUnique="false"><column name="test_analysis_id"/></NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/sql/ClassNormalisation.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.DefineTableOperation">
+			<tableName factory="String">tl_class_norm</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="class_code" type="String" nullable="true" length="200"/>
+			<column name="mean_score" type="Double" nullable="true"/>
+			<column name="max_score" type="Double" nullable="true"/>
+			<column name="min_score" type="Double" nullable="true"/>
+			<column name="stddev_score" type="Double" nullable="true"/>
+			<column name="left_mean_score" type="Double" nullable="true"/>
+			<column name="right_mean_score" type="Double" nullable="true"/>
+			<column name="wght_mean_score" type="Double" nullable="true"/>
+			<column name="wght_stddev_score" type="Double" nullable="true"/>
+			<column name="wght_left_mean_score" type="Double" nullable="true"/>
+			<column name="wght_right_mean_score" type="Double" nullable="true"/>
+			<column name="level_number" type="Long" length="11" nullable="true"/>
+			</NODE>
+        
+    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_class_norm" indexName="idx_tl_class_norm_level_number" isUnique="false"><column name="level_number"/></NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/sql/FactorLevelLink.xml

@@ -8,7 +8,7 @@
 			<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="class_code" type="String" nullable="true" length="15"/>
+			<column name="class_code" type="String" nullable="true" length="200"/>
 			<column name="factor_hdr_notes" type="CLOB" nullable="true"/>
 			<column name="left_annot" type="String" nullable="true" length="60"/>
 			<column name="right_annot" type="String" nullable="true" length="60"/>

cmsWebApp/sql/FactorScore.xml

@@ -15,13 +15,10 @@
 			<column name="factor_number" type="Long" length="11" nullable="true"/>
 			<column name="level_number" type="Long" length="11" nullable="true"/>
 			<column name="narrative_id" type="Long" length="11" nullable="true"/>
-			<column name="candidate_id" type="Long" length="11" nullable="true"/>
 			</NODE>
         
     <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_score" indexName="idx_tl_score_test_analysis_id" isUnique="false"><column name="test_analysis_id"/></NODE>
         
     <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_score" indexName="idx_tl_score_narrative_id" isUnique="false"><column name="narrative_id"/></NODE>
-        
-    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_score" indexName="idx_tl_score_candidate_id" isUnique="false"><column name="candidate_id"/></NODE>
 
         </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/sql/LevelClassCriteria.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.DefineTableOperation">
+			<tableName factory="String">tl_level_class_criteria</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="weighting" type="String" nullable="false" length="200"/>
+			<column name="class_code" type="String" nullable="false" length="200"/>
+			<column name="level_number" type="Long" length="11" nullable="true"/>
+			</NODE>
+        
+    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_level_class_criteria" indexName="idx_tl_level_class_criteria_level_number" isUnique="false"><column name="level_number"/></NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/sql/LevelNormalisation.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.DefineTableOperation">
+			<tableName factory="String">tl_level_norm</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="mean_score" type="Double" nullable="true"/>
+			<column name="max_score" type="Double" nullable="true"/>
+			<column name="min_score" type="Double" nullable="true"/>
+			<column name="stddev_score" type="Double" nullable="true"/>
+			<column name="left_mean_score" type="Double" nullable="true"/>
+			<column name="right_mean_score" type="Double" nullable="true"/>
+			<column name="wght_mean_score" type="Double" nullable="true"/>
+			<column name="wght_stddev_score" type="Double" nullable="true"/>
+			<column name="wght_left_mean_score" type="Double" nullable="true"/>
+			<column name="wght_right_mean_score" type="Double" nullable="true"/>
+			<column name="mean_wght_z_score" type="Double" nullable="true"/>
+			<column name="mean_wght_z_score_2" type="Double" nullable="true"/>
+			<column name="stddev_wght_z_score" type="Double" nullable="true"/>
+			<column name="stddev_wght_z_score_2" type="Double" nullable="true"/>
+			<column name="level_number" type="Long" length="11" nullable="true"/>
+			</NODE>
+        
+    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_level_norm" indexName="idx_tl_level_norm_level_number" isUnique="false"><column name="level_number"/></NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/sql/TestAnalysis.xml

@@ -8,7 +8,6 @@
 			<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="job_id" type="Long" length="11" nullable="true"/>
 			<column name="level_id" type="Long" length="11" nullable="true"/>
 			<column name="candidate_id" type="Long" length="11" nullable="true"/>
 			</NODE>

cmsWebApp/sql/ms/CandidateClassScore.sql

+
+-- DROP TABLE tl_candidate_class_score;
+
+
+
+CREATE TABLE tl_candidate_class_score (
+    object_id int NOT NULL ,
+    object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
+    object_created_date datetime DEFAULT getdate() NOT NULL
+    ,
+    class_score numeric(12) NULL,
+    wghtd_class_score numeric(12) NULL,
+    max_wghtd_class_score numeric(12) NULL,
+    color_code varchar(200) NULL,
+    wghtd_color_code varchar(200) NULL,
+    factor_class varchar(200) NOT NULL,
+    test_analysis_id numeric(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_candidate_class_score ADD    
+    CONSTRAINT PK_tl_candidate_class_score PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_candidate_class_score_test_analysis_id 
+    ON tl_candidate_class_score (test_analysis_id);

cmsWebApp/sql/ms/ClassNormalisation.sql

+
+-- DROP TABLE tl_class_norm;
+
+
+
+CREATE TABLE tl_class_norm (
+    object_id int NOT NULL ,
+    object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
+    object_created_date datetime DEFAULT getdate() NOT NULL
+    ,
+    class_code varchar(200) NULL,
+    mean_score numeric(20,5) NULL,
+    max_score numeric(20,5) NULL,
+    min_score numeric(20,5) NULL,
+    stddev_score numeric(20,5) NULL,
+    left_mean_score numeric(20,5) NULL,
+    right_mean_score numeric(20,5) NULL,
+    wght_mean_score numeric(20,5) NULL,
+    wght_stddev_score numeric(20,5) NULL,
+    wght_left_mean_score numeric(20,5) NULL,
+    wght_right_mean_score numeric(20,5) NULL,
+    level_number numeric(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_class_norm ADD    
+    CONSTRAINT PK_tl_class_norm PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_class_norm_level_number 
+    ON tl_class_norm (level_number);

cmsWebApp/sql/ms/FactorLevelLink.sql

@@ -8,7 +8,7 @@ CREATE TABLE tl_factor_hdr (
     object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
     object_created_date datetime DEFAULT getdate() NOT NULL
     ,
-    class_code varchar(15) NULL,
+    class_code varchar(200) NULL,
     factor_hdr_notes text NULL,
     left_annot varchar(60) NULL,
     right_annot varchar(60) NULL,

cmsWebApp/sql/ms/FactorScore.sql

@@ -14,8 +14,7 @@ CREATE TABLE tl_score (
     test_analysis_id numeric(12)  NULL,
     factor_number numeric(12)  NULL,
     level_number numeric(12)  NULL,
-    narrative_id numeric(12)  NULL,
-    candidate_id numeric(12)  NULL
+    narrative_id numeric(12)  NULL
     );
 
 
@@ -33,6 +32,3 @@ ALTER TABLE tl_score ADD
 
     CREATE INDEX idx_tl_score_narrative_id 
     ON tl_score (narrative_id);
-
-    CREATE INDEX idx_tl_score_candidate_id 
-    ON tl_score (candidate_id);

cmsWebApp/sql/ms/LevelClassCriteria.sql

+
+-- DROP TABLE tl_level_class_criteria;
+
+
+
+CREATE TABLE tl_level_class_criteria (
+    object_id int NOT NULL ,
+    object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
+    object_created_date datetime DEFAULT getdate() NOT NULL
+    ,
+    weighting varchar(200) NOT NULL,
+    class_code varchar(200) NOT NULL,
+    level_number numeric(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_level_class_criteria ADD    
+    CONSTRAINT PK_tl_level_class_criteria PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_level_class_criteria_level_number 
+    ON tl_level_class_criteria (level_number);

cmsWebApp/sql/ms/LevelNormalisation.sql

+
+-- DROP TABLE tl_level_norm;
+
+
+
+CREATE TABLE tl_level_norm (
+    object_id int NOT NULL ,
+    object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
+    object_created_date datetime DEFAULT getdate() NOT NULL
+    ,
+    mean_score numeric(20,5) NULL,
+    max_score numeric(20,5) NULL,
+    min_score numeric(20,5) NULL,
+    stddev_score numeric(20,5) NULL,
+    left_mean_score numeric(20,5) NULL,
+    right_mean_score numeric(20,5) NULL,
+    wght_mean_score numeric(20,5) NULL,
+    wght_stddev_score numeric(20,5) NULL,
+    wght_left_mean_score numeric(20,5) NULL,
+    wght_right_mean_score numeric(20,5) NULL,
+    mean_wght_z_score numeric(20,5) NULL,
+    mean_wght_z_score_2 numeric(20,5) NULL,
+    stddev_wght_z_score numeric(20,5) NULL,
+    stddev_wght_z_score_2 numeric(20,5) NULL,
+    level_number numeric(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_level_norm ADD    
+    CONSTRAINT PK_tl_level_norm PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_level_norm_level_number 
+    ON tl_level_norm (level_number);

cmsWebApp/sql/ms/TestAnalysis.sql

@@ -8,7 +8,6 @@ CREATE TABLE tl_test_analysis (
     object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
     object_created_date datetime DEFAULT getdate() NOT NULL
     ,
-    job_id numeric(12)  NULL,
     level_id numeric(12)  NULL,
     candidate_id numeric(12)  NULL
     );

cmsWebApp/sql/oracle/CandidateClassScore.sql

+
+-- DROP TABLE tl_candidate_class_score;
+
+
+
+
+CREATE TABLE tl_candidate_class_score (
+    object_id number(12) NOT NULL ,
+    object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
+    object_created_date date DEFAULT SYSDATE NOT NULL
+    ,
+    class_score number(12) NULL,
+    wghtd_class_score number(12) NULL,
+    max_wghtd_class_score number(12) NULL,
+    color_code varchar2(200) NULL,
+    wghtd_color_code varchar2(200) NULL,
+    factor_class varchar2(200) NOT NULL,
+    test_analysis_id number(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_candidate_class_score ADD    
+    CONSTRAINT PK_tl_candidate_class_score PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_candidate_class_score_test_analysis_id 
+    ON tl_candidate_class_score (test_analysis_id);

cmsWebApp/sql/oracle/ClassNormalisation.sql

+
+-- DROP TABLE tl_class_norm;
+
+
+
+
+CREATE TABLE tl_class_norm (
+    object_id number(12) NOT NULL ,
+    object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
+    object_created_date date DEFAULT SYSDATE NOT NULL
+    ,
+    class_code varchar2(200) NULL,
+    mean_score number(20,5) NULL,
+    max_score number(20,5) NULL,
+    min_score number(20,5) NULL,
+    stddev_score number(20,5) NULL,
+    left_mean_score number(20,5) NULL,
+    right_mean_score number(20,5) NULL,
+    wght_mean_score number(20,5) NULL,
+    wght_stddev_score number(20,5) NULL,
+    wght_left_mean_score number(20,5) NULL,
+    wght_right_mean_score number(20,5) NULL,
+    level_number number(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_class_norm ADD    
+    CONSTRAINT PK_tl_class_norm PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_class_norm_level_number 
+    ON tl_class_norm (level_number);

cmsWebApp/sql/oracle/FactorLevelLink.sql

@@ -9,7 +9,7 @@ CREATE TABLE tl_factor_hdr (
     object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
     object_created_date date DEFAULT SYSDATE NOT NULL
     ,
-    class_code varchar2(15) NULL,
+    class_code varchar2(200) NULL,
     factor_hdr_notes clob NULL,
     left_annot varchar2(60) NULL,
     right_annot varchar2(60) NULL,

cmsWebApp/sql/oracle/FactorScore.sql

@@ -15,8 +15,7 @@ CREATE TABLE tl_score (
     test_analysis_id number(12)  NULL,
     factor_number number(12)  NULL,
     level_number number(12)  NULL,
-    narrative_id number(12)  NULL,
-    candidate_id number(12)  NULL
+    narrative_id number(12)  NULL
     );
 
 
@@ -34,6 +33,3 @@ ALTER TABLE tl_score ADD
 
     CREATE INDEX idx_tl_score_narrative_id 
     ON tl_score (narrative_id);
-
-    CREATE INDEX idx_tl_score_candidate_id 
-    ON tl_score (candidate_id);

cmsWebApp/sql/oracle/LevelClassCriteria.sql

+
+-- DROP TABLE tl_level_class_criteria;
+
+
+
+
+CREATE TABLE tl_level_class_criteria (
+    object_id number(12) NOT NULL ,
+    object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
+    object_created_date date DEFAULT SYSDATE NOT NULL
+    ,
+    weighting varchar2(200) NOT NULL,
+    class_code varchar2(200) NOT NULL,
+    level_number number(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_level_class_criteria ADD    
+    CONSTRAINT PK_tl_level_class_criteria PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_level_class_criteria_level_number 
+    ON tl_level_class_criteria (level_number);

cmsWebApp/sql/oracle/LevelNormalisation.sql

+
+-- DROP TABLE tl_level_norm;
+
+
+
+
+CREATE TABLE tl_level_norm (
+    object_id number(12) NOT NULL ,
+    object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
+    object_created_date date DEFAULT SYSDATE NOT NULL
+    ,
+    mean_score number(20,5) NULL,
+    max_score number(20,5) NULL,
+    min_score number(20,5) NULL,
+    stddev_score number(20,5) NULL,
+    left_mean_score number(20,5) NULL,
+    right_mean_score number(20,5) NULL,
+    wght_mean_score number(20,5) NULL,
+    wght_stddev_score number(20,5) NULL,
+    wght_left_mean_score number(20,5) NULL,
+    wght_right_mean_score number(20,5) NULL,
+    mean_wght_z_score number(20,5) NULL,
+    mean_wght_z_score_2 number(20,5) NULL,
+    stddev_wght_z_score number(20,5) NULL,
+    stddev_wght_z_score_2 number(20,5) NULL,
+    level_number number(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_level_norm ADD    
+    CONSTRAINT PK_tl_level_norm PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_level_norm_level_number 
+    ON tl_level_norm (level_number);

cmsWebApp/sql/oracle/TestAnalysis.sql

@@ -9,7 +9,6 @@ CREATE TABLE tl_test_analysis (
     object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
     object_created_date date DEFAULT SYSDATE NOT NULL
     ,
-    job_id number(12)  NULL,
     level_id number(12)  NULL,
     candidate_id number(12)  NULL
     );

cmsWebApp/sql/postgres/CandidateClassScore.sql

+
+-- @AutoRun
+-- drop table tl_candidate_class_score;
+
+
+
+CREATE TABLE tl_candidate_class_score (
+    object_id numeric(12) NOT NULL ,
+    object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
+    object_created_date timestamp DEFAULT NOW() NOT NULL
+    ,
+    class_score numeric(12) NULL,
+    wghtd_class_score numeric(12) NULL,
+    max_wghtd_class_score numeric(12) NULL,
+    color_code varchar(200) NULL,
+    wghtd_color_code varchar(200) NULL,
+    factor_class varchar(200) NOT NULL,
+    test_analysis_id numeric(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_candidate_class_score ADD    
+    CONSTRAINT pk_tl_candidate_class_score PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_candidate_class_score_test_analysis_id 
+    ON tl_candidate_class_score (test_analysis_id);

cmsWebApp/sql/postgres/ClassNormalisation.sql

+
+-- @AutoRun
+-- drop table tl_class_norm;
+
+
+
+CREATE TABLE tl_class_norm (
+    object_id numeric(12) NOT NULL ,
+    object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
+    object_created_date timestamp DEFAULT NOW() NOT NULL
+    ,
+    class_code varchar(200) NULL,
+    mean_score numeric(20,5) NULL,
+    max_score numeric(20,5) NULL,
+    min_score numeric(20,5) NULL,
+    stddev_score numeric(20,5) NULL,
+    left_mean_score numeric(20,5) NULL,
+    right_mean_score numeric(20,5) NULL,
+    wght_mean_score numeric(20,5) NULL,
+    wght_stddev_score numeric(20,5) NULL,
+    wght_left_mean_score numeric(20,5) NULL,
+    wght_right_mean_score numeric(20,5) NULL,
+    level_number numeric(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_class_norm ADD    
+    CONSTRAINT pk_tl_class_norm PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_class_norm_level_number 
+    ON tl_class_norm (level_number);

cmsWebApp/sql/postgres/FactorLevelLink.sql

@@ -9,7 +9,7 @@ CREATE TABLE tl_factor_hdr (
     object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
     object_created_date timestamp DEFAULT NOW() NOT NULL
     ,
-    class_code varchar(15) NULL,
+    class_code varchar(200) NULL,
     factor_hdr_notes text NULL,
     left_annot varchar(60) NULL,
     right_annot varchar(60) NULL,

cmsWebApp/sql/postgres/FactorScore.sql

@@ -15,8 +15,7 @@ CREATE TABLE tl_score (
     test_analysis_id numeric(12)  NULL,
     factor_number numeric(12)  NULL,
     level_number numeric(12)  NULL,
-    narrative_id numeric(12)  NULL,
-    candidate_id numeric(12)  NULL
+    narrative_id numeric(12)  NULL
     );
 
 
@@ -34,6 +33,3 @@ ALTER TABLE tl_score ADD
 
     CREATE INDEX idx_tl_score_narrative_id 
     ON tl_score (narrative_id);
-
-    CREATE INDEX idx_tl_score_candidate_id 
-    ON tl_score (candidate_id);

cmsWebApp/sql/postgres/LevelClassCriteria.sql

+
+-- @AutoRun
+-- drop table tl_level_class_criteria;
+
+
+
+CREATE TABLE tl_level_class_criteria (
+    object_id numeric(12) NOT NULL ,
+    object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
+    object_created_date timestamp DEFAULT NOW() NOT NULL
+    ,
+    weighting varchar(200) NOT NULL,
+    class_code varchar(200) NOT NULL,
+    level_number numeric(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_level_class_criteria ADD    
+    CONSTRAINT pk_tl_level_class_criteria PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_level_class_criteria_level_number 
+    ON tl_level_class_criteria (level_number);

cmsWebApp/sql/postgres/LevelNormalisation.sql

+
+-- @AutoRun
+-- drop table tl_level_norm;
+
+
+
+CREATE TABLE tl_level_norm (
+    object_id numeric(12) NOT NULL ,
+    object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
+    object_created_date timestamp DEFAULT NOW() NOT NULL
+    ,
+    mean_score numeric(20,5) NULL,
+    max_score numeric(20,5) NULL,
+    min_score numeric(20,5) NULL,
+    stddev_score numeric(20,5) NULL,
+    left_mean_score numeric(20,5) NULL,
+    right_mean_score numeric(20,5) NULL,
+    wght_mean_score numeric(20,5) NULL,
+    wght_stddev_score numeric(20,5) NULL,
+    wght_left_mean_score numeric(20,5) NULL,
+    wght_right_mean_score numeric(20,5) NULL,
+    mean_wght_z_score numeric(20,5) NULL,
+    mean_wght_z_score_2 numeric(20,5) NULL,
+    stddev_wght_z_score numeric(20,5) NULL,
+    stddev_wght_z_score_2 numeric(20,5) NULL,
+    level_number numeric(12)  NULL
+    );
+
+
+
+ALTER TABLE tl_level_norm ADD    
+    CONSTRAINT pk_tl_level_norm PRIMARY KEY 
+    (
+        object_id
+    ) ;
+    
+    
+    
+    CREATE INDEX idx_tl_level_norm_level_number 
+    ON tl_level_norm (level_number);

cmsWebApp/sql/postgres/TestAnalysis.sql

@@ -9,7 +9,6 @@ CREATE TABLE tl_test_analysis (
     object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
     object_created_date timestamp DEFAULT NOW() NOT NULL
     ,
-    job_id numeric(12)  NULL,
     level_id numeric(12)  NULL,
     candidate_id numeric(12)  NULL
     );

cmsWebApp/src/performa/form/CompleteApplicationFP.java

@@ -24,7 +24,7 @@ public class CompleteApplicationFP extends SaveFP
         jobApplication.setApplicationStatus(ApplicationStatus.SUBMITTED);
         jobApplication.setSubmittedDate(new Date());
         
-        AnalysisEngine.analyseAnswers(jobApplication);
+        AnalysisEngine.analyseAnswers(jobApplication.getCandidate(), jobApplication.getJob().getLevel(), jobApplication.getCompletedAnswers());
         
         
         //TODO: set application status as UNSUITABLE if not scored

cmsWebApp/src/performa/orm/Candidate.java

@@ -5,11 +5,13 @@ import java.util.Date;
 import javax.servlet.http.HttpServletRequest;
 import oneit.objstore.MessageSource;
 import oneit.objstore.ObjectTransaction;
+import oneit.objstore.rdbms.filters.EqualsFilter;
 import oneit.servlets.objstore.MessageSourceDecorator;
 import oneit.servlets.process.ORMProcessState;
 import oneit.utils.CollectionUtils;
 import oneit.utils.DateDiff;
 import oneit.utils.StringUtils;
+import oneit.utils.filter.Filter;
 
 
 public class Candidate extends BaseCandidate
@@ -75,4 +77,11 @@ public class Candidate extends BaseCandidate
         
         return errorMsg;
     }
+    
+    public TestAnalysis getTestAnalysisFor(Level level)
+    {
+        Filter<TestAnalysis>    testAnalysisFilter  =   TestAnalysis.SearchByAll().andLevel(new EqualsFilter(level));
+           
+        return pipelineCandidate().toTestAnalysises(testAnalysisFilter).val();
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/Candidate.xml

@@ -6,9 +6,8 @@
         
         <IMPORT value="oneit.security.*"    />
         
-        <MULTIPLEREFERENCE  name="TestAnalysises"   type="TestAnalysis"     backreferenceName="Candidate"   />
-        <MULTIPLEREFERENCE  name="JobApplications"  type="JobApplication"   backreferenceName="Candidate"   />
-        <MULTIPLEREFERENCE  name="FactorScores"     type="FactorScore"      backreferenceName="Candidate"   />
+        <MULTIPLEREFERENCE  name="TestAnalysises"       type="TestAnalysis"         backreferenceName="Candidate"   />
+        <MULTIPLEREFERENCE  name="JobApplications"      type="JobApplication"       backreferenceName="Candidate"   />
         
         <TABLE  name="oneit_sec_user_extension" tablePrefix="object"    polymorphic="TRUE">
 

cmsWebApp/src/performa/orm/CandidateClassScore.java

+package performa.orm;
+
+
+public class CandidateClassScore extends BaseCandidateClassScore
+{
+    private static final long serialVersionUID = 0L;
+    
+    // This constructor should not be called
+    public CandidateClassScore ()
+    {
+        // Do not add any code to this, always put it in initialiseNewObject
+    }
+}
\ No newline at end of file

cmsWebApp/src/performa/orm/CandidateClassScore.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://www.oneit.com.au/schemas/5.2/BusinessObject.xsd'>
+
+    <BUSINESSCLASS  name="CandidateClassScore"  package="performa.orm">
+        <IMPORT value="performa.orm.types.*"/>
+               
+        <TABLE  name="tl_candidate_class_score" tablePrefix="object"    polymorphic="FALSE">
+            
+            <ATTRIB name="ClassScore"           type="Integer"      dbcol="class_score"             />
+            <ATTRIB name="WghtdClassScore"      type="Integer"      dbcol="wghtd_class_score"       />
+            <ATTRIB name="MaxWghtdClassScore"   type="Integer"      dbcol="max_wghtd_class_score"   />
+            <ATTRIB name="ColorCode"            type="ColorCode"    dbcol="color_code"              attribHelper="EnumeratedAttributeHelper"/><!-- Related to CANDIDATE_CLASS_PCT view - color_rank -->
+            <ATTRIB name="WghtdColorCode"       type="ColorCode"    dbcol="wghtd_color_code"        attribHelper="EnumeratedAttributeHelper"/><!-- Related to CANDIDATE_CLASS_PCT view - wghtd_color_rank -->
+            <ATTRIB name="FactorClass"          type="FactorClass"  dbcol="factor_class"            attribHelper="EnumeratedAttributeHelper"    mandatory="true"/>
+
+            <SINGLEREFERENCE    name="TestAnalysis" type="TestAnalysis" dbcol="test_analysis_id"    backreferenceName="CandidateClassScores"/>
+            
+        </TABLE>
+        
+        <SEARCH type="All"  paramFilter="tl_level_factor.object_id is not null" orderBy="tl_level_factor.object_id" />
+
+    </BUSINESSCLASS>
+    
+</ROOT>

cmsWebApp/src/performa/orm/ClassNormalisation.java

+package performa.orm;
+
+
+public class ClassNormalisation extends BaseClassNormalisation
+{
+    private static final long serialVersionUID = 0L;
+    
+    // This constructor should not be called
+    public ClassNormalisation ()
+    {
+        // Do not add any code to this, always put it in initialiseNewObject
+    }
+
+    @Override
+    public String getObjectIDSpace()
+    {
+        return "ClassNormalisation";
+    }
+}
\ No newline at end of file

cmsWebApp/src/performa/orm/ClassNormalisation.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://www.oneit.com.au/schemas/5.2/BusinessObject.xsd'>
+
+    <BUSINESSCLASS name="ClassNormalisation"    package="performa.orm">
+        <IMPORT value="performa.orm.types.*"/>
+                
+        <TABLE  name="tl_class_norm"    tablePrefix="object"    polymorphic="FALSE">
+            
+            <ATTRIB name="FactorClass"          type="FactorClass"  dbcol="class_code"  attribHelper="EnumeratedAttributeHelper"    />
+            <ATTRIB name="MeanScore"            type="Double"       dbcol="mean_score"/>
+            <ATTRIB name="MaxScore"             type="Double"       dbcol="max_score"/>
+            <ATTRIB name="MinScore"             type="Double"       dbcol="min_score"/>
+            <ATTRIB name="StddevScore"          type="Double"       dbcol="stddev_score"/>
+            <ATTRIB name="LeftMeanScore"        type="Double"       dbcol="left_mean_score"/>
+            <ATTRIB name="RightMeanScore"       type="Double"       dbcol="right_mean_score"/>
+            <ATTRIB name="WghtMeanScore"        type="Double"       dbcol="wght_mean_score"/>
+            <ATTRIB name="WghtStddevScore"      type="Double"       dbcol="wght_stddev_score"/>
+            <ATTRIB name="WghtLeftMeanScore"    type="Double"       dbcol="wght_left_mean_score"/>
+            <ATTRIB name="WghtRightMeanScore"   type="Double"       dbcol="wght_right_mean_score"/>
+            
+            <SINGLEREFERENCE    name="Level"    type="Level"    dbcol="level_number"    backreferenceName="ClassNormalisations"/>
+        </TABLE>
+                
+        <SEARCH type="All"  paramFilter="tl_class_norm.object_id is not null" orderBy="tl_class_norm.object_id" />
+        
+    </BUSINESSCLASS>
+    
+</ROOT>
\ No newline at end of file

cmsWebApp/src/performa/orm/Factor.java

 package performa.orm;
 
+import oneit.utils.StringUtils;
+
 
 public class Factor extends BaseFactor
 {
@@ -16,4 +18,10 @@ public class Factor extends BaseFactor
     {
         return "Factor";
     }
+
+    @Override
+    public String getToString()
+    {
+        return StringUtils.subNulls(getDescription(), super.getToString());
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/FactorLevelLink.xml

@@ -4,14 +4,16 @@
 
     <BUSINESSCLASS name="FactorLevelLink"   package="performa.orm">
                 
+        <IMPORT value="performa.orm.types.*"/>
+        
         <TABLE  name="tl_factor_hdr"    tablePrefix="object"    polymorphic="FALSE">
             
-            <ATTRIB name="ClassCode"        type="String"   dbcol="class_code"  length="15"/>
-            <ATTRIB name="Notes"            type="String"   dbcol="factor_hdr_notes"/>
-            <ATTRIB name="LeftAnnot"        type="String"   dbcol="left_annot"  length="60"/>
-            <ATTRIB name="RightAnnot"       type="String"   dbcol="right_annot" length="60"/>
-            <ATTRIB name="ZScoreWeight"     type="Double"   dbcol="z_score_wght"    />
-            <ATTRIB name="ZScoreWeight2"    type="Double"   dbcol="z_score_wght_2"  />
+            <ATTRIB name="FactorClass"      type="FactorClass"  dbcol="class_code"      attribHelper="EnumeratedAttributeHelper"    />
+            <ATTRIB name="Notes"            type="String"       dbcol="factor_hdr_notes"/>
+            <ATTRIB name="LeftAnnot"        type="String"       dbcol="left_annot"      length="60"/>
+            <ATTRIB name="RightAnnot"       type="String"       dbcol="right_annot"     length="60"/>
+            <ATTRIB name="ZScoreWeight"     type="Double"       dbcol="z_score_wght"    />
+            <ATTRIB name="ZScoreWeight2"    type="Double"       dbcol="z_score_wght_2"  />
 
             <SINGLEREFERENCE    name="Level"    type="Level"    dbcol="level_number"    backreferenceName="Factors" />
             <SINGLEREFERENCE    name="Factor"   type="Factor"   dbcol="factor_number"   backreferenceName="Levels" />

cmsWebApp/src/performa/orm/FactorLevelLinkPersistenceMgr.java

@@ -14,6 +14,7 @@ import oneit.sql.*;
 import oneit.utils.resource.*;
 import oneit.utils.*;
 import oneit.utils.threading.*;
+import performa.orm.types.*;
 
 
 
@@ -26,7 +27,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
     private static final LoggingArea FactorLevelLinkPersistence = LoggingArea.createLoggingArea(ObjectPersistenceMgr.OBJECT_PERSISTENCE, "FactorLevelLink");
 
     // Private attributes corresponding to business object data
-    private String dummyClassCode;
+    private FactorClass dummyFactorClass;
     private String dummyNotes;
     private String dummyLeftAnnot;
     private String dummyRightAnnot;
@@ -35,7 +36,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
     
 
     // Static constants corresponding to attribute helpers
-    private static final DefaultAttributeHelper HELPER_ClassCode = DefaultAttributeHelper.INSTANCE;
+    private static final EnumeratedAttributeHelper HELPER_FactorClass = new EnumeratedAttributeHelper (FactorClass.FACTORY_FactorClass);
     private static final DefaultAttributeHelper HELPER_Notes = DefaultAttributeHelper.INSTANCE;
     private static final DefaultAttributeHelper HELPER_LeftAnnot = DefaultAttributeHelper.INSTANCE;
     private static final DefaultAttributeHelper HELPER_RightAnnot = DefaultAttributeHelper.INSTANCE;
@@ -47,7 +48,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
 
     public FactorLevelLinkPersistenceMgr ()
     {
-        dummyClassCode = (String)(HELPER_ClassCode.initialise (dummyClassCode));
+        dummyFactorClass = (FactorClass)(HELPER_FactorClass.initialise (dummyFactorClass));
         dummyNotes = (String)(HELPER_Notes.initialise (dummyNotes));
         dummyLeftAnnot = (String)(HELPER_LeftAnnot.initialise (dummyLeftAnnot));
         dummyRightAnnot = (String)(HELPER_RightAnnot.initialise (dummyRightAnnot));
@@ -107,7 +108,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
 
              // Check for persistent sets already prefetched
             if (false  || !tl_factor_hdrPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
-                    !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ClassCode)||
+                    !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_FactorClass)||
                     !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_Notes)||
                     !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_LeftAnnot)||
                     !tl_factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_RightAnnot)||
@@ -207,7 +208,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
                                                            "SET class_code = ?, factor_hdr_notes = ?, left_annot = ?, right_annot = ?, z_score_wght = ?, z_score_wght_2 = ?, level_number = ? , factor_number = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
                                                                 
                                                            "WHERE tl_factor_hdr.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
-                                                           CollectionUtils.listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
+                                                           CollectionUtils.listEntry (HELPER_FactorClass.getForSQL(dummyFactorClass, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_FactorClass))).listEntry (HELPER_Notes.getForSQL(dummyNotes, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
 
                 if (rowsUpdated != 1)
                 {
@@ -463,7 +464,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
             // Object Created
             tl_factor_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
 
-        tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ClassCode, HELPER_ClassCode.getFromRS(dummyClassCode, r, "class_code"));
+        tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_FactorClass, HELPER_FactorClass.getFromRS(dummyFactorClass, r, "class_code"));
         tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_Notes, HELPER_Notes.getFromRS(dummyNotes, r, "factor_hdr_notes"));
         tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_LeftAnnot, HELPER_LeftAnnot.getFromRS(dummyLeftAnnot, r, "left_annot"));
         tl_factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_RightAnnot, HELPER_RightAnnot.getFromRS(dummyRightAnnot, r, "right_annot"));
@@ -491,7 +492,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
                                      "  (class_code, factor_hdr_notes, left_annot, right_annot, z_score_wght, z_score_wght_2,  level_number, factor_number,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
                                      "VALUES " +
                                      "  (?, ?, ?, ?, ?, ?,  ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
-                                     CollectionUtils.listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))) .listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))) .listEntry (objectID.longID ()).toList().toArray());
+                                     CollectionUtils.listEntry (HELPER_FactorClass.getForSQL(dummyFactorClass, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_FactorClass))).listEntry (HELPER_Notes.getForSQL(dummyNotes, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, tl_factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))) .listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))) .listEntry (objectID.longID ()).toList().toArray());
 
             tl_factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED);
         }

cmsWebApp/src/performa/orm/FactorScore.xml

@@ -18,7 +18,6 @@
             <SINGLEREFERENCE    name="Factor"       type="Factor"       dbcol="factor_number"/>
             <SINGLEREFERENCE    name="Level"        type="Level"        dbcol="level_number"/>
             <SINGLEREFERENCE    name="Narrative"    type="Narrative"    dbcol="narrative_id"        backreferenceName="FactorScores"/>
-            <SINGLEREFERENCE    name="Candidate"    type="Candidate"    dbcol="candidate_id"        backreferenceName="FactorScores"/>
 
         </TABLE>
                 

cmsWebApp/src/performa/orm/FactorScorePersistenceMgr.java

@@ -48,7 +48,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
         
     }
 
-    private String  SELECT_COLUMNS = "{PREFIX}tl_score.object_id as id, {PREFIX}tl_score.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_score.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_score.score_number, {PREFIX}tl_score.color_rank, {PREFIX}tl_score.wghtd_score, {PREFIX}tl_score.test_analysis_id, {PREFIX}tl_score.factor_number, {PREFIX}tl_score.level_number, {PREFIX}tl_score.narrative_id, {PREFIX}tl_score.candidate_id,  1 AS commasafe ";
+    private String  SELECT_COLUMNS = "{PREFIX}tl_score.object_id as id, {PREFIX}tl_score.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_score.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_score.score_number, {PREFIX}tl_score.color_rank, {PREFIX}tl_score.wghtd_score, {PREFIX}tl_score.test_analysis_id, {PREFIX}tl_score.factor_number, {PREFIX}tl_score.level_number, {PREFIX}tl_score.narrative_id,  1 AS commasafe ";
     private String SELECT_JOINS = "";
 
     public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
@@ -105,8 +105,7 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
                     !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_TestAnalysis)||
                     !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Factor)||
                     !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Level)||
-                    !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Narrative)||
-                    !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Candidate))
+                    !tl_scorePSet.containsAttrib(FactorScore.SINGLEREFERENCE_Narrative))
             {
                 // We will need to retrieve it
                 idsToFetch.add (id.longValue());
@@ -172,16 +171,6 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
 
             return results;
         }
-        else if (refName.equals (FactorScore.SINGLEREFERENCE_Candidate))
-        {
-            String  query = "SELECT " + SELECT_COLUMNS +
-                            "FROM {PREFIX}tl_score " +
-                            "WHERE " + SELECT_JOINS + "candidate_id = ?";
-
-            BaseBusinessClass[] results = loadQuery (allPSets, sqlMgr, context, query, new Object[] { _objectID.longID () }, null, false);
-
-            return results;
-        }
         else
         {
             throw new IllegalArgumentException ("Illegal reference type:" + refName);
@@ -206,10 +195,10 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
             {
                 int rowsUpdated = executeStatement (sqlMgr, 
                                                            "UPDATE {PREFIX}tl_score " +
-                                                           "SET score_number = ?, color_rank = ?, wghtd_score = ?, test_analysis_id = ? , factor_number = ? , level_number = ? , narrative_id = ? , candidate_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
+                                                           "SET score_number = ?, color_rank = ?, wghtd_score = ?, test_analysis_id = ? , factor_number = ? , level_number = ? , narrative_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
                                                                 
                                                            "WHERE tl_score.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
-                                                           CollectionUtils.listEntry (HELPER_Score.getForSQL(dummyScore, tl_scorePSet.getAttrib (FactorScore.FIELD_Score))).listEntry (HELPER_ColorRank.getForSQL(dummyColorRank, tl_scorePSet.getAttrib (FactorScore.FIELD_ColorRank))).listEntry (HELPER_WghtdScore.getForSQL(dummyWghtdScore, tl_scorePSet.getAttrib (FactorScore.FIELD_WghtdScore))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_TestAnalysis)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Narrative)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Candidate)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
+                                                           CollectionUtils.listEntry (HELPER_Score.getForSQL(dummyScore, tl_scorePSet.getAttrib (FactorScore.FIELD_Score))).listEntry (HELPER_ColorRank.getForSQL(dummyColorRank, tl_scorePSet.getAttrib (FactorScore.FIELD_ColorRank))).listEntry (HELPER_WghtdScore.getForSQL(dummyWghtdScore, tl_scorePSet.getAttrib (FactorScore.FIELD_WghtdScore))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_TestAnalysis)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Narrative)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
 
                 if (rowsUpdated != 1)
                 {
@@ -473,7 +462,6 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
         tl_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Factor, r.getObject ("factor_number"));
         tl_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Level, r.getObject ("level_number"));
         tl_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Narrative, r.getObject ("narrative_id"));
-        tl_scorePSet.setAttrib(FactorScore.SINGLEREFERENCE_Candidate, r.getObject ("candidate_id"));
         
     }
 
@@ -490,10 +478,10 @@ public class FactorScorePersistenceMgr extends ObjectPersistenceMgr
         {
             executeStatement (sqlMgr, 
                                      "INSERT INTO {PREFIX}tl_score " +
-                                     "  (score_number, color_rank, wghtd_score,  test_analysis_id, factor_number, level_number, narrative_id, candidate_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
+                                     "  (score_number, color_rank, wghtd_score,  test_analysis_id, factor_number, level_number, narrative_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
                                      "VALUES " +
-                                     "  (?, ?, ?,  ?, ?, ?, ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
-                                     CollectionUtils.listEntry (HELPER_Score.getForSQL(dummyScore, tl_scorePSet.getAttrib (FactorScore.FIELD_Score))).listEntry (HELPER_ColorRank.getForSQL(dummyColorRank, tl_scorePSet.getAttrib (FactorScore.FIELD_ColorRank))).listEntry (HELPER_WghtdScore.getForSQL(dummyWghtdScore, tl_scorePSet.getAttrib (FactorScore.FIELD_WghtdScore))) .listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_TestAnalysis)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Narrative)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Candidate)))) .listEntry (objectID.longID ()).toList().toArray());
+                                     "  (?, ?, ?,  ?, ?, ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
+                                     CollectionUtils.listEntry (HELPER_Score.getForSQL(dummyScore, tl_scorePSet.getAttrib (FactorScore.FIELD_Score))).listEntry (HELPER_ColorRank.getForSQL(dummyColorRank, tl_scorePSet.getAttrib (FactorScore.FIELD_ColorRank))).listEntry (HELPER_WghtdScore.getForSQL(dummyWghtdScore, tl_scorePSet.getAttrib (FactorScore.FIELD_WghtdScore))) .listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_TestAnalysis)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Factor)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_scorePSet.getAttrib (FactorScore.SINGLEREFERENCE_Narrative)))) .listEntry (objectID.longID ()).toList().toArray());
 
             tl_scorePSet.setStatus (PersistentSetStatus.PROCESSED);
         }

cmsWebApp/src/performa/orm/JobApplication.java

@@ -12,9 +12,7 @@ import oneit.utils.ObjectTransform;
 import oneit.utils.filter.CollectionFilter;
 import oneit.utils.filter.Filter;
 import oneit.utils.parsers.FieldException;
-import performa.orm.types.AppProcessOption;
-import performa.orm.types.ApplicationStatus;
-import performa.orm.types.CriteriaType;
+import performa.orm.types.*;
 import performa.utils.AnalysisEngine;
 
 
@@ -262,9 +260,9 @@ public class JobApplication extends BaseJobApplication
     }
     
     
-    public int getJobMatchPercentage() //ROLE
+    public Double getJobMatchPercentage() //ROLE
     {
-        return 85;
+        return AnalysisEngine.getRoleFitSuitability(getCandidate(), getJob().getLevel()).get(null);
     }
     
     
@@ -359,4 +357,24 @@ public class JobApplication extends BaseJobApplication
         
         return null;
     }
+    
+    public Set<Answer> getCompletedAnswers()
+    {
+        return getAlreadyCompletedApplicationForRole() != null ? getAlreadyCompletedApplicationForRole().getProfileAssessmentAnswersSet() : getProfileAssessmentAnswersSet();
+    }
+    
+    public Set<FactorClass> getSortedFactorClasses()
+    {
+        Set<FactorClass>    factorClasses       =   new LinkedHashSet<>();
+        Set<FactorClass>    levelFactorClasses  =   pipelineJobApplication().toJob().toLevel().toLevelClassCriterias().toFactorClass().uniqueVals();
+        
+        for(FactorClass factorClass : FactorClass.getFactorClassArray())    //getFactorClassArray returns Factor Classes sorted by SortOrder
+        {
+            if(levelFactorClasses.contains(factorClass))
+            {
+                factorClasses.add(factorClass);
+            }
+        }
+        return factorClasses;
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/Level.java

 package performa.orm;
 
+import java.util.*;
+import oneit.objstore.rdbms.filters.EqualsFilter;
+import oneit.objstore.utils.ObjstoreUtils;
+import oneit.utils.*;
+import oneit.utils.filter.*;
+import performa.orm.types.FactorClass;
+
 
 public class Level extends BaseLevel
 {
@@ -22,4 +29,43 @@ public class Level extends BaseLevel
     {
         return getLevelDescription();
     }
+    
+    public LevelFactorType getLevelFactorType(Factor factor)
+    {
+        Filter<LevelFactorType> levelFactorFilter   =   LevelFactorType.SearchByAll().andFactor(new EqualsFilter(factor));
+                    
+        return pipelineLevel().toLevelFactorTypes(levelFactorFilter).val();
+    }
+    
+    public ClassNormalisation getClassNormalisationFor(FactorClass factorClass)
+    {
+        Filter<ClassNormalisation> classNormalisationFilter =   ClassNormalisation.SearchByAll().andFactorClass(new EqualsFilter(factorClass));
+                    
+        return pipelineLevel().toClassNormalisations(classNormalisationFilter).val();
+    }
+    
+    public LevelNormalisation getLevelNormalisation()
+    {
+        return pipelineLevel().toLevelNormalisations().val();
+    }
+    
+    public List<FactorLevelLink> getSortedFactorLinks(FactorClass factorClass)
+    {
+        Filter<FactorLevelLink> factorLevelLinkFilter   =   FactorLevelLink.SearchByAll().andFactorClass(new EqualsFilter(factorClass));
+        List<FactorLevelLink>   factorLevelLinksForClass=   (List<FactorLevelLink>) CollectionFilter.filter(getFactorsSet(), factorLevelLinkFilter);
+        
+        return ObjstoreUtils.sort(factorLevelLinksForClass, 
+                                new ObjectTransform[]{FactorLevelLink.pipesFactorLevelLink().toFactor().toObjectID()}, 
+                                new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR});
+    }
+    
+    public List<FactorScoreResult> getSortedFactorScoreResults(Factor factor)
+    {
+        Filter<FactorScoreResult> factorScoreResultFilter   =   FactorScoreResult.SearchByAll().andFactor(new EqualsFilter(factor));
+        List<FactorScoreResult>   factorScoreResultsForClass=   (List<FactorScoreResult>) CollectionFilter.filter(getResultsSet(), factorScoreResultFilter);
+        
+        return ObjstoreUtils.sort(factorScoreResultsForClass, 
+                                new ObjectTransform[]{FactorScoreResult.pipesFactorScoreResult().toFromScore()}, 
+                                new Comparator[]{CollectionUtils.DEFAULT_COMPARATOR});
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/Level.xml

@@ -4,11 +4,14 @@
 
     <BUSINESSCLASS name="Level" package="performa.orm">
                 
-        <MULTIPLEREFERENCE  name="Factors"          type="FactorLevelLink"      backreferenceName="Level"   />
-        <MULTIPLEREFERENCE  name="Results"          type="FactorScoreResult"    backreferenceName="Level"   />
-        <MULTIPLEREFERENCE  name="Narratives"       type="Narrative"            backreferenceName="Level"   />
-        <MULTIPLEREFERENCE  name="TestAnalysises"   type="TestAnalysis"         backreferenceName="Level"   />
-        <MULTIPLEREFERENCE  name="LevelFactorTypes" type="LevelFactorType"      backreferenceName="Level"   />
+        <MULTIPLEREFERENCE  name="Factors"              type="FactorLevelLink"      backreferenceName="Level"   />
+        <MULTIPLEREFERENCE  name="Results"              type="FactorScoreResult"    backreferenceName="Level"   />
+        <MULTIPLEREFERENCE  name="Narratives"           type="Narrative"            backreferenceName="Level"   />
+        <MULTIPLEREFERENCE  name="TestAnalysises"       type="TestAnalysis"         backreferenceName="Level"   />
+        <MULTIPLEREFERENCE  name="LevelFactorTypes"     type="LevelFactorType"      backreferenceName="Level"   />
+        <MULTIPLEREFERENCE  name="LevelClassCriterias"  type="LevelClassCriteria"   backreferenceName="Level"   />
+        <MULTIPLEREFERENCE  name="LevelNormalisations"  type="LevelNormalisation"   backreferenceName="Level"   />
+        <MULTIPLEREFERENCE  name="ClassNormalisations"  type="ClassNormalisation"   backreferenceName="Level"   />
 
         <TABLE  name="tl_level" tablePrefix="object"    polymorphic="FALSE">
             

cmsWebApp/src/performa/orm/LevelClassCriteria.java

+package performa.orm;
+
+
+public class LevelClassCriteria extends BaseLevelClassCriteria
+{
+    private static final long serialVersionUID = 0L;
+    
+    // This constructor should not be called
+    public LevelClassCriteria ()
+    {
+        // Do not add any code to this, always put it in initialiseNewObject
+    }
+
+    @Override
+    public String getObjectIDSpace()
+    {
+        return "LevelClassCriteria";
+    }
+}
\ No newline at end of file

cmsWebApp/src/performa/orm/LevelClassCriteria.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://www.oneit.com.au/schemas/5.2/BusinessObject.xsd'>
+
+    <BUSINESSCLASS name="LevelClassCriteria"    package="performa.orm">
+        <IMPORT value="performa.orm.types.*"/>
+                
+        <TABLE  name="tl_level_class_criteria"  tablePrefix="object"    polymorphic="FALSE">
+            
+            <ATTRIB name="Importance"   type="Importance"   dbcol="weighting"   attribHelper="EnumeratedAttributeHelper"    mandatory="true"/>
+            <ATTRIB name="FactorClass"  type="FactorClass"  dbcol="class_code"  attribHelper="EnumeratedAttributeHelper"    mandatory="true"/>
+            
+            <SINGLEREFERENCE    name="Level"    type="Level"    dbcol="level_number"    backreferenceName="LevelClassCriterias"/>
+        </TABLE>
+                
+        <SEARCH type="All"  paramFilter="tl_level_class_criteria.object_id is not null" orderBy="tl_level_class_criteria.object_id" />
+        
+    </BUSINESSCLASS>
+    
+</ROOT>
\ No newline at end of file

cmsWebApp/src/performa/orm/LevelNormalisation.java

+package performa.orm;
+
+
+public class LevelNormalisation extends BaseLevelNormalisation
+{
+    private static final long serialVersionUID = 0L;
+    
+    // This constructor should not be called
+    public LevelNormalisation ()
+    {
+        // Do not add any code to this, always put it in initialiseNewObject
+    }
+
+    @Override
+    public String getObjectIDSpace()
+    {
+        return "LevelNormalisation";
+    }
+}
\ No newline at end of file

cmsWebApp/src/performa/orm/LevelNormalisation.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://www.oneit.com.au/schemas/5.2/BusinessObject.xsd'>
+
+    <BUSINESSCLASS name="LevelNormalisation"    package="performa.orm">
+        <IMPORT value="performa.orm.types.*"/>
+                
+        <TABLE  name="tl_level_norm"    tablePrefix="object"    polymorphic="FALSE">
+            
+            <ATTRIB name="MeanScore"            type="Double"   dbcol="mean_score"/>
+            <ATTRIB name="MaxScore"             type="Double"   dbcol="max_score"/>
+            <ATTRIB name="MinScore"             type="Double"   dbcol="min_score"/>
+            <ATTRIB name="StddevScore"          type="Double"   dbcol="stddev_score"/>
+            <ATTRIB name="LeftMeanScore"        type="Double"   dbcol="left_mean_score"/>
+            <ATTRIB name="RightMeanScore"       type="Double"   dbcol="right_mean_score"/>
+            <ATTRIB name="WghtMeanScore"        type="Double"   dbcol="wght_mean_score"/>
+            <ATTRIB name="WghtStddevScore"      type="Double"   dbcol="wght_stddev_score"/>
+            <ATTRIB name="WghtLeftMeanScore"    type="Double"   dbcol="wght_left_mean_score"/>
+            <ATTRIB name="WghtRightMeanScore"   type="Double"   dbcol="wght_right_mean_score"/>
+            <ATTRIB name="MeanWghtZScore"       type="Double"   dbcol="mean_wght_z_score"/>
+            <ATTRIB name="MeanWghtZScores"      type="Double"   dbcol="mean_wght_z_score_2"/>
+            <ATTRIB name="StdDevWghtZScore"     type="Double"   dbcol="stddev_wght_z_score"/>
+            <ATTRIB name="StdDevWghtZScore2"    type="Double"   dbcol="stddev_wght_z_score_2"/>
+            
+            <SINGLEREFERENCE    name="Level"    type="Level"    dbcol="level_number"    backreferenceName="LevelNormalisations"/>
+        </TABLE>
+                
+        <SEARCH type="All"  paramFilter="tl_level_norm.object_id is not null" orderBy="tl_level_norm.object_id" />
+        
+    </BUSINESSCLASS>
+    
+</ROOT>
\ No newline at end of file

cmsWebApp/src/performa/orm/TestAnalysis.java

 package performa.orm;
 
+import oneit.objstore.rdbms.filters.EqualsFilter;
+import oneit.utils.filter.Filter;
+import oneit.utils.math.Statistics;
+
 
 public class TestAnalysis extends BaseTestAnalysis
 {
@@ -16,4 +20,30 @@ public class TestAnalysis extends BaseTestAnalysis
     {
         return "TestAnalysis";
     }
+    
+    //Related to CANDIDATE_LEVEL_SCORE - LEVEL_SCORE
+    public double getLevelScore()
+    {
+        return Statistics.sum(pipelineTestAnalysis().toCandidateClassScores().toClassScore().vals());
+    }
+    
+    //Related to CANDIDATE_LEVEL_SCORE - WEIGHTED_LEVEL_SCORE
+    public double getWghtdLevelScore()
+    {
+        return Statistics.sum(pipelineTestAnalysis().toCandidateClassScores().toWghtdClassScore().vals());
+    }
+    
+    //Related to CANDIDATE_LEVEL_SCORE - MAX_WGHT_LEVEL_SCORE
+    public double getMaxWghtdLevelScore()
+    {
+        return Statistics.sum(pipelineTestAnalysis().toCandidateClassScores().toMaxWghtdClassScore().vals());
+    }
+    
+    public FactorScore getFactorScoreFor(Factor factor)
+    {
+        Filter<FactorScore> factorScoreFilter   =   FactorScore.SearchByAll().andFactor(new EqualsFilter(factor));
+                    
+        return pipelineTestAnalysis().toFactorScores(factorScoreFilter).val();
+    }
+
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/TestAnalysis.xml

@@ -4,13 +4,13 @@
 
     <BUSINESSCLASS name="TestAnalysis"  package="performa.orm">
                 
-        <MULTIPLEREFERENCE  name="FactorScores" type="FactorScore"  backreferenceName="TestAnalysis" />
+        <MULTIPLEREFERENCE  name="FactorScores"         type="FactorScore"          backreferenceName="TestAnalysis" />
+        <MULTIPLEREFERENCE  name="CandidateClassScores" type="CandidateClassScore"  backreferenceName="TestAnalysis" />
 
         <TABLE  name="tl_test_analysis" tablePrefix="object"    polymorphic="FALSE">
-            
-            <SINGLEREFERENCE    name="Job"          type="Job"          dbcol="job_id"/>
-            <SINGLEREFERENCE    name="Level"        type="Level"        dbcol="level_id"        backreferenceName="TestAnalysises"/>
-            <SINGLEREFERENCE    name="Candidate"    type="Candidate"    dbcol="candidate_id"    backreferenceName="TestAnalysises"/>
+        
+            <SINGLEREFERENCE    name="Level"            type="Level"            dbcol="level_id"        backreferenceName="TestAnalysises"/>
+            <SINGLEREFERENCE    name="Candidate"        type="Candidate"        dbcol="candidate_id"    backreferenceName="TestAnalysises"/>
 
         </TABLE>
                 

cmsWebApp/src/performa/orm/TestAnalysisPersistenceMgr.java

@@ -38,7 +38,7 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
         
     }
 
-    private String  SELECT_COLUMNS = "{PREFIX}tl_test_analysis.object_id as id, {PREFIX}tl_test_analysis.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_test_analysis.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_test_analysis.job_id, {PREFIX}tl_test_analysis.level_id, {PREFIX}tl_test_analysis.candidate_id,  1 AS commasafe ";
+    private String  SELECT_COLUMNS = "{PREFIX}tl_test_analysis.object_id as id, {PREFIX}tl_test_analysis.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}tl_test_analysis.object_CREATED_DATE as CREATED_DATE, {PREFIX}tl_test_analysis.level_id, {PREFIX}tl_test_analysis.candidate_id,  1 AS commasafe ";
     private String SELECT_JOINS = "";
 
     public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
@@ -89,7 +89,6 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
 
              // Check for persistent sets already prefetched
             if (false  || !tl_test_analysisPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
-                    !tl_test_analysisPSet.containsAttrib(TestAnalysis.SINGLEREFERENCE_Job)||
                     !tl_test_analysisPSet.containsAttrib(TestAnalysis.SINGLEREFERENCE_Level)||
                     !tl_test_analysisPSet.containsAttrib(TestAnalysis.SINGLEREFERENCE_Candidate))
             {
@@ -181,10 +180,10 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
             {
                 int rowsUpdated = executeStatement (sqlMgr, 
                                                            "UPDATE {PREFIX}tl_test_analysis " +
-                                                           "SET job_id = ? , level_id = ? , candidate_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
+                                                           "SET level_id = ? , candidate_id = ?  , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
                                                                 
                                                            "WHERE tl_test_analysis.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
-                                                           CollectionUtils.listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Candidate)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
+                                                           CollectionUtils.listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Candidate)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
 
                 if (rowsUpdated != 1)
                 {
@@ -441,7 +440,6 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
             tl_test_analysisPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
 
         
-        tl_test_analysisPSet.setAttrib(TestAnalysis.SINGLEREFERENCE_Job, r.getObject ("job_id"));
         tl_test_analysisPSet.setAttrib(TestAnalysis.SINGLEREFERENCE_Level, r.getObject ("level_id"));
         tl_test_analysisPSet.setAttrib(TestAnalysis.SINGLEREFERENCE_Candidate, r.getObject ("candidate_id"));
         
@@ -460,10 +458,10 @@ public class TestAnalysisPersistenceMgr extends ObjectPersistenceMgr
         {
             executeStatement (sqlMgr, 
                                      "INSERT INTO {PREFIX}tl_test_analysis " +
-                                     "  ( job_id, level_id, candidate_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
+                                     "  ( level_id, candidate_id,  object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
                                      "VALUES " +
-                                     "  ( ?, ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
-                                     CollectionUtils .listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Job)))).listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Candidate)))) .listEntry (objectID.longID ()).toList().toArray());
+                                     "  ( ?, ?,   ?,  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ",  " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
+                                     CollectionUtils .listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(tl_test_analysisPSet.getAttrib (TestAnalysis.SINGLEREFERENCE_Candidate)))) .listEntry (objectID.longID ()).toList().toArray());
 
             tl_test_analysisPSet.setStatus (PersistentSetStatus.PROCESSED);
         }

cmsWebApp/src/performa/orm/types/ColorCode.java

@@ -39,6 +39,8 @@ public class ColorCode extends AbstractEnumerated
 
     private transient Integer RatingScore;
 
+    private transient String CSSClass;
+
     private ColorCode (String name, String value, String description, boolean disabled)
     {
         super (name, value, description, disabled);
@@ -53,6 +55,11 @@ public class ColorCode extends AbstractEnumerated
     {
     return RatingScore;
     }
+
+    public String getCSSClass()
+    {
+    return CSSClass;
+    }
     
     public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allColorCodes);
 
@@ -123,10 +130,13 @@ public class ColorCode extends AbstractEnumerated
     {
         RED.ColorRank = 3;
         RED.RatingScore = 0;
+        RED.CSSClass = "red-b";
         AMBER.ColorRank = 2;
         AMBER.RatingScore = 5;
+        AMBER.CSSClass = "yellow-b";
         GREEN.ColorRank = 1;
         GREEN.RatingScore = 10;
+        GREEN.CSSClass = "green-b";
         
     }
 
@@ -156,6 +166,7 @@ public class ColorCode extends AbstractEnumerated
 
         attribs.put ("ColorRank", ArrayFormatter.toObject(getColorRank()));
         attribs.put ("RatingScore", ArrayFormatter.toObject(getRatingScore()));
+        attribs.put ("CSSClass", ArrayFormatter.toObject(getCSSClass()));
         
         return attribs;
     }

cmsWebApp/src/performa/orm/types/ColorCode.xml

@@ -5,10 +5,11 @@
         
         <DATA name="ColorRank"      type="Integer"/>
         <DATA name="RatingScore"    type="Integer"/>
+        <DATA name="CSSClass"       type="String"/>
         
-        <VALUE name="RED"   value="RED"     description="Red"   ColorRank="3"   RatingScore="0"/>
-        <VALUE name="AMBER" value="AMBER"   description="Amber" ColorRank="2"   RatingScore="5"/>
-        <VALUE name="GREEN" value="GREEN"   description="Green" ColorRank="1"   RatingScore="10"/>
+        <VALUE name="RED"   value="RED"     description="Red"   ColorRank="3"   RatingScore="0"     CSSClass='"red-b"'/>
+        <VALUE name="AMBER" value="AMBER"   description="Amber" ColorRank="2"   RatingScore="5"     CSSClass='"yellow-b"'/>
+        <VALUE name="GREEN" value="GREEN"   description="Green" ColorRank="1"   RatingScore="10"    CSSClass='"green-b"'/>
         
     </CONSTANT>
 </ROOT>
\ No newline at end of file

cmsWebApp/src/performa/orm/types/FactorClass.java

+
+    
+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 FactorClass extends AbstractEnumerated
+{
+    
+    public static final EnumeratedFactory FACTORY_FactorClass = new FactorClassFactory();
+    
+    public static final FactorClass CARDRV = new FactorClass ("CARDRV", "CARDRV", "Career Drives", false);
+    
+    public static final FactorClass CONFL = new FactorClass ("CONFL", "CONFL", "Conflict Management Style", false);
+    
+    public static final FactorClass COPING = new FactorClass ("COPING", "COPING", "Coping", false);
+    
+    public static final FactorClass INTPER = new FactorClass ("INTPER", "INTPER", "Interpersonal", false);
+    
+    public static final FactorClass LEADINFL = new FactorClass ("LEADINFL", "LEADINFL", "Leadership and Influence", false);
+    
+    public static final FactorClass NEGOT = new FactorClass ("NEGOT", "NEGOT", "Negotiation Style", false);
+    
+    public static final FactorClass OPER = new FactorClass ("OPER", "OPER", "Operating", false);
+    
+    public static final FactorClass PEOPLE = new FactorClass ("PEOPLE", "PEOPLE", "People Orientation", false);
+    
+    public static final FactorClass POWERINFL = new FactorClass ("POWERINFL", "POWERINFL", "Power and Influence", false);
+    
+    public static final FactorClass PROBLEM = new FactorClass ("PROBLEM", "PROBLEM", "Problem Solving", false);
+    
+    public static final FactorClass STRATEGIC = new FactorClass ("STRATEGIC", "STRATEGIC", "Strategic Orientation", false);
+    
+    public static final FactorClass VALUES = new FactorClass ("VALUES", "VALUES", "Values", false);
+    
+    public static final FactorClass WORKSTYLE = new FactorClass ("WORKSTYLE", "WORKSTYLE", "Workplace Management", false);
+    
+    public static final FactorClass CONSISTENCY = new FactorClass ("CONSISTENCY", "CONSISTENCY", "Consistency", false);
+    
+    public static final FactorClass HIGHQUAL = new FactorClass ("HIGHQUAL", "HIGHQUAL", "Highest Quality", false);
+    
+    public static final FactorClass ACTINTER = new FactorClass ("ACTINTER", "ACTINTER", "Act Interdependently", false);
+    
+    public static final FactorClass INNOVSPIR = new FactorClass ("INNOVSPIR", "INNOVSPIR", "iNnovative Spirit", false);
+    
+    public static final FactorClass EMPATHRESP = new FactorClass ("EMPATHRESP", "EMPATHRESP", "Empathy & Respect", false);
+    
+    public static final FactorClass LEADER = new FactorClass ("LEADER", "LEADER", "Leadership", false);
+    
+    public static final FactorClass OTHERS = new FactorClass ("OTHERS", "OTHERS", "Other Factors", false);
+    
+    public static final FactorClass ANSSCALE = new FactorClass ("ANSSCALE", "ANSSCALE", "Unusual Answers Score", false);
+    
+    public static final FactorClass LEVINNOV = new FactorClass ("LEVINNOV", "LEVINNOV", "Leverage Innovation", false);
+    
+    public static final FactorClass LEADCOUR = new FactorClass ("LEADCOUR", "LEADCOUR", "Lead Courageously", false);
+    
+    public static final FactorClass SOUNDDEC = new FactorClass ("SOUNDDEC", "SOUNDDEC", "Make Sound Decisions", false);
+    
+    public static final FactorClass DRVINNIT = new FactorClass ("DRVINNIT", "DRVINNIT", "Show Drive And Initiative", false);
+    
+    public static final FactorClass FOSTCOMM = new FactorClass ("FOSTCOMM", "FOSTCOMM", "Foster Open Communication", false);
+    
+    public static final FactorClass PROMCOLL = new FactorClass ("PROMCOLL", "PROMCOLL", "Promote Collaboration and Team", false);
+    
+    public static final FactorClass SHOWADAP = new FactorClass ("SHOWADAP", "SHOWADAP", "Show Adaptability", false);
+    
+    public static final FactorClass ENGINSP = new FactorClass ("ENGINSP", "ENGINSP", "Engage And Inspire", false);
+
+    private static final FactorClass[] allFactorClasss =
+        new FactorClass[] { CARDRV,CONFL,COPING,INTPER,LEADINFL,NEGOT,OPER,PEOPLE,POWERINFL,PROBLEM,STRATEGIC,VALUES,WORKSTYLE,CONSISTENCY,HIGHQUAL,ACTINTER,INNOVSPIR,EMPATHRESP,LEADER,OTHERS,ANSSCALE,LEVINNOV,LEADCOUR,SOUNDDEC,DRVINNIT,FOSTCOMM,PROMCOLL,SHOWADAP,ENGINSP};
+
+
+    private static FactorClass[] getAllFactorClasss ()
+    {
+        return allFactorClasss;
+    }
+
+    private transient Integer SortOrder;
+
+    private FactorClass (String name, String value, String description, boolean disabled)
+    {
+        super (name, value, description, disabled);
+    }
+
+    public Integer getSortOrder()
+    {
+    return SortOrder;
+    }
+    
+    public static final Comparator COMPARE_BY_POSITION = new CompareEnumByPosition (allFactorClasss);
+
+
+
+    static
+    {
+        defineAdditionalData ();
+    }
+
+    public boolean isEqual (FactorClass other)
+    {
+    return this.name.equals (other.name);
+    }
+
+    public Enumeration getAllInstances ()
+    {
+        return FactorClass.getAll ();
+    }
+
+
+    private Object readResolve() throws java.io.ObjectStreamException
+    {
+        return FactorClass.forName (this.name);
+    }
+
+
+    public EnumeratedFactory getFactory ()
+    {
+        return FACTORY_FactorClass;
+    }
+
+    public static FactorClass forName (String name)
+    {
+        if (name == null) { return null; }
+
+        FactorClass[] all = getAllFactorClasss();
+        int enumIndex = AbstractEnumerated.getIndexForName (all, name);
+
+        return all[enumIndex];
+    }
+
+
+    public static FactorClass forValue (String value)
+    {
+        if (value == null) { return null; }
+
+        FactorClass[] all = getAllFactorClasss();
+        int enumIndex = AbstractEnumerated.getIndexForValue (getAllFactorClasss (), value);
+
+        return all[enumIndex];
+    }
+
+
+    public static java.util.Enumeration getAll ()
+    {
+        return AbstractEnumerated.getAll (getAllFactorClasss());
+    }
+    
+    
+    public static FactorClass[] getFactorClassArray ()
+    {
+        return (FactorClass[])getAllFactorClasss().clone ();
+    }
+
+
+    public static void defineAdditionalData ()
+    {
+        CARDRV.SortOrder = 2;
+        CONFL.SortOrder = 3;
+        COPING.SortOrder = 5;
+        INTPER.SortOrder = 9;
+        LEADINFL.SortOrder = 11;
+        NEGOT.SortOrder = 12;
+        OPER.SortOrder = 13;
+        PEOPLE.SortOrder = 15;
+        POWERINFL.SortOrder = 16;
+        PROBLEM.SortOrder = 17;
+        STRATEGIC.SortOrder = 18;
+        VALUES.SortOrder = 19;
+        WORKSTYLE.SortOrder = 20;
+        CONSISTENCY.SortOrder = 100;
+        HIGHQUAL.SortOrder = 110;
+        ACTINTER.SortOrder = 120;
+        INNOVSPIR.SortOrder = 130;
+        EMPATHRESP.SortOrder = 140;
+        LEADER.SortOrder = 150;
+        OTHERS.SortOrder = 160;
+        ANSSCALE.SortOrder = 170;
+        LEVINNOV.SortOrder = 200;
+        LEADCOUR.SortOrder = 210;
+        SOUNDDEC.SortOrder = 220;
+        DRVINNIT.SortOrder = 230;
+        FOSTCOMM.SortOrder = 240;
+        PROMCOLL.SortOrder = 250;
+        SHOWADAP.SortOrder = 260;
+        ENGINSP.SortOrder = 270;
+        
+    }
+
+
+    static class FactorClassFactory implements EnumeratedFactory
+    {
+        public AbstractEnumerated getForName (String name)
+        {
+            return FactorClass.forName (name);
+        }
+
+        public AbstractEnumerated getForValue (String name)
+        {
+            return FactorClass.forValue (name);
+        }
+
+        public Enumeration getAll ()
+        {
+            return FactorClass.getAll ();
+        }
+    }
+
+
+    public Map getAdditionalAttributes ()
+    {
+        Map attribs = new HashMap ();
+
+        attribs.put ("SortOrder", ArrayFormatter.toObject(getSortOrder()));
+        
+        return attribs;
+    }
+}
+

cmsWebApp/src/performa/orm/types/FactorClass.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<ROOT>
+    <CONSTANT   package="performa.orm.types"    name="FactorClass">
+                
+        <DATA   name="SortOrder"    type="Integer"/>
+        
+        <VALUE  name="CARDRV"       description="Career Drives"                     SortOrder="2"/>
+        <VALUE  name="CONFL"        description="Conflict Management Style"         SortOrder="3"/>
+        <VALUE  name="COPING"       description="Coping"                            SortOrder="5"/>
+        <VALUE  name="INTPER"       description="Interpersonal"                     SortOrder="9"/>
+        <VALUE  name="LEADINFL"     description="Leadership and Influence"          SortOrder="11"/>
+        <VALUE  name="NEGOT"        description="Negotiation Style"                 SortOrder="12"/>
+        <VALUE  name="OPER"         description="Operating"                         SortOrder="13"/>
+        <VALUE  name="PEOPLE"       description="People Orientation"                SortOrder="15"/>
+        <VALUE  name="POWERINFL"    description="Power and Influence"               SortOrder="16"/>
+        <VALUE  name="PROBLEM"      description="Problem Solving"                   SortOrder="17"/>
+        <VALUE  name="STRATEGIC"    description="Strategic Orientation"             SortOrder="18"/>
+        <VALUE  name="VALUES"       description="Values"                            SortOrder="19"/>
+        <VALUE  name="WORKSTYLE"    description="Workplace Management"              SortOrder="20"/>
+        <VALUE  name="CONSISTENCY"  description="Consistency"                       SortOrder="100"/>
+        <VALUE  name="HIGHQUAL"     description="Highest Quality"                   SortOrder="110"/>
+        <VALUE  name="ACTINTER"     description="Act Interdependently"              SortOrder="120"/>
+        <VALUE  name="INNOVSPIR"    description="iNnovative Spirit"                 SortOrder="130"/>
+        <VALUE  name="EMPATHRESP"   description="Empathy &amp; Respect"             SortOrder="140"/>
+        <VALUE  name="LEADER"       description="Leadership"                        SortOrder="150"/>
+        <VALUE  name="OTHERS"       description="Other Factors"                     SortOrder="160"/>
+        <VALUE  name="ANSSCALE"     description="Unusual Answers Score"             SortOrder="170"/>
+        <VALUE  name="LEVINNOV"     description="Leverage Innovation"               SortOrder="200"/>
+        <VALUE  name="LEADCOUR"     description="Lead Courageously"                 SortOrder="210"/>
+        <VALUE  name="SOUNDDEC"     description="Make Sound Decisions"              SortOrder="220"/>
+        <VALUE  name="DRVINNIT"     description="Show Drive And Initiative"         SortOrder="230"/>
+        <VALUE  name="FOSTCOMM"     description="Foster Open Communication"         SortOrder="240"/>
+        <VALUE  name="PROMCOLL"     description="Promote Collaboration and Team"    SortOrder="250"/>
+        <VALUE  name="SHOWADAP"     description="Show Adaptability"                 SortOrder="260"/>
+        <VALUE  name="ENGINSP"      description="Engage And Inspire"                SortOrder="270"/>
+        
+    </CONSTANT>
+</ROOT>
\ No newline at end of file

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

@@ -29,7 +29,7 @@
 
         for(JobApplication jobApplication : applications)
         {
-            String  jobMatch    =   FormatUtils.stringify(jobApplication.getJobMatchPercentage(), "PercentageWholeNumber", "0");
+            String  jobMatch    =   FormatUtils.stringify(jobApplication.getJobMatchPercentage(), "TwoDPDouble", "0");
             String  culture     =   FormatUtils.stringify(jobApplication.getCulturePercentage(), "PercentageWholeNumber", "0");
             String  criteria    =   FormatUtils.stringify(jobApplication.getCriteriaPercentage(), "PercentageWholeNumber", "0");
             String  appID       =   "app-id-" + jobApplication.getID().toString();

cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp

@@ -151,7 +151,7 @@
                                                                     requestAttribs="<%= CollectionUtils.mapEntry("nextPage", applicationPage)
                                                                                                     .mapEntry("procParams", CollectionUtils.mapEntry("JobApplication", jobApplication).toMap())
                                                                                                     .toMap() %>">
-                                                        <oneit:toString value="<%= jobApplication.getJobMatchPercentage() %>"   mode="PercentageWholeNumber" />
+                                                        <oneit:toString value="<%= jobApplication.getJobMatchPercentage() %>"   mode="TwoDPDouble" />
                                                     </oneit:button>
                                                 </span>
                                             </div>
@@ -232,7 +232,7 @@
                                     <div class="jcc-box">
                                         <div class="job-match jcc">
                                             <img src="images/app-job-match-icon.svg"> Role fit 
-                                            <span><oneit:toString value="<%= jobApplication.getJobMatchPercentage() %>" mode="PercentageWholeNumber" /></span>
+                                            <span><oneit:toString value="<%= jobApplication.getJobMatchPercentage() %>" mode="TwoDPDouble" /></span>
                                         </div>
                                         <div class="detail-box">
                                             <div class="detail-row">

cmsWebApp/webroot/extensions/performa/upgrades/20170818_ClassNormalisation.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.DefineTableOperation">
+			<tableName factory="String">tl_class_norm</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="class_code" type="String" nullable="true" length="200"/>
+			<column name="mean_score" type="Double" nullable="true"/>
+			<column name="max_score" type="Double" nullable="true"/>
+			<column name="min_score" type="Double" nullable="true"/>
+			<column name="stddev_score" type="Double" nullable="true"/>
+			<column name="left_mean_score" type="Double" nullable="true"/>
+			<column name="right_mean_score" type="Double" nullable="true"/>
+			<column name="wght_mean_score" type="Double" nullable="true"/>
+			<column name="wght_stddev_score" type="Double" nullable="true"/>
+			<column name="wght_left_mean_score" type="Double" nullable="true"/>
+			<column name="wght_right_mean_score" type="Double" nullable="true"/>
+			<column name="level_number" type="Long" length="11" nullable="true"/>
+			</NODE>
+        
+    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_class_norm" indexName="idx_tl_class_norm_level_number" isUnique="false"><column name="level_number"/></NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/webroot/extensions/performa/upgrades/20170818_LevelClassCriteria.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.DefineTableOperation">
+			<tableName factory="String">tl_level_class_criteria</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="weighting" type="String" nullable="false" length="200"/>
+			<column name="class_code" type="String" nullable="false" length="200"/>
+			<column name="level_number" type="Long" length="11" nullable="true"/>
+			</NODE>
+        
+    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_level_class_criteria" indexName="idx_tl_level_class_criteria_level_number" isUnique="false"><column name="level_number"/></NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/webroot/extensions/performa/upgrades/20170818_LevelNormalisation.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.DefineTableOperation">
+			<tableName factory="String">tl_level_norm</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="mean_score" type="Double" nullable="true"/>
+			<column name="max_score" type="Double" nullable="true"/>
+			<column name="min_score" type="Double" nullable="true"/>
+			<column name="stddev_score" type="Double" nullable="true"/>
+			<column name="left_mean_score" type="Double" nullable="true"/>
+			<column name="right_mean_score" type="Double" nullable="true"/>
+			<column name="wght_mean_score" type="Double" nullable="true"/>
+			<column name="wght_stddev_score" type="Double" nullable="true"/>
+			<column name="wght_left_mean_score" type="Double" nullable="true"/>
+			<column name="wght_right_mean_score" type="Double" nullable="true"/>
+			<column name="mean_wght_z_score" type="Double" nullable="true"/>
+			<column name="mean_wght_z_score_2" type="Double" nullable="true"/>
+			<column name="stddev_wght_z_score" type="Double" nullable="true"/>
+			<column name="stddev_wght_z_score_2" type="Double" nullable="true"/>
+			<column name="level_number" type="Long" length="11" nullable="true"/>
+			</NODE>
+        
+    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_level_norm" indexName="idx_tl_level_norm_level_number" isUnique="false"><column name="level_number"/></NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/webroot/extensions/performa/upgrades/20170819_AlterScore.sql

+
+Alter table tl_score drop column candidate_id;
+Alter table tl_test_analysis drop column job_id;

cmsWebApp/webroot/extensions/performa/upgrades/20170819_CandidateClassScore.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.DefineTableOperation">
+			<tableName factory="String">tl_candidate_class_score</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="class_score" type="Long" nullable="true"/>
+			<column name="wghtd_class_score" type="Long" nullable="true"/>
+			<column name="max_wghtd_class_score" type="Long" nullable="true"/>
+			<column name="color_code" type="String" nullable="true" length="200"/>
+			<column name="wghtd_color_code" type="String" nullable="true" length="200"/>
+			<column name="factor_class" type="String" nullable="false" length="200"/>
+			<column name="test_analysis_id" type="Long" length="11" nullable="true"/>
+			</NODE>
+        
+    <NODE name="INDEX" factory="Participant" class="oneit.sql.transfer.DefineIndexOperation" tableName="tl_candidate_class_score" indexName="idx_tl_candidate_class_score_test_analysis_id" isUnique="false"><column name="test_analysis_id"/></NODE>
+
+        </NODE></OBJECTS>
\ No newline at end of file

cmsWebApp/webroot/extensions/performa/upgrades/20170819_InsertLevelNormalisation.sql

+
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (1, 278.00, 330.00, 182.00, 28.45, 249.55, 306.45, 1945.30, 218.50, 1726.80, 2163.80, 0.00, 0.00, 0.00, 0.00, 1, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (2, 288.37, 340.00, 184.00, 28.21, 260.16, 316.58, 1971.99, 211.42, 1760.57, 2183.41, -0.04, 0.00, 8.23, 0.00, 2, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (3, 258.81, 300.00, 187.00, 20.24, 238.57, 279.05, 1675.37, 146.66, 1528.71, 1822.03, -0.09, 0.00, 8.52, 0.00, 3, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (4, 269.08, 300.00, 190.00, 19.80, 249.28, 288.88, 1705.39, 135.10, 1570.29, 1840.49, 0.02, 0.02, 7.70, 12.25, 4, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (5, 205.04, 250.00, 101.00, 24.39, 180.65, 229.43, 1497.34, 192.50, 1304.84, 1689.84, 0.00, 0.00, 0.00, 0.00, 5, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (6, 219.16, 250.00, 170.00, 18.06, 201.10, 237.22, 1577.64, 139.07, 1438.57, 1716.71, 0.00, 0.00, 0.00, 0.00, 6, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (10, 269.08, 300.00, 190.00, 19.80, 249.28, 288.88, 1705.39, 135.10, 1570.29, 1840.49, NULL, NULL, NULL, NULL, 7, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (14, 288.37, 340.00, 184.00, 28.21, 260.16, 316.58, 1971.99, 211.42, 1760.57, 2183.41, NULL, NULL, NULL, NULL, 8, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (15, 258.81, 300.00, 187.00, 20.24, 238.57, 279.05, 1675.37, 146.66, 1528.71, 1822.03, NULL, NULL, NULL, NULL, 9, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (16, 258.81, 300.00, 187.00, 20.24, 238.57, 279.05, 1675.37, 146.66, 1528.71, 1822.03, NULL, NULL, NULL, NULL, 10, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (21, 269.08, 300.00, 190.00, 19.80, 249.28, 288.88, 1705.39, 135.10, 1570.29, 1840.49, 0.02, 0.02, 7.70, 12.25, 11, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (26, 260.14, 300.00, 197.00, 22.34, 237.80, 282.48, 1649.20, 181.79, 1467.41, 1830.99, NULL, NULL, NULL, NULL, 12, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (27, 260.14, 300.00, 197.00, 22.34, NULL, NULL, 1649.20, 181.79, NULL, NULL, NULL, NULL, NULL, NULL, 13, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (28, 273.67, 295.00, 242.00, 13.52, 260.15, 287.19, 1777.45, 92.00, 1685.45, 1869.45, NULL, NULL, NULL, NULL, 14, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (29, 305.78, 335.00, 277.00, 17.91, 287.87, 323.69, 2094.21, 137.65, 1956.56, 2231.86, NULL, NULL, NULL, NULL, 15, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (30, 294.75, 320.00, 273.00, 13.51, 281.24, 308.26, 2014.58, 114.49, 1900.09, 2129.07, NULL, NULL, NULL, NULL, 16, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (31, 309.00, 335.00, 278.00, 18.41, 290.59, 327.41, 2126.42, 139.58, 1986.84, 2266.00, NULL, NULL, NULL, NULL, 17, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');
+INSERT INTO tl_level_norm (level_number, mean_score, max_score, min_score, stddev_score, left_mean_score, right_mean_score, wght_mean_score, wght_stddev_score, wght_left_mean_score, wght_right_mean_score, mean_wght_z_score, mean_wght_z_score_2, stddev_wght_z_score, stddev_wght_z_score_2, object_id, object_last_updated_date, object_created_date) VALUES (40, 223.61, 270.00, 167.00, 22.22, 201.39, 245.83, 1503.45, 188.52, 1314.93, 1691.97, NULL, NULL, NULL, NULL, 18, '2017-08-19 17:14:09.528383', '2017-08-19 17:14:09.528383');