S12567067 # Client - Incoming Issues (raised by Client) #Applicant Grid report

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

@@ -31,18 +31,32 @@
             <div class="by-name">
                 <div class="header-right-status">
                     <span class="light-calendar">
-                        <span class="number">
-                            <span class="calcField">0</span>
-                        </span>
-                        <span class="calcField">days until closed</span>
-                
+                        <%
+                            if(job.getJobStatus() == JobStatus.OPEN)
+                            {
+                                int daysToClose =   job.getNoOfDaystoClosed();
+                        %>
+                                <span class="number">
+                                    <oneit:toString value="<%= daysToClose %>"  mode="Integer"/>
+                                </span>
+                                <oneit:toString value="<%= (daysToClose == 1 ? "day" : "days") + " until closed" %>"    mode="EscapeHTML"/>
+                        <%
+                            }
+                            else
+                            {
+                        %>
+                                <oneit:toString value="<%= job.getJobStatus().getDescription() %>"    mode="EscapeHTML"/> on
+                                <oneit:toString value="<%= job.getLastStatusChangeDate() %>"    mode="PerformaDate"/>
+                        <%
+                            }
+                        %>
                     </span>
                     <span class="job-status-appli">
-                        <span class="open-status-icon"></span>
-                        <span class="calcField">THIS JOB IS Open</span>
+                        <span class="<%= job.getJobStatus().getName().toLowerCase() + "-status-icon" %>"></span>
+                        <oneit:toString  value="<%= job.getJobStatusText() %>"    mode="EscapeHTML"/>
                     </span>
                 </div>
-                <span>
+                <span class="austr-post">
                 <%
                     if(job.isClientAvailable())
                     {
@@ -51,12 +65,10 @@
                 <%
                     }
                 %>
-                </span>SUPERLAW by <oneit:toString   value="<%= job.getCreatedBy() %>"  mode="EscapeHTML"  nullValue=""/>
+                </span> by <oneit:toString   value="<%= job.getCreatedBy() %>"  mode="EscapeHTML"  nullValue=""/>
                 &nbsp;&nbsp;.&nbsp;&nbsp;
                 <oneit:toString value="<%= job.getLevel() %>"   mode="EscapeHTML" />
             </div>
-
-
         </div>
         <div class="white-header">
             <div style="clear:both"></div>

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

@@ -131,7 +131,8 @@
         .jcc-box .red-bg span , .jcc-box .green-bg span{color : #fff;}
         .jcc-box .green-bg {background-color: #67B413;color : #fff;}
         .blue {color: #03a0e7 !important;}
-        
+        span.austr-post { text-transform: uppercase;}
+
         @page
         {
             size: A4 portrait;