modification to HT004 and C001

cmsWebApp/sql/JobApplication.xml

@@ -9,7 +9,7 @@
 			<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="cv" type="BLOB" nullable="true"/>
-			<column name="application_status" type="String" nullable="true" length="200"/>
+			<column name="application_status" type="String" nullable="false" length="200"/>
 			<column name="submitted_date" type="Date" nullable="true"/>
 			<column name="candidate_id" type="Long" length="11" nullable="false"/>
 			<column name="job_id" type="Long" length="11" nullable="false"/>

cmsWebApp/sql/ms/JobApplication.sql

@@ -9,7 +9,7 @@ CREATE TABLE tl_job_application (
     object_created_date datetime DEFAULT getdate() NOT NULL
     ,
     cv image NULL,
-    application_status varchar(200) NULL,
+    application_status varchar(200) NOT NULL,
     submitted_date datetime NULL,
     candidate_id numeric(12)  NOT NULL,
     job_id numeric(12)  NOT NULL

cmsWebApp/sql/oracle/JobApplication.sql

@@ -10,7 +10,7 @@ CREATE TABLE tl_job_application (
     object_created_date date DEFAULT SYSDATE NOT NULL
     ,
     cv blob NULL,
-    application_status varchar2(200) NULL,
+    application_status varchar2(200) NOT NULL,
     submitted_date date NULL,
     candidate_id number(12)  NOT NULL,
     job_id number(12)  NOT NULL

cmsWebApp/sql/postgres/JobApplication.sql

@@ -10,7 +10,7 @@ CREATE TABLE tl_job_application (
     object_created_date timestamp DEFAULT NOW() NOT NULL
     ,
     cv bytea NULL,
-    application_status varchar(200) NULL,
+    application_status varchar(200) NOT NULL,
     submitted_date timestamp NULL,
     candidate_id numeric(12)  NOT NULL,
     job_id numeric(12)  NOT NULL

cmsWebApp/src/performa/orm/BaseJobApplication.java

@@ -278,6 +278,7 @@ public abstract class BaseJobApplication extends BaseBusinessClass
         metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
         metaInfo.put ("dbcol", "application_status");
         metaInfo.put ("defaultValue", "ApplicationStatus.DRAFT");
+        metaInfo.put ("mandatory", "true");
         metaInfo.put ("name", "ApplicationStatus");
         metaInfo.put ("type", "ApplicationStatus");
         
@@ -530,6 +531,7 @@ public abstract class BaseJobApplication extends BaseBusinessClass
                 oldAndNewIdentical = HELPER_ApplicationStatus.compare (_ApplicationStatus, newApplicationStatus);
             }
 
+            BusinessObjectParser.assertFieldCondition (newApplicationStatus != null, this, FIELD_ApplicationStatus, "mandatory");
             
 
             if (FIELD_ApplicationStatus_Validators.length > 0)
@@ -2465,7 +2467,7 @@ public abstract class BaseJobApplication extends BaseBusinessClass
 
         
         result.add(HELPER_CV.getAttribObject (getClass (), _CV, false, FIELD_CV));
-        result.add(HELPER_ApplicationStatus.getAttribObject (getClass (), _ApplicationStatus, false, FIELD_ApplicationStatus));
+        result.add(HELPER_ApplicationStatus.getAttribObject (getClass (), _ApplicationStatus, true, FIELD_ApplicationStatus));
         result.add(HELPER_SubmittedDate.getAttribObject (getClass (), _SubmittedDate, false, FIELD_SubmittedDate));
         result.add(HELPER_AppProcessOption.getAttribObject (getClass (), _AppProcessOption, false, FIELD_AppProcessOption));
         result.add(HELPER_OverallSuitability.getAttribObject (getClass (), _OverallSuitability, false, FIELD_OverallSuitability));

cmsWebApp/src/performa/orm/JobApplication.xml

@@ -15,7 +15,7 @@
         <TABLE  name="tl_job_application"   tablePrefix="object"    polymorphic="FALSE">
             
             <ATTRIB name="CV"                   type="BinaryContent"        dbcol="cv"                  binaryHandler="loggedin"    attribHelper="BLOBAttributeHelper"  attribHelperInstance="BLOBAttributeHelper.INSTANCE" mandatory="false"/>
-            <ATTRIB name="ApplicationStatus"    type="ApplicationStatus"    dbcol="application_status"  attribHelper="EnumeratedAttributeHelper"    defaultValue="ApplicationStatus.DRAFT"/>
+            <ATTRIB name="ApplicationStatus"    type="ApplicationStatus"    dbcol="application_status"  attribHelper="EnumeratedAttributeHelper"    defaultValue="ApplicationStatus.DRAFT"  mandatory="true"/>
             <ATTRIB name="SubmittedDate"        type="Date"                 dbcol="submitted_date"/>
              
             <SINGLEREFERENCE    name="Candidate"    type="Candidate"    dbcol="candidate_id"    backreferenceName="JobApplications" mandatory="true"/>

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

@@ -22,7 +22,7 @@ public class AssessmentType extends AbstractEnumerated
     
     public static final AssessmentType COMPREHENSIVE = new AssessmentType ("COMPREHENSIVE", "COMPREHENSIVE", "Talentology Comprehensive", false);
     
-    public static final AssessmentType EXPRESS = new AssessmentType ("EXPRESS", "EXPRESS", "Talentology Express", false);
+    public static final AssessmentType EXPRESS = new AssessmentType ("EXPRESS", "EXPRESS", "Talentology Express", true);
 
     private static final AssessmentType[] allAssessmentTypes =
         new AssessmentType[] { COMPREHENSIVE,EXPRESS};

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

@@ -12,6 +12,6 @@
                 QuestionDetails='" (250 Questions - 20 Minutes)"'/>
         <VALUE  name="EXPRESS"          description="Talentology Express"       HeaderDesc='""'
                 AdditionalDesc='"Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut."'
-                QuestionDetails='" (30 Questions - 5 Minutes)"'/>
+                QuestionDetails='" (30 Questions - 5 Minutes)"' disabled="true"/>
     </CONSTANT>
 </ROOT>
\ No newline at end of file

cmsWebApp/webroot/css/common.css

@@ -1529,7 +1529,7 @@ p.job-txt {
     font-family: "Usual-Bold";
 }
 
-.ref-number{
+.ref-number, .ref-number span{
     color: #4a4a4a;    
     font-size: 12px;
     font-weight: 300;
@@ -2836,13 +2836,19 @@ span.appli-progress-bar {
     text-align: left;
     font-size: 12px;   
     text-transform: uppercase;
+    float: left;
+    width: 50%;
+    padding-top: 20px;
 }
 .big-percentage{
     color: #67b413;
-    font-size: 65px;    
+    font-size: 40px; 
+    float:right;
+    width: 50%;
+    text-align: center;
 }
 .app-right-b {
-    padding: 30px 0 15px 22px;
+    padding: 10px 20px 60px;
     border-bottom: solid 1px #dddddd;
 }
 .contact-title{

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

@@ -14,15 +14,6 @@
 
 <oneit:dynIncluded>
     
-<script>
-    
-//    $(document).on('click', '.nav-list li', function() {
-//        $(".nav-list li").removeClass("active");
-//        $(this).addClass("active");
-//    });
-//    
-</script>
-    
 <div class="main-applicant-content">
     <div class="applicant-header">
         <div class="main-appli-name">
@@ -316,25 +307,34 @@
             </div>
         </div>
         <div class="applicant-right">
+            
             <div class="app-right-b">
-                <div class="overall-suit">overall suitablity</div>
-                <div class="big-percentage">85%</div>
+                <div class="overall-suit">overall rank</div>
+                <div class="big-percentage">                        
+                    <oneit:toString value="<%= jobApplication.getOverallSuitability() %>"   mode="Integer" />
+                </div>
             </div>
             <div class="applicant-contact-info">
                 <div class="contact-title">Contact</div>
                 <div class="contact-row">
                     <div class="contact-label">E</div>
-                    <div class="contact-value"><a href="#">Victor@performa.net.au</a></div>
+                    <div class="contact-value">
+                        <a href="<%= "mailto:" + candidate.getUser().getUserName() %>">
+                            <oneit:toString value="<%= candidate.getUser().getUserName() %>" mode="EscapeHTML" />
+                        </a>
+                    </div>
                 </div>
                 <div class="contact-row">
                     <div class="contact-label">P</div>
-                    <div class="contact-value">0403 228 170</div>
+                    <div class="contact-value">
+                        <oneit:toString value="<%= candidate.getPhone() %>" mode="EscapeHTML" />
                     </div>
-                <div class="contact-row">
+                </div>
+                <div class="contact-row"    style="display: none;">
                     <div class="contact-label"><img src="images/linkdin-icon.png" /></div>
                     <div class="contact-value"><a href="#">View LinkedIn profile</a></div>
                 </div>
-                <div class="contact-row">
+                <div class="contact-row"    style="display: none;">
                     <div class="contact-label"><img src="images/download-icon.png" /></div>
                     <div class="contact-value"><a href="#">Download Resume</a></div>
                 </div>

cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp

@@ -53,6 +53,11 @@
 
                     for(AssessmentType assessmentType : AssessmentType.getAssessmentTypeArray())
                     {
+                        if(assessmentType.getDisabled() == Boolean.TRUE)
+                        {
+                            continue;
+                        }
+
                         String  assessmentTypeId    =   assessmentType.getName();
                         String  selectedStr         =   CollectionUtils.equals(assessmentTypeValue, assessmentTypeId) ? "checked" : "";
                 %>

cmsWebApp/webroot/extensions/applicantportal/job_overview.jsp

@@ -30,7 +30,16 @@
         <div class="main-position-overview">
             <div class="aust-logo"><img src="images/australia-post.png"></div>
             <div class="overview-title"><oneit:toString value="<%= job.getJobTitle() %>"    mode="EscapeHTML"/></div>
-            <div class="ref-number">Ref: 002341</div>
+            <%
+                if(job.getReferenceNumber() != null)
+                {
+            %>  
+                    <div class="ref-number">
+                        Ref: <oneit:toString value="<%= job.getReferenceNumber() %>"    mode="EscapeHTML"/>
+                    </div>
+            <%
+                }
+            %>
             
             <table class="table table-responsive pos-table">
                 <tbody>