Updated grid view in Application shortlist.

cmsWebApp/webroot/css/common.css

@@ -3350,6 +3350,10 @@ input.add-note-btn:hover{
 .expand-btn > img {
     margin-left: 15px;
 }
+
+.expand-btn a{
+    color: #ffffff;
+}
 .app-line-br{
   float: left;
   width: 100%;
@@ -3754,9 +3758,9 @@ span.right-img {
     position: relative;
     top: -4px;
 }
-.grid-box-view {
+/*.grid-box-view {
     margin-bottom: 195px;
-}
+}*/
 
 /*View Applicants HT005 - Shortlist End*/
 

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

@@ -10,6 +10,7 @@
     String          currentPage =   (String) getData(request, "currentPage");
     AppSortOption   appSortOpt  =   (AppSortOption) getData(request, "sortOption");
     String          tabNumber   =   (String)  getData(request, "tabNumber");
+    Boolean         expand      =   getData(request, "expand")!=null ? (Boolean)  getData(request, "expand") : Boolean.FALSE;
 
 %>
 
@@ -63,7 +64,8 @@
                 <%
                     for (AppSortOption  sortOption : AppSortOption.getAppSortOptionArray())
                     {
-                        String  optionLink  =   currentPage + "&JobID=" + job.getID() + "&AppSortOption=" + sortOption.getName() ;
+                        String  optionLink  =   currentPage + "&JobID=" + job.getID() + "&AppSortOption=" + sortOption.getName() 
+                                                + (expand ? "&Expand=Y" : "");
                 %>
                         <option <%= (appSortOpt != null && appSortOpt == sortOption ? "selected" : "" )%>  value="<%= optionLink %>">
                             <oneit:toString value="<%= sortOption.getDescription() %>"   mode="EscapeHTML"/>

cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp

@@ -16,6 +16,19 @@
        process.setAttribute("Job", job);
     }
     
+    Boolean isExpand    =   (Boolean) process.getAttribute("IsExpand");
+
+    if(request.getParameter("Expand") != null)
+    {
+        isExpand        =   CollectionUtils.equals((String) request.getParameter("Expand"), "Y");
+    }
+    
+    if(isExpand == null)
+    {
+        isExpand    =   Boolean.FALSE;
+    }
+    
+    System.out.println(isExpand);
 
     Debug.assertion(job != null, "Job is null in admin portal view applicants");
 
@@ -45,6 +58,7 @@
     List<JobApplication>    sortedApplications  =   applications!=null ? Utils.getApplicationsSorted(applications, appSortOpt) : new ArrayList<JobApplication>();
 
     process.setAttribute("AppSortOption", appSortOpt);
+    process.setAttribute("IsExpand", isExpand);
 %>
 
     <script type="text/javascript">
@@ -102,8 +116,13 @@
                                     sortOption="<%= appSortOpt %>"
                                     currentPage="<%= currentPage %>"
                                     tabNumber="2"
+                                    expand="<%= isExpand %>"
                                     data="<%= CollectionUtils.EMPTY_MAP%>"/>
 
+            <%
+                if(!isExpand)
+                {
+            %>
                     <div class="five-boxs">
                         <%
                             int index   = 0;
@@ -155,14 +174,25 @@
                         <div class="app-border-bottom"></div>    
                     </div>
                     <div class="main-expand-btn">
-                    <div class="expand-btn">Expand shortlist <img src="images/arrow-white-icon.svg"></div>
+                        <div class="expand-btn">
+                            <oneit:button   value=" "   name="gotoPage" skin="link"
+                                            requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage+"&Expand=Y")
+                                                                            .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).mapEntry("AppSortOption", appSortOpt).toMap())
+                                                                            .toMap() %>">
+                                Expand shortlist <img src="images/arrow-white-icon.svg">
+                            </oneit:button>
+                        </div>
                     </div>
-                    
-                <div class="five-boxs grid-box-view">
+            <%
+                }
+                else
+                {
+            %>
+                    <div class="five-boxs grid-box-view" style="">
                     <%
                         int i   = 0;
 
-                    for(JobApplication jobApplication : job.getShortlistedApplications())
+                        for(JobApplication jobApplication : sortedApplications)
                         {
                     %>
                             <div class="<%= "appl-c-box " + (i == 0 ? " cb-one" : "")%> ">
@@ -248,6 +278,19 @@
                         }
                     %>
                     </div>
+                    <div class="main-expand-btn">
+                        <div class="expand-btn">
+                            <oneit:button   value=" "   name="gotoPage" skin="link"
+                                            requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage+"&Expand=N")
+                                                                            .mapEntry("procParams", CollectionUtils.mapEntry("Job", job).mapEntry("AppSortOption", appSortOpt).toMap())
+                                                                            .toMap() %>">
+                                Collapse shortlist <img src="images/select-top-arrow.svg">
+                            </oneit:button>
+                        </div>
+                    </div>
+            <%
+                }
+            %>
             </div>
         </div>
     </oneit:form>