August 3 styling changes on HT003, HT005

This page's header - Role Type is accurate

cmsWebApp/src/performa/form/BulkUpdateFP.java

@@ -17,7 +17,6 @@ import oneit.servlets.process.SaveFP;
 import oneit.utils.BusinessException;
 import oneit.utils.filter.CollectionFilter;
 import oneit.utils.filter.Filter;
-import performa.orm.BaseJobApplication;
 import performa.orm.Job;
 import performa.orm.JobApplication;
 import performa.orm.types.AppProcessOption;

cmsWebApp/src/performa/orm/JobApplication.java

@@ -168,7 +168,7 @@ public class JobApplication extends BaseJobApplication
     @Override
     public Integer getOverallSuitability()
     {
-        return 85;
+        return 1;
     }
     
     

cmsWebApp/src/performa/utils/Utils.java

@@ -2,7 +2,6 @@ package performa.utils;
 
 import java.util.*;
 import oneit.objstore.ObjectTransaction;
-import oneit.objstore.rdbms.filters.EqualsFilter;
 import oneit.objstore.rdbms.filters.GreaterThanEqualFilter;
 import oneit.objstore.rdbms.filters.LessThanFilter;
 import oneit.security.*;
@@ -15,7 +14,6 @@ import oneit.utils.*;
 import oneit.utils.filter.CollectionFilter;
 import oneit.utils.filter.Filter;
 import performa.orm.types.AppSortOption;
-import performa.orm.types.JobStatus;
 
 /**
  *
@@ -27,10 +25,10 @@ public class Utils
     public static final String  ROLE_CLIENT                     =   "TL_Client";
     public static final String  PRIV_ACCESS_ADMIN_PORTAL        =   "TL_AccessAdminPortal";
     public static final String  PRIV_ACCESS_APPLICANT_PORTAL    =   "TL_AccessApplicantPortal";
-    public static final String  LEVEL_GENERAL_PURPOSE           =   "General Workforce";
-    public static final String  LEVEL_SALES                     =   "Sales Personnel";
+    public static final String  LEVEL_GENERAL_PURPOSE           =   "General Purpose";
+    public static final String  LEVEL_SALES                     =   "Sales";
     public static final String  LEVEL_MANAGEMENT                =   "Management";
-    public static final String  LEVEL_EXECUTIVE                 =   "Executive Management";
+    public static final String  LEVEL_EXECUTIVE                 =   "Executive";
     
     public static Role  getRole(String role, ObjectTransaction transaction)
     {

cmsWebApp/webroot/css/common.css

@@ -3272,11 +3272,17 @@ input.add-note-btn:hover{
     text-align: center;
 }
 .over-all{
-    font-size: 50px;
+    font-size: 30px;
+    float: right;
+    margin-top: 10px;
     font-weight: 300;
 }
-.over-all.f-60{
-  font-size: 60px;
+.over-all span{
+    font-family: "Usual-Light";
+}
+.over-all.f-60 span{
+    font-family: "Usual-Regular";
+    font-size: 40px;
 }
 .overall{
     font-size: 10px;
@@ -3285,6 +3291,11 @@ input.add-note-btn:hover{
     text-transform: uppercase;
     color: #7d7f82;
     font-family: "Usual-Medium";
+    float: left;
+    margin-top: 25px;
+}
+.overall.f-60{
+    margin-top: 30px;
 }
 .jcc-box{
   float: left;
@@ -3468,14 +3479,14 @@ input.add-note-btn:hover{
 }
 .appli-checkbox {
     text-align: center;
-    width: 44px;
+    width: 3%;
     padding: 15px 5px;
 }
 .appli-list-name {
     color: #4a4a4a;
     font-size: 20px;    
     padding: 14px 0 17px 21px;
-    width: 25.5%;
+    width: 22%;
 }
 .appli-jcs {
     color: #4a4a4a;
@@ -3483,7 +3494,19 @@ input.add-note-btn:hover{
     letter-spacing: 1px;
     padding: 26px 18px 5px;
     text-transform: uppercase;
-    width: 15.4%;
+    width: 15%;
+}
+.appli-overall{
+    color: #4a4a4a;
+    font-size: 11px;
+    letter-spacing: 1px;
+    padding: 15px 18px 15px;
+    text-transform: uppercase;
+    width: 15%;
+}
+.appli-overall .rank{
+    padding-top:15px; 
+    float: left;
 }
 .appli-view-bar {
     display: inline-block;
@@ -3503,8 +3526,7 @@ input.add-note-btn:hover{
 .appli-percent-no{
     font-size: 36px;
     font-weight: 300;    
-    float: left;
-    padding-right: 59px;
+    float: right;
 }
 .appli-percent-no span{
     font-family: "Usual-Light";
@@ -3512,11 +3534,11 @@ input.add-note-btn:hover{
 .appli-status {
     border: medium none;
     padding: 15px 23px 0;
-    width: 23.3%;
+    width: 15%;
 }
 .appli-list-drop{
     float: left;
-    width: 200px;
+    width: 100%;
 }
 .person-status {
     float: left;

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

@@ -46,6 +46,15 @@
                         <oneit:toString value="<%= jobApplication.getApplicantStatusStr() %>"   mode="EscapeHTML" />
                     </div>
                 </div>
+                <div class="appli-overall appli-l eq-second-height">
+                    <div class="rank">
+                        Overall rank
+                    </div>
+                    <!--TODO: logic needed to be worked out. Added to note that there are three colors-->
+                    <div class="<%= "appli-percent-no " + (j == 0 ? "green" : (j < 3 ? "blue" : "grey" ))%>">
+                        <oneit:toString value="<%= jobApplication.getOverallSuitability() %>"   mode="Integer" />
+                    </div>
+                </div> 
                 <div class="appli-jcs appli-l eq-second-height">
                     <span class="appli-view-bar">
                         <div class="progress">
@@ -77,10 +86,6 @@
                     requirements
                 </div>
                 <div class="appli-status appli-l eq-second-height">
-                    <!--TODO: logic needed to be worked out. Added to note that there are three colors-->
-                    <div class="<%= "appli-percent-no " + (j == 0 ? "green" : (j < 3 ? "blue" : "grey" ))%>">
-                        <oneit:toString value="<%= jobApplication.getOverallSuitability() %>"   mode="Integer" />
-                    </div>
                     <div class="appli-list-drop">
                         <oneit:ormEnum  obj="<%= jobApplication %>" attributeName="AppProcessOption"    cssClass="form-control app-process"   
                                         enums="<%= jobApplication.getValidProcessOptions() %>"/>

cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp

@@ -144,10 +144,10 @@
 
                                     </div>
                                     <div class="overall-suitablity">
+                                        <div class="<%= "overall " + (index == 0 ? "f-60" : "")%>">overall rank</div>
                                         <div class="<%= "over-all " + (index == 0 ? "f-60 green" : (index < 3 ? "blue"  : "gray"))%> ">
                                             <oneit:toString value="<%= jobApplication.getOverallSuitability() %>"   mode="Integer" />
                                         </div>
-                                        <div class="overall">overall rank</div>
                                     </div>
                                     <div class="jcc-box">
                                         <div class="job-match jcc">
@@ -228,7 +228,7 @@
                                     <div class="<%= "over-all " + (i == 0 ? "f-60 green" : (i < 3 ? "blue"  : "gray"))%>">
                                         <oneit:toString value="<%= jobApplication.getOverallSuitability() %>"   mode="Integer" />
                                     </div>
-                                    <div class="overall take-font-up">overall rank</div>
+                                    <div class="<%= "overall " + (i == 0 ? "f-60" : "")%>">overall rank</div>
                                 </div>
                                 <div class="jcc-box">
                                     <div class="job-match jcc">

cmsWebApp/webroot/extensions/performa/upgrades/20170804_Alter_Level.sql

+update tl_level set level_desc= 'General Purpose' where level_desc = 'General Workforce';
+update tl_level set level_desc= 'Sales' where level_desc = 'Sales Personnel';
+update tl_level set level_desc= 'Executive' where level_desc = 'Executive Management';
\ No newline at end of file