S42973328 # Matchd / Talentology - No Plan [Enhancement] #Hiring Team Stats -…

S42973328 # Matchd / Talentology - No Plan [Enhancement] #Hiring Team Stats - Active / Cancelled / Closed

cmsWebApp/src/performa/form/UserLoginFP.java

@@ -35,6 +35,10 @@ public class UserLoginFP extends LoginProcessor
         {
             throw new FieldException("Your account is disabled.", SecUser.FIELD_UserName);
         }
+        else if(companyUser.getSelectedTeam() == null)
+        {
+            throw new FieldException("Your customer account is not active. Please contact Matchd <a href='https://support.matchd.com' target='_blank'>support</a> for assistance", SecUser.FIELD_UserName);
+        }
         else if(companyUser.isTrue(companyUser.getIsEmailChanged())) 
         {
             //verify email address change

cmsWebApp/src/performa/orm/CompanyUser.java

@@ -13,6 +13,8 @@ import oneit.security.SecUser;
 import oneit.security.jsp.SecUserToNameTransform;
 import oneit.utils.*;
 import oneit.utils.parsers.FieldException;
+import performa.orm.types.CompanyStatus;
+import performa.orm.types.HTStatus;
 import performa.orm.types.RoleType;
 import performa.utils.Utils;
 
@@ -197,7 +199,21 @@ public class CompanyUser extends BaseCompanyUser
     @Override
     public HiringTeam getSelectedTeam() throws StorageException 
     {
-        return super.getSelectedTeam() == null ? getDefaultHiringTeam() : super.getSelectedTeam();
+        if(super.getSelectedTeam() == null || super.getSelectedTeam().getHTStatus() != HTStatus.ACTIVE || super.getSelectedTeam().getCompany().getCompanyStatus() != CompanyStatus.ACTIVE)
+        {
+            if(getDefaultHiringTeam() != null && getDefaultHiringTeam().getHTStatus() == HTStatus.ACTIVE && getDefaultHiringTeam().getCompany().getCompanyStatus() == CompanyStatus.ACTIVE)
+            {
+                return getDefaultHiringTeam();
+            }
+            else
+            {
+                HiringTeam[]    hiringTeams =   Utils.getHiringTeamsByUser(this);
+                
+                return hiringTeams.length > 0 ? hiringTeams[0] : null;
+            }
+        }
+        
+        return super.getSelectedTeam();
     }
     
         

cmsWebApp/src/performa/utils/Utils.java

@@ -570,9 +570,20 @@ public class Utils
     
     public static HiringTeam[] getHiringTeamsByUser(CompanyUser companyUser)
     {
-        return companyUser.pipelineCompanyUser().toHiringTeams().toHiringTeam().uniqueVals().toArray(new HiringTeam[0]);
+        Set<HiringTeam> hiringTeams =   new HashSet();
+                
+        for(HiringTeam hiringTeam : companyUser.pipelineCompanyUser().toHiringTeams().toHiringTeam(HiringTeam.SearchByAll().andHTStatus(new EqualsFilter<>(HTStatus.ACTIVE))).uniqueVals())
+        {
+            if(hiringTeam.getCompany().getCompanyStatus() == CompanyStatus.ACTIVE)
+            {
+                hiringTeams.add(hiringTeam);
+            }
         }
         
+        return hiringTeams.toArray(new HiringTeam[0]);
+    }
+
+    
     public static HiringTeam[] getOtherHiringTeams(HiringTeam hiringTeam, CompanyUser comUser, CompanyUserHiringTeamLink userLink)
     {
         Filter<HiringTeam>  filter  =   HiringTeam.SearchByAll().andObjectID(new NotEqualsFilter<>(hiringTeam.getID().longID()));

cmsWebApp/webroot/extensions/performa/customers.jsp

@@ -103,7 +103,7 @@
                 <oneit:ormEnum  obj="<%= searchHT %>"   attributeName="CompanyStatus"   cssClass="form-control company-status"/>
             </div>
             <oneit:button value="Search" name="search" cssClass="btn btn-primary search-real-btn hidden"  />
-            <oneit:button value=" " name="save" cssClass="btn save"  requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage).toMap() %>"    id="save"/>
+            <oneit:button value=" " name="save" cssClass="btn save hidden"  requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage).toMap() %>"    id="save"/>
             <div class="shorting-dropdown">
                 <span class="order-label">order by</span>
                 <select class="form-control"    onChange="location=this.value">
@@ -170,11 +170,18 @@
                     <div class="application-count jl-c"  style="width:12%;">
                         <oneit:ormEnum obj="<%= hiringTeam %>"   attributeName="HTStatus"    cssClass="form-control htstatus"/>
                     </div>
+                    <%
+                        if(hiringTeam.getHTStatus() == HTStatus.ACTIVE && hiringTeam.getCompany().getCompanyStatus() == CompanyStatus.ACTIVE)
+                        {
+                    %>
                             <div class="application-count jl-c"  style="width:13%;padding: 11px 6px 17px 20px;">
                                 <oneit:button   value="Login as Admin" name="assume"  cssClass="btn btn-primary loginAsAdmin"
                                                 requestAttribs="<%= CollectionUtils.mapEntry("HiringTeam", hiringTeam)
                                                                                     .toMap()%>"/>
                             </div>
+                    <%
+                        }
+                    %>
                 </div>
         <%
             }