Making changes based on HT and Job creation screen comments

cmsWebApp/src/performa/orm/AssessmentCriteria.xml

@@ -10,7 +10,7 @@
         <TABLE  name="tl_assessment_criteria"   tablePrefix="object"    polymorphic="FALSE">
             
             <ATTRIB name="Name"             type="String"           dbcol="name"            length="200"    mandatory="true"/>
-            <ATTRIB name="Importance"       type="Importance"       dbcol="importance"      attribHelper="EnumeratedAttributeHelper"    mandatory="true"    defaultValue="Importance.ESSENTIAL"/>
+            <ATTRIB name="Importance"       type="Importance"       dbcol="importance"      attribHelper="EnumeratedAttributeHelper"    mandatory="true"    defaultValue="Importance.DESIRABLE"/>
             <ATTRIB name="CriteriaType"     type="CriteriaType"     dbcol="assessment_type" attribHelper="EnumeratedAttributeHelper"    mandatory="true"/>
 
             <SINGLEREFERENCE    name="Job"      type="Job"                          dbcol="job_id"      backreferenceName="AssessmentCriterias"/>

cmsWebApp/src/performa/orm/BaseAssessmentCriteria.java

@@ -189,7 +189,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
 
         metaInfo.put ("attribHelper", "EnumeratedAttributeHelper");
         metaInfo.put ("dbcol", "importance");
-        metaInfo.put ("defaultValue", "Importance.ESSENTIAL");
+        metaInfo.put ("defaultValue", "Importance.DESIRABLE");
         metaInfo.put ("mandatory", "true");
         metaInfo.put ("name", "Importance");
         metaInfo.put ("type", "Importance");
@@ -251,7 +251,7 @@ public abstract class BaseAssessmentCriteria extends BaseBusinessClass
 
         
         _Name = (String)(HELPER_Name.initialise (_Name));
-        _Importance = (Importance)(Importance.ESSENTIAL);
+        _Importance = (Importance)(Importance.DESIRABLE);
         _CriteriaType = (CriteriaType)(HELPER_CriteriaType.initialise (_CriteriaType));
     }
 

cmsWebApp/webroot/css/common.css

@@ -3346,7 +3346,7 @@ input.add-note-btn:hover{
 .appli-shorting-dropdown{
     float: right;
     width: 120px;
-    margin-left: 10px;
+    margin-left: 50px;
     position: relative;    
     z-index: 10;
 }
@@ -3401,7 +3401,7 @@ input.add-note-btn:hover{
     color: #4a4a4a;
     font-size: 20px;    
     padding: 14px 0 17px 21px;
-    width: 20.5%;
+    width: 25.5%;
 }
 .appli-jcs {
     color: #4a4a4a;
@@ -3430,7 +3430,7 @@ input.add-note-btn:hover{
     font-size: 36px;
     font-weight: 300;    
     float: left;
-    padding-right: 39px;
+    padding-right: 59px;
 }
 .appli-percent-no span{
     font-family: "Usual-Light";
@@ -3438,7 +3438,7 @@ input.add-note-btn:hover{
 .appli-status {
     border: medium none;
     padding: 15px 23px 0;
-    width: 28.3%;
+    width: 23.3%;
 }
 .appli-list-drop{
     float: left;

cmsWebApp/webroot/extensions/adminportal/GeneralConfig_adminPortal.xml

@@ -42,11 +42,10 @@
             </NODE>
         </MAP>
         
+        <!-- AAdded only for legacy data and should never be used   -->
         <MAP    value="CANDIDATES"  description="Candidates"    TemplatePage="dynamic_content_form_client.jsp">
             <NODE   name="Config"   factory="Participant"   class="oneit.business.content.ArticleConfiguration">
                 <INHERITS   nodename="StandardJSP"/>
-                
-                <RenderMode name="Page" preIncludeJSP="extensions/adminportal/list_candidates.jsp"/>
             </NODE>
         </MAP>
         

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

@@ -9,13 +9,5 @@
             %>
             </div>
         </div>
-        <footer class="container-fluid footer sidebar-menu">
-            <div class="row">
-                <div class="help-support">
-                    <a href="#">Help & Support</a>
-                </div>
-                <div class="set-background"></div>
-            </div>
-        </footer>
     </body>
 </html>

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

@@ -23,7 +23,7 @@
     <div class="main-applicants-filter main-shortlist-filter">
         <div class="appli-list-shorting main-shortlist">
             <div class="appli-shorting-dropdown appli-left">
-                <span class="appli-order-label">Bulk edit</span>
+                <span class="appli-order-label">Bulk Update</span>
                 <select class="form-control">
                     <option>Interview</option>
                 </select>

cmsWebApp/webroot/extensions/adminportal/upgrades/20170727_Update_CMSExtract_Candidates.cms.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- @AutoRun -->
+<OBJECTS xmlns:oneit="http://www.1iT.com.au" name="">
+<NODE factory="Vector" name="Script"><NODE class="oneit.appservices.upgrade.cms.CMSArticleUpdateOperation" factory="Participant" name="Candidates">
+  <createSpecificIdentifier factory='String' value='1OZC7B06GIC3F34FL0TTWJ8A9CFNCH'/>
+  <articleIdentifiers factory="Array" class="java.lang.String">
+    <NODE factory="String" value="1OZC7B06GIC3F34FL0TTWJ8A9CFNCH"/>
+  </articleIdentifiers>
+  <createdLabel factory="String" value="1OZC7B06GIC3F34FL0TTWJ8A9CFNCH"/>
+  <articleAttributeChanges factory="Map">
+    <NODE  name="Exclude From Sitemap" factory="Boolean" value="false"/>
+    <NODE  name="Exclude from SEO Indexing" factory="Boolean" value="false"/>
+    <NODE  name="On Top Menu" factory="Boolean" value="false"/>
+    <NODE  name="On Footer Left" factory="Boolean" value="false"/>
+    <NODE  name="Menu Title" factory="String" value="Candidates"/>
+    <NODE  name="On Footer Menu" factory="Boolean" value="false"/>
+    <NODE  name="Exclude From Search" factory="Boolean" value="false"/>
+    <NODE  name="Menu Icon CSS" factory="String" value="canditates-icon"/>
+    <NODE  name="On Left Menu" factory="Boolean" value="false"/>
+    <NODE  name="Shortcuts" factory="String" value="Candidates"/>
+    <NODE  name="Exclude From Navigation" factory="Boolean" value="false"/>
+    <NODE  name="On Footer Right" factory="Boolean" value="false"/>
+  </articleAttributeChanges>
+  <ormAttributeChanges factory="Map">
+    <NODE name="PublishDate" factory="Date" value="2017-07-04 00:00:00"/>
+    <NODE name="WithdrawDate" factory="Date" value="2067-07-04 10:55:00"/>
+    <NODE name="Title" factory="String" value="Candidates"/>
+    <NODE name="ShortTitle" factory="String" value="Candidates"/>
+    <NODE name="SortOrder"  factory="Integer" value="37839079"/>
+    <NODE name="Type" factory="Enumerated" class="oneit.business.content.ArticleType" value="ARTICLE"/>
+    <NODE name="Template" factory="Enumerated" class="oneit.business.content.ArticleTemplate" value="CANDIDATES"/>
+  </ormAttributeChanges>
+  <content factory="Map">    <NODE name="Body" factory="Map">
+      <NODE name="Content" factory="String"><![CDATA[
+        
+    <p></p>
+
+        ]]></NODE>
+      <NODE name="IncludeContent" factory="Boolean" value="true"/>
+    </NODE>
+    <NODE name="Synopsis" factory="Map">
+      <NODE name="Content" factory="String"><![CDATA[
+        
+    <p></p>
+
+        ]]></NODE>
+      <NODE name="IncludeContent" factory="Boolean" value="true"/>
+    </NODE>
+  </content>
+</NODE>
+
+</NODE>
+</OBJECTS>
\ No newline at end of file

cmsWebApp/webroot/extensions/adminportal/view_applicants.jsp

@@ -47,7 +47,7 @@
                                 </div>
                                 <div class="overall-suitablity">
                                     <div class="<%= "over-all " + (index == 0 ? "f-60 green" : (index < 3 ? "blue"  : "gray"))%> ">
-                                        <oneit:toString value="<%= jobApplication.getOverallSuitability() %>"   mode="PercentageWholeNumber" />
+                                        <oneit:toString value="<%= jobApplication.getOverallSuitability() %>"   mode="Integer" />
                                     </div>
                                     <div class="overall">overall suitablity</div>
                                 </div>
@@ -87,22 +87,11 @@
                 <div class="main-applicants-filter">
                     <div class="appli-list-shorting">
                         <div class="appli-shorting-dropdown appli-left">
-                            <span class="appli-order-label">Bulk edit</span>
+                            <span class="appli-order-label">Bulk Update</span>
                             <select class="form-control">
-                                <option>Interview</option>
+                                <option>To Shortlist</option>
                             </select>
-                        </div>
-                        <div class="appli-filter">
-                            <ul class="">
-                                <li class="lable-appli-shorting">showing</li>
-                                <li class="active">
-                                    <a href="#">
-                                        ALL Applicants (<oneit:toString value="<%= job.getJobApplicationsCount() %>"    mode="Integer" />)
-                                    </a>
-                                </li>
-                                <li><a href="#">Qualified</a></li>
-                            </ul>
-                        </div>          
+                        </div>         
                         <div class="appli-shorting-dropdown">
                             <span class="appli-order-label">Export</span>
                             <select class="form-control">
@@ -114,9 +103,9 @@
                         <div class="appli-shorting-dropdown">
                             <span class="appli-order-label">order by</span>
                             <select class="form-control">
-                                <option>Suitability</option>
-                                <option>Newest</option>
-                                <option>Oldest</option>              
+                                <option>Rank</option>
+                                <option>Alphabetical (A-Z)</option>
+                                <option>Alphabetical (Z-A)</option>              
                             </select>
                         </div>
                     </div>
@@ -145,7 +134,7 @@
                             </div>
                             <div class="appli-list-name appli-l eq-second-height">
                                 <oneit:toString value="<%= jobApplication.getCandidate() %>"    mode="EscapeHTML" />
-                                <div class="appli-int-status">Interview 1 - schedulded</div>
+                                <div class="appli-int-status">Shortlisted</div>
                             </div>
                             <div class="appli-jcs appli-l eq-second-height">
                                 <span class="appli-view-bar">
@@ -180,7 +169,7 @@
                             <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="PercentageWholeNumber" />
+                                    <oneit:toString value="<%= jobApplication.getOverallSuitability() %>"   mode="Integer" />
                                 </div>
                                 <div class="appli-list-drop">
                                     <select class="form-control">