update content of team members based on hiring team.

Adding common hiring team select to header

cmsWebApp/src/performa/form/SaveCompanyUserFP.java

@@ -12,6 +12,11 @@ import oneit.utils.BusinessException;
 import performa.orm.Company;
 import performa.orm.CompanyUser;
 import javax.servlet.http.HttpServletRequest;
+import oneit.objstore.ObjectTransaction;
+import oneit.objstore.rdbms.filters.EqualsFilter;
+import oneit.utils.CollectionUtils;
+import performa.orm.CompanyUserHiringTeamLink;
+import performa.orm.HiringTeam;
 
 
 public class SaveCompanyUserFP extends SaveFP 
@@ -20,14 +25,36 @@ public class SaveCompanyUserFP extends SaveFP
     public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
     {
         HttpServletRequest  request     =   submission.getRequest();
+        ObjectTransaction   objTran     =   process.getTransaction();
+        HiringTeam          hiringTeam  =   (HiringTeam) request.getAttribute("HiringTeam");
         CompanyUser         companyUser =   (CompanyUser) request.getAttribute("CompanyUser");
         Boolean             disabled    =   (Boolean) request.getAttribute("disabled");
+        Boolean             remove      =   (Boolean) request.getAttribute("remove");
 
         LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyUserFP saving company user : ", companyUser );
 
+        if(disabled != null)
+        {
             companyUser.setIsDisabled(disabled);
         
             LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyUserFP setting is disabled : ", disabled , " for company user : ",companyUser );
+        }
+        
+        if(CollectionUtils.equals(remove, Boolean.TRUE))
+        {
+            CompanyUserHiringTeamLink[] links   = CompanyUserHiringTeamLink.SearchByAll()
+                                                                        .andHiringTeam(new EqualsFilter<>(hiringTeam))
+                                                                        .andCompanyUser(new EqualsFilter<>(companyUser))
+                                                                        .search(objTran);
+                                        
+            for (CompanyUserHiringTeamLink link: links)
+            {
+                link.delete();
+                            
+                LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyUserFP removing link of company user : ", companyUser , " for hiring team : ",hiringTeam );
+
+            }
+        }
 
         return super.processForm(process, submission, params);
     }

cmsWebApp/src/performa/form/SelectHiringTeamFP.java

+package performa.form;
+
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import oneit.logging.*;
+import oneit.objstore.StorageException;
+import oneit.servlets.forms.*;
+import oneit.servlets.process.*;
+import oneit.utils.BusinessException;
+import performa.orm.*;
+
+
+public class SelectHiringTeamFP extends ORMProcessFormProcessor
+{
+    @Override
+    public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
+    {
+        HttpServletRequest  request =   submission.getRequest();
+        CompanyUser         companyUser =   (CompanyUser) request.getAttribute("CompanyUser");
+
+        LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside SelectHiringTeamFP for ", companyUser, " selected hiring team : ", companyUser.getSelectedTeam());
+        
+        request.getSession().setAttribute("SelectedHiringTeam", companyUser.getSelectedTeam());
+        
+        return RedisplayResult.getInstance();
+    }
+}
\ No newline at end of file

cmsWebApp/src/performa/form/SendUserInvitationFP.java

@@ -41,7 +41,6 @@ public class SendUserInvitationFP extends SaveFP
         {
             BusinessObjectParser.assertFieldCondition(company.getUserEmail()!=null, company, Company.FIELD_UserEmail, "mandatory", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(StringUtils.isEmailAddress(company.getUserEmail()), company, Company.FIELD_UserEmail, "invalidEmail", exceptions, true, request);
-            BusinessObjectParser.assertFieldCondition(!Utils.isCompanyUserEmailFound(process.getTransaction(), company.getUserEmail()), company, Company.FIELD_UserEmail, "emailExists", exceptions, true, request);
             BusinessObjectParser.assertFieldCondition(company.getRoleType()!=null, company, Company.FIELD_RoleType, "mandatory", exceptions, true, request);
         }
         
@@ -56,6 +55,7 @@ public class SendUserInvitationFP extends SaveFP
         ObjectTransaction   objTran     =   process.getTransaction();
         Company             company     =   (Company) process.getAttribute("Company");
         CompanyUser         resendUser  =   (CompanyUser) request.getAttribute("ResendUser");
+        HiringTeam          hiringTeam  =   (HiringTeam) request.getAttribute("HiringTeam");
         
         if(resendUser!=null)
         {
@@ -78,7 +78,11 @@ public class SendUserInvitationFP extends SaveFP
                 secUser.setUserName(company.getUserEmail().toLowerCase());
             }
             
-            CompanyUser newComUser  =   secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
+            CompanyUser comUser =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
+            
+            if(comUser == null)
+            {
+                comUser =   secUser.getExtensionOrCreate(CompanyUser.REFERENCE_CompanyUser);
                 
                 secUser.setEmail(secUser.getUserName());
                 secUser.setAttribute("md5:" + SecUser.FIELD_Password, CompanyUser.DEFAULT_PASSWORD);
@@ -86,12 +90,19 @@ public class SendUserInvitationFP extends SaveFP
                 secUser.setFirstName(company.getFirstName());
                 secUser.setLastName(company.getLastName());
             
-            newComUser.setCompany(company);
-            newComUser.setRole(company.getRoleType());
+                comUser.setDefaultHiringTeam(hiringTeam);
+                comUser.setCompany(company);
+            }
+            
+            CompanyUserHiringTeamLink link  =   CompanyUserHiringTeamLink.createCompanyUserHiringTeamLink(objTran);
+            
+            link.setCompanyUser(comUser);
+            link.setHiringTeam(hiringTeam);
+            comUser.setRole(company.getRoleType());
 
             LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser);
 
-            sendInvitationMail(newComUser, request, objTran);
+            sendInvitationMail(comUser, request, objTran);
             
             LogMgr.log(LOG, LogLevel.PROCESSING1, "End of sending invitation email.", secUser);
         }

cmsWebApp/src/performa/orm/CompanyUser.java

@@ -185,4 +185,17 @@ public class CompanyUser extends BaseCompanyUser
     {
         return CollectionUtils.equals(getCompany().getAddedByUser(), this);
     }
+    
+    
+    public HiringTeam getActiveHiringTeam()
+    {
+        return getSelectedTeam() != null ? getSelectedTeam() : getDefaultHiringTeam();
+    }
+    
+
+    @Override
+    public HiringTeam getSelectedTeam() throws StorageException 
+    {
+        return super.getSelectedTeam() == null ? getDefaultHiringTeam() : super.getSelectedTeam();
+    }
 }
\ No newline at end of file

cmsWebApp/src/performa/orm/CompanyUser.xml

@@ -13,6 +13,8 @@
         <TRANSIENT  name="Password"             type="String"/>
         <TRANSIENT  name="ConfirmPassword"      type="String"/>
         
+        <TRANSIENTSINGLE name="SelectedTeam"    type="HiringTeam"   />
+
         <TABLE  name="oneit_sec_user_extension" tablePrefix="object"    polymorphic="TRUE">
 
             <ATTRIB name="ForgotPasswordMailSendDate"   type="Date"                 dbcol="forgot_password_mail_send_date" />

cmsWebApp/webroot/css/common.css

@@ -620,6 +620,8 @@ span.select2-selection.select2-selection--single:focus{
 }
 
 .wider-select .select2-container {width: 100% !important;}
+.header-select{ margin:10px 20px;}
+.header-select .select2-container {width: 40% !important;}
 
 .select2-container option{
 	margin: 12px 15px;

cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml

@@ -59,6 +59,7 @@
         <FORM   name="*.replaceCard"                    factory="Participant"   class="performa.form.ReplaceCardFP"/>
         <FORM   name="*.addHiringTeam"                  factory="Participant"   class="performa.form.AddHiringTeamFP"/>
         <FORM   name="*.saveCompanyUser"                factory="Participant"   class="performa.form.SaveCompanyUserFP"/>
+        <FORM   name="*.selectHiringTeam"               factory="Participant"   class="performa.form.SelectHiringTeamFP"/>
     </NODE>
     
     <NODE name="job_assessment_criteria_add_jsp" factory="Participant">

cmsWebApp/webroot/extensions/adminportal/assessment_criteria.jsp

@@ -18,7 +18,7 @@
     <script type="text/javascript">
         $(document).ready(function() 
         {
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
           
             $(".switch input[type='checkbox']").change(function() {
                 $("button[name$='changeAssessmentCriteria']").click();

cmsWebApp/webroot/extensions/adminportal/edit_client.jsp

@@ -27,7 +27,7 @@
     <script>
         $(document).ready(function() 
         {
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("editClient"), {'recalcOnError':true});
 
             $("#upload").change(function(){
                 readURL(this);

cmsWebApp/webroot/extensions/adminportal/forgot_password.jsp

@@ -10,7 +10,7 @@
 
 <script type="text/javascript">
     $(document).ready(function() {
-        recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+        recalcFunction = setupRecalc ($("forgotPassword"), {'recalcOnError':true});
         
         $('input[type="text"]').keyup(function() {
             $(this).change();

cmsWebApp/webroot/extensions/adminportal/hiring_teams.jsp

@@ -48,7 +48,7 @@
         <script type="text/javascript">
             $(document).ready(function()
             {
-                recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+                recalcFunction = setupRecalc ($("listHiringTeams"), {'recalcOnError':true});
             });
         </script>    
     

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

@@ -7,7 +7,14 @@
         <%
             Company     company         =   clientUser != null && clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser) != null
                                                 ? clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser).getCompany() : null;
+            CompanyUser companyUser     =   clientUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
             User        intercomUser    =   (User)session.getAttribute("IntercomUser");
+            HiringTeam  selectedTeam    =   (HiringTeam) session.getAttribute("SelectedHiringTeam");
+
+            if(selectedTeam != null && companyUser != null)
+            {
+                companyUser.setSelectedTeam(selectedTeam.getInTransaction(objTran));
+            }
 
             if(intercomUser == null)
             {
@@ -70,15 +77,44 @@
             }
     %>
             <header>
+                <oneit:form name="headerForm" method="post"    enctype="multipart/form-data">
+                    <script type="text/javascript">
+                        $(document).ready(function() 
+                        {
+                             $('select[name$=SelectedTeam]').change(function()
+                            {
+                                $('.change-hiring-team').click();
+                            });
+                        });
+                    </script>
+
                 <div class="container-fluid">
                     <div class="row" style="background-color: #ffffff;">
                         <div class="site-logo">
                             <a href="<%= homeUrl %>"><img src="images/logo.svg"></a>
                         </div>
-                        <div class="search-bar" style="display: none;">
+                        <div class="search-bar">
+                            <%
+                                if(companyUser != null)
+                                {
+                            %>
+                                <div class="header-select">
+                                    <tagfile:ormsingleasso_select obj="<%= companyUser %>"  assocName="SelectedTeam"    options="<%= company.getHiringTeamsSet().toArray(new HiringTeam[0]) %>"
+                                                                  cssClass="selected-team"/>
+                                </div>
+                            <%
+                                }
+                            %>
+                            
+                            <oneit:button   name="selectHiringTeam"  value="Save"    cssClass="change-hiring-team hidden"
+                                                requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser)
+//                                                                                    .mapEntry("nextPage", currentPage)
+                                                                                    .toMap() %>" />
+                            <%-- 
                             <div class="inset-shadow"></div>
                             <img src="images/search-icon.svg"/>
                             <input type="text" class="form-control" placeholder="<%= company.showHasClientSupport() ? "Search for job, candidate or client" : "Search for a job or candidate"%>"/>
+                            --%>
                         </div>
                         <div class="fl-right">
                             <div class="notification-bar">
@@ -117,6 +153,7 @@
                         </div>
                     </div>
                 </div>
+                </oneit:form>
             </header>
             
             <script type="text/javascript">

cmsWebApp/webroot/extensions/adminportal/job_match_assessment.jsp

@@ -13,7 +13,7 @@
 %>
     <script>
         $(document).ready(function(){
-            setupRecalc ($("form"), {'recalcOnError':true});
+            setupRecalc ($("editJob"), {'recalcOnError':true});
         });
     </script>
     <oneit:form name="editJob" method="post" enctype="multipart/form-data">

cmsWebApp/webroot/extensions/adminportal/job_payment.jsp

@@ -36,7 +36,7 @@
     <script type="text/javascript">
         $(document).ready(function() 
         {
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
             
             addPostRecalcHandler(function   ($fieldThatChanged) {   
                 if (! $fieldThatChanged) {

cmsWebApp/webroot/extensions/adminportal/manage_plan.jsp

@@ -33,7 +33,7 @@
     <script type="text/javascript">
         $(document).ready(function()
         {
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("editCompany"), {'recalcOnError':true});
             
             $("#upload").change(function(){
                 readURL(this);

cmsWebApp/webroot/extensions/adminportal/manage_users.jsp

@@ -14,10 +14,14 @@
     SecUser             secUser         =   SecUser.getTXUser(objTran);
     Company             company         =   (Company) process.getAttribute("Company");
     CompanyUser         comUser         =   secUser.getExtension(CompanyUser.REFERENCE_CompanyUser);
+    HiringTeam          hiringTeam      =   comUser.getActiveHiringTeam();
     UserSortOption      userSortOpt     =   (UserSortOption) process.getAttribute("UserSortOption");
-    Collection          companyUsers    =   (Collection<CompanyUser>) process.getAttribute("CompanyUsers");
-    Collection          pendingUsers    =   (Collection<CompanyUser>) process.getAttribute("PendingUsers");
-    Collection          disabledUsers   =   (Collection<CompanyUser>) process.getAttribute("DisabledUsers");
+    Set<CompanyUser>    allUsers        =   CompanyUserHiringTeamLink.pipesCompanyUserHiringTeamLink(hiringTeam.getUsersSet()).toCompanyUser().uniqueVals();
+    Collection          companyUsers    =   CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.FALSE)));
+    Collection          pendingUsers    =   CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new NotEqualsFilter<>(Boolean.TRUE)));
+    Collection          disabledUsers   =   CollectionFilter.filter(allUsers, CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.TRUE)));
+
+    Debug.assertion(hiringTeam != null, "Hiring Team is null in admin portal Manage Teammates");
 
     if(company == null)
     {
@@ -25,17 +29,6 @@
         process.setAttribute("Company", company);
     }
     
-    if(companyUsers == null || pendingUsers == null || disabledUsers == null)
-    {
-        companyUsers    =   CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.FALSE)));
-        pendingUsers    =   CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new NotEqualsFilter<>(Boolean.TRUE)));
-        disabledUsers   =   CollectionFilter.filter(company.getUsersSet(), CompanyUser.SearchByAll().andIsAccountVerified(new EqualsFilter<>(Boolean.TRUE)).andIsDisabled(new EqualsFilter<>(Boolean.TRUE)));
-        
-        process.setAttribute("CompanyUsers", companyUsers);
-        process.setAttribute("PendingUsers", pendingUsers);
-        process.setAttribute("DisabledUsers", disabledUsers);
-    }
-    
     if( request.getParameter("UserSortOption") != null)
     {
         userSortOpt =   UserSortOption.forName((String) request.getParameter("UserSortOption"));
@@ -58,7 +51,7 @@
        
         $(document).ready(function() 
         {
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("listUsers"), {'recalcOnError':true});
 
             $(".user-role").change(function()
             {
@@ -133,6 +126,8 @@
                         </div>
                     </div>
                     <div class="main-manage-userlist">
+                        
+                        
                     <%
                         for(CompanyUser companyUser : sortedCompanyUsers)
                         {
@@ -140,7 +135,16 @@
                     %>
                             <div class="user-list-row"  id="<%= companyUser.getID() %>">
                                 <div class="m-user-left">
+                                    <oneit:recalcClass  htmlTag="div"   classScript="companyUser.isOwner() ? 'hide': 'show'"  companyUser="<%= companyUser %>">
+                                        <oneit:button   value=" "    name="saveCompanyUser" skin="link"
+                                                requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
+                                                                                    .mapEntry("remove", Boolean.TRUE)
+                                                                                    .mapEntry("CompanyUser", companyUser)
+                                                                                    .mapEntry("HiringTeam", hiringTeam)
+                                                                                    .toMap() %>">
                                             <div class="remove-icon">_</div>
+                                        </oneit:button>
+                                    </oneit:recalcClass>
                                     <div class="m-user-icon"><img src="images/user-list-icon.png"></div>
                                     <div class="m-user-info">
                                         <div class="m-user-name">
@@ -170,7 +174,6 @@
                                     <oneit:ormEnum  obj="<%= companyUser %>"    attributeName="Role"    cssClass="form-control user-role"   enums="<%= Arrays.asList(new RoleType[]{RoleType.ADMIN, RoleType.STANDARD}) %>"/>
                                 </div>
                                 
-                                
                                 <oneit:button   name="save"  value="Save"    cssClass="<%= "save-user" +  companyUser.getID().toString() + " hidden"%>"
                                                 requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser).mapEntry("nextPage", usersPage + "&UserSortOption=" + userSortOpt).toMap() %>" />
                             </div>
@@ -223,6 +226,7 @@
                                     <oneit:button   value="<%= resendTxt %>"    name="sendUserInvites"  skin="link"
                                                     requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
                                                                                     .mapEntry ("ResendUser", pendingUser)
+                                                                                    .mapEntry ("HiringTeam", hiringTeam)
                                                                                     .mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
                                                                                     .toMap() %>" />
                                 </div>
@@ -290,10 +294,6 @@
                         <label><oneit:label GUIName="Role" /></label>
                         <oneit:ormEnum  obj="<%= company %>"    attributeName="RoleType"    cssClass="form-control"/>
                     </div>
-                    <div class="form-group">
-                        <label><oneit:label GUIName="Add to multiple hiring teams" /></label>
-                        <oneit:ormEnum  obj="<%= company %>"    attributeName="RoleType"    cssClass="form-control"/>
-                    </div>
                     <div  class="correctEmail" >
                         <oneit:recalc mode="Boolean" script="company.isEmailCorrect()" company="<%= company %>" />
                     </div>
@@ -301,6 +301,7 @@
                         <oneit:button   value="Invite"  name="sendUserInvites"  cssClass="btn btn-invite"   
                                         requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
                                                                         .mapEntry ("restartProcess", Boolean.TRUE)
+                                                                        .mapEntry ("HiringTeam", hiringTeam)
                                                                         .mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
                                                                         .toMap() %>" />
                     </oneit:recalcClass>

cmsWebApp/webroot/extensions/adminportal/my_company.jsp

@@ -20,7 +20,7 @@
     <script type="text/javascript">
         $(document).ready(function()
         {
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("editCompany"), {'recalcOnError':true});
             
             $("#upload").change(function(){
                 readURL(this);

cmsWebApp/webroot/extensions/adminportal/my_details.jsp

@@ -104,6 +104,8 @@
                                         <div class="wider-select">
                                             <tagfile:ormsingleasso_select obj="<%= companyUser %>"  assocName="DefaultHiringTeam"   options="<%= Utils.getHiringTeamsByUser(companyUser) %>"/>
                                         </div> 
+                                                                                <tagfile:ormsingleasso_select obj="<%= companyUser %>"  assocName="DefaultHiringTeam"   options="<%= companyUser.getCompany().getHiringTeamsSet().toArray(new HiringTeam[0]) %>"/>
+
                                     </div>
                                     <div class="text-center form-group">
                                         <oneit:button   value="Save Updates"    name="saveUserDetails"  cssClass="btn btn-primary largeBtn"

cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist.jsp

@@ -47,7 +47,7 @@
     <script type="text/javascript">
         $(document).ready(function() 
         {
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
         });
     </script>
     

cmsWebApp/webroot/extensions/adminportal/view_applicants_shortlist_grid.jsp

@@ -84,7 +84,7 @@
               ]
             });
             
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
         });
     </script>
     

cmsWebApp/webroot/extensions/adminportal/view_applicants_unsuitable.jsp

@@ -52,7 +52,7 @@
     <script type="text/javascript">
         $(document).ready(function() 
         {
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
         });
     </script>
     

cmsWebApp/webroot/extensions/adminportal/view_applicantss_grid.jsp

@@ -87,7 +87,7 @@
               ]
             });
             
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("viewApplicants"), {'recalcOnError':true});
         });
     </script>
     

cmsWebApp/webroot/extensions/adminportal/workplace_culture.jsp

@@ -38,7 +38,7 @@
         
         $(document).ready(function(){
             
-            recalcFunction = setupRecalc ($("form"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("editJob"), {'recalcOnError':true});
             
             $(".importance_radio").change(function(){
                 enableElementRating(this);