fix recalc issue in edit company and billing validations

cmsWebApp/src/performa/form/SaveCompanyFP.java

@@ -31,13 +31,6 @@ public class SaveCompanyFP  extends SaveFP
 
         LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyFP saving company : ", company );
         
-//        if(CollectionUtils.equals(company.getIsLogoDeleted(), Boolean.TRUE))
-//        {
-//            company.setCompanyLogo(null);
-//            
-//            LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyFP setting comany logo to null of company : ", company );
-//        }
-        
         if(CollectionUtils.equals(hiringTeam.getIsLogoDeleted(), Boolean.TRUE))
         {
             hiringTeam.setHiringTeamLogo(null);
@@ -45,10 +38,10 @@ public class SaveCompanyFP  extends SaveFP
             LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyFP setting hiring team logo to null of hiring team : ", hiringTeam );
         }
         
-//        if(hiringTeam.getManageOwnBilling())
-//        {
-//            hiringTeam.setBillingTeam(null);
-//        }
+        if(hiringTeam.getManageOwnBilling())
+        {
+            hiringTeam.setBillingTeam(null);
+        }
         
         if(CollectionUtils.equals(isPayment, Boolean.TRUE) && company.getPaymentJobCount()!=null)
         {
@@ -86,10 +79,10 @@ public class SaveCompanyFP  extends SaveFP
             BusinessObjectParser.assertFieldCondition(company.getSelectedPaymentPlan()!= null, company , Company.SINGLEREFERENCE_PaymentPlan, "mandatory", exceptions, true, request);
         }
         
-//        if(hiringTeam != null && !hiringTeam.getManageOwnBilling())
-//        {
-//            BusinessObjectParser.assertFieldCondition(hiringTeam.getBillingTeam() != null, hiringTeam , HiringTeam.SINGLEREFERENCE_BillingTeam, "mandatory", exceptions, true, request);
-//        }
+        if(hiringTeam != null && !hiringTeam.getManageOwnBilling())
+        {
+            BusinessObjectParser.assertFieldCondition(hiringTeam.getBillingTeam() != null, hiringTeam , HiringTeam.SINGLEREFERENCE_BillingTeam, "mandatory", exceptions, true, request);
+        }
         
         super.validate(process, submission, exceptions, params);
     }

cmsWebApp/webroot/extensions/adminportal/hiring_teams.jsp

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

cmsWebApp/webroot/extensions/adminportal/my_company.jsp

@@ -20,7 +20,7 @@
     <script type="text/javascript">
         $(document).ready(function()
         {
-            recalcFunction = setupRecalc ($("editCompany"), {'recalcOnError':true});
+            recalcFunction = setupRecalc ($("form#editCompany"), {'recalcOnError':true});
             
             $("#upload").change(function(){
                 readURL(this);
@@ -119,10 +119,12 @@
                                         <div class="col-md-6">
                                             <label><oneit:label GUIName="Will this team manage its own billing?" /></label>
                                         </div>
-                                        <oneit:recalcClass  htmlTag="div"  classScript="hiringTeam.getManageOwnBilling() ? 'show': 'hide'"  hiringTeam="<%= hiringTeam %>">
+                                        <div class="col-md-6">
+                                            <oneit:recalcClass  htmlTag="div"  classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'"    hiringTeam="<%= hiringTeam %>">
                                                 <label><oneit:label GUIName="Which team will manage the billing?"/></label>
                                             </oneit:recalcClass>
                                         </div>
+                                    </div>
                                     <div class="form-group row">
                                         <div class="col-md-6">
                                             <div class="radio radio-primary second-radio-primary oneit-radio">
@@ -136,10 +138,12 @@
                                                 </label>
                                             </div>
                                         </div>
-                                        <div id="billing_team" class="<%= "col-md-6 " +  (hiringTeam.getManageOwnBilling() ? "hide" : "show") %>" >
+                                        <div class="col-md-6">
+                                            <oneit:recalcClass  htmlTag="div"  classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'"    hiringTeam="<%= hiringTeam %>">
                                                 <div class="wider-select">
                                                     <tagfile:ormsingleasso_select obj="<%= hiringTeam %>"  assocName="BillingTeam" options="<%= Utils.getOtherHiringTeams(hiringTeam) %>"/>
                                                 </div> 
+                                            </oneit:recalcClass>
                                         </div>
                                     </div>
                                     <div class="form-brack-line-sub"></div>