S43015973 # Matchd / Talentology - No Plan [Enhancement] #Add additional…

S43015973 # Matchd / Talentology - No Plan [Enhancement] #Add additional filtering to applicant list

cmsWebApp/src/performa/orm/Job.java

@@ -825,7 +825,7 @@ public class Job extends BaseJob
             return pipelineJob().toHiringTeam().toDiversityQuestions(HTDiversityQuestion.SearchByAll().andIsApplicable(new EqualsFilter<>(Boolean.TRUE))).uniqueVals();
         }
         
-        return null;
+        return new HashSet();
     }
     
     public int getApplicableCultureCount()
@@ -841,4 +841,16 @@ public class Job extends BaseJob
         
         return pipelineJob().toCultureCriterias(filter).uniqueVals();
     }
+    
+    public DiversityQuestion getQuestionByFilter(AppFilter filter)
+    {
+        if(hasDiversityQuestions())
+        {
+            Filter<DiversityQuestion>   diversityFilter =   DiversityQuestion.SearchByAll().andCode(new EqualsFilter<>(filter.getName()));
+            
+            return pipelineJob().toHiringTeam().toDiversityQuestions().toQuestion(diversityFilter).val();
+        }
+        
+        return null;
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/JobApplication.java

@@ -827,16 +827,4 @@ public class JobApplication extends BaseJobApplication
     {
         return isTrue(super.getPreferRemote());
     }
-    
-    public DiversityQuestion getQuestionByFilter(AppFilter filter)
-    {
-        if(isDiversityIncluded())
-        {
-            Filter<DiversityQuestion>   diversityFilter =   DiversityQuestion.SearchByAll().andCode(new EqualsFilter<>(filter.getName()));
-            
-            return pipelineJobApplication().toJob().toHiringTeam().toDiversityQuestions().toQuestion(diversityFilter).val();
-        }
-        
-        return null;
-    }
 }
\ No newline at end of file

cmsWebApp/src/performa/search/SearchApplicant.java

@@ -97,7 +97,7 @@ public class SearchApplicant extends BaseSearchApplicant
                         {
                             if(filter == AppFilter.ATSI || filter == AppFilter.DISABLED)
                             {
-                                DiversityQuestion question = app.getQuestionByFilter(filter);
+                                DiversityQuestion question = app.getJob().getQuestionByFilter(filter);
                                 
                                 if(question != null)
                                 {
@@ -120,9 +120,12 @@ public class SearchApplicant extends BaseSearchApplicant
                                 }
                             }
                         }
-                        else if(filter.getParentNode() != null && filter.getParentNode() == AppFilter.REQ)
+                        else if(filter.getParentNode() != null && filter.getParentNode() == AppFilter.REQ && getJob().showAssessmentCriteriaSection())
                         {
-                            // handle has req and no req
+                            if((filter == AppFilter.REQ_MET && !app.hasAllEssentialRequirements()) || (filter == AppFilter.REQ_NOT_MET && !app.hasFailedEssentialRequirements()))
+                            {
+                                return true;
+                            }
                         }
                     }
                     
@@ -131,7 +134,7 @@ public class SearchApplicant extends BaseSearchApplicant
                         AppFilter       parentNode  =   entry.getKey();
                         List<AppFilter> childList   =   entry.getValue();
                         
-                        DiversityQuestion question = app.getQuestionByFilter(parentNode);
+                        DiversityQuestion question = app.getJob().getQuestionByFilter(parentNode);
                         
                         if(question != null)
                         {

cmsWebApp/src/performa/utils/Utils.java

@@ -733,9 +733,21 @@ public class Utils
         
         if(searchApplicant.getFilter() != null)
         {
-            searchApplicant.getFilter().forEach((filter) -> {
-                sb.append("'").append(filter.getName()).append("' ,");
-            });
+            for(AppFilter filter : searchApplicant.getFilter())
+            {
+                if((filter == AppFilter.REQ || (filter.getParentNode() != null && filter.getParentNode() == AppFilter.REQ)) && searchApplicant.getJob().showAssessmentCriteriaSection())
+                {
+                    sb.append("'").append(filter.getName()).append("' ,");
+                    continue;
+                }
+                
+                DiversityQuestion question = searchApplicant.getJob().getQuestionByFilter(filter.getIsRoot() ? filter : filter.getParentNode());
+                
+                if(question != null)
+                {
+                    sb.append("'").append(filter.getName()).append("' ,");
+                }
+            }
         }
         sb.append("],");
         
@@ -743,7 +755,9 @@ public class Utils
         
         for(AppFilter appFilter : AppFilter.getAppFilterArray())
         {
-            if(!appFilter.getIsRoot())
+            DiversityQuestion question = searchApplicant.getJob().getQuestionByFilter(appFilter);
+            
+            if((!appFilter.getIsRoot() || question == null) && (appFilter != AppFilter.REQ || (appFilter == AppFilter.REQ && !searchApplicant.getJob().showAssessmentCriteriaSection())))
             {
                 continue;
             }

cmsWebApp/webroot/css/common.css

@@ -2993,7 +2993,7 @@ a.forgot-pass {
      height: 45px;
 }
 .appli-list-shorting .shorting-dropdown.showing{
-    width: 350px;
+    width: 400px;
 }
 .vue-treeselect__control{
     height: 45px !important;

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

@@ -119,10 +119,10 @@
                     <span class="search-icon-btn"></span>
                 </div>
                 <oneit:button value="Search" name="search" cssClass="btn btn-primary search-real-btn"   style="display:none;"/>
-                <%
+            <%
                     if(showOrderBy)
                     {
-                %>
+            %>
                         <div class="shorting-dropdown">
                             <span class="appli-order-label">order by</span>
                             <select class="form-control"    onChange="location=this.value">
@@ -139,20 +139,23 @@
                             %>
                             </select>
                         </div>
-                <%
+            <%
                     }
-                %>
-                <div class="shorting-dropdown showing">
-                    <span class="appli-order-label">Showing</span>
-                    <div id="app" style="float:left; width:80%;">
-                        <treeselect name="<%= keyName %>"   v-model="value" :multiple="true" :options="options" />
-                    </div>
-                    <div style="float:right; width:20%;">
-                        <span class="filter-icon-btn" ></span>
-                    </div>
                     
-                </div>
+                    if(job.hasDiversityQuestions() || job.showAssessmentCriteriaSection())
+                    {
+            %>
+                        <div class="shorting-dropdown showing">
+                            <span class="appli-order-label">Showing</span>
+                            <div id="app" style="float:left; width:80%;">
+                                <treeselect name="<%= keyName %>"   v-model="value" :multiple="true" :options="options" />
+                            </div>
+                            <div style="float:right; width:20%;">
+                                <span class="filter-icon-btn" ></span>
+                            </div>
+                        </div>
             <%
+                    }
                 }
             %>
         </div>

cmsWebApp/webroot/extensions/adminportal/view_applicants.jsp

@@ -45,10 +45,10 @@
         applications    =   (JobApplication[]) searchApplicant.doSearch();
     }
 
-    if (getData (request, GenericObjSearchDF.GENERIC_SEARCH_RESULTS) != null)
-    {
-        applications = (JobApplication[])getData (request, GenericObjSearchDF.GENERIC_SEARCH_RESULTS);
-    }
+//    if (getData (request, GenericObjSearchDF.GENERIC_SEARCH_RESULTS) != null)
+//    {
+//        applications = (JobApplication[])getData (request, GenericObjSearchDF.GENERIC_SEARCH_RESULTS);
+//    }
 
     process.setAttribute("JobApplications", applications);