Skip to content

P
PERFORMA_REPLICA
Commit 41d5fd00 by Nilu
Options

fix recalc issue in edit company and billing validations

parent e944c0de
Showing with 27 additions and 30 deletions
cmsWebApp/src/performa/form/SaveCompanyFP.java
...@@ -30,13 +30,6 @@ public class SaveCompanyFP extends SaveFP ...@@ -30,13 +30,6 @@ public class SaveCompanyFP extends SaveFP
Boolean isPayment = (Boolean) request.getAttribute("IsPayment"); Boolean isPayment = (Boolean) request.getAttribute("IsPayment");
LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyFP saving company : ", company ); 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)) if(CollectionUtils.equals(hiringTeam.getIsLogoDeleted(), Boolean.TRUE))
{ {
...@@ -45,10 +38,10 @@ public class SaveCompanyFP extends SaveFP ...@@ -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 ); LogMgr.log(Company.LOG, LogLevel.PROCESSING1,"In SaveCompanyFP setting hiring team logo to null of hiring team : ", hiringTeam );
} }
// if(hiringTeam.getManageOwnBilling()) if(hiringTeam.getManageOwnBilling())
// { {
// hiringTeam.setBillingTeam(null); hiringTeam.setBillingTeam(null);
// } }
if(CollectionUtils.equals(isPayment, Boolean.TRUE) && company.getPaymentJobCount()!=null) if(CollectionUtils.equals(isPayment, Boolean.TRUE) && company.getPaymentJobCount()!=null)
{ {
...@@ -86,10 +79,10 @@ public class SaveCompanyFP extends SaveFP ...@@ -86,10 +79,10 @@ public class SaveCompanyFP extends SaveFP
BusinessObjectParser.assertFieldCondition(company.getSelectedPaymentPlan()!= null, company , Company.SINGLEREFERENCE_PaymentPlan, "mandatory", exceptions, true, request); BusinessObjectParser.assertFieldCondition(company.getSelectedPaymentPlan()!= null, company , Company.SINGLEREFERENCE_PaymentPlan, "mandatory", exceptions, true, request);
} }
// if(hiringTeam != null && !hiringTeam.getManageOwnBilling()) if(hiringTeam != null && !hiringTeam.getManageOwnBilling())
// { {
// BusinessObjectParser.assertFieldCondition(hiringTeam.getBillingTeam() != null, hiringTeam , HiringTeam.SINGLEREFERENCE_BillingTeam, "mandatory", exceptions, true, request); BusinessObjectParser.assertFieldCondition(hiringTeam.getBillingTeam() != null, hiringTeam , HiringTeam.SINGLEREFERENCE_BillingTeam, "mandatory", exceptions, true, request);
// } }
super.validate(process, submission, exceptions, params); super.validate(process, submission, exceptions, params);
} }
......
cmsWebApp/webroot/extensions/adminportal/hiring_teams.jsp
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
%> %>
<oneit:form name="listHiringTeams" method="post" enctype="multipart/form-data"> <oneit:form name="listHiringTeams" method="post" enctype="multipart/form-data">
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("listHiringTeams"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form#listHiringTeams"), {'recalcOnError':true});
}); });
</script> </script>
<div class="dashboard-content-area second-part"> <div class="dashboard-content-area second-part">
<oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/> <oneit:dynInclude page="/extensions/applicantportal/inc/multifieldtext.jsp" data="<%= CollectionUtils.EMPTY_MAP%>"/>
......
cmsWebApp/webroot/extensions/adminportal/my_company.jsp
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() $(document).ready(function()
{ {
recalcFunction = setupRecalc ($("editCompany"), {'recalcOnError':true}); recalcFunction = setupRecalc ($("form#editCompany"), {'recalcOnError':true});
$("#upload").change(function(){ $("#upload").change(function(){
readURL(this); readURL(this);
...@@ -119,9 +119,11 @@ ...@@ -119,9 +119,11 @@
<div class="col-md-6"> <div class="col-md-6">
<label><oneit:label GUIName="Will this team manage its own billing?" /></label> <label><oneit:label GUIName="Will this team manage its own billing?" /></label>
</div> </div>
<oneit:recalcClass htmlTag="div" classScript="hiringTeam.getManageOwnBilling() ? 'show': 'hide'" hiringTeam="<%= hiringTeam %>"> <div class="col-md-6">
<label><oneit:label GUIName="Which team will manage the billing?"/></label> <oneit:recalcClass htmlTag="div" classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'" hiringTeam="<%= hiringTeam %>">
</oneit:recalcClass> <label><oneit:label GUIName="Which team will manage the billing?"/></label>
</oneit:recalcClass>
</div>
</div> </div>
<div class="form-group row"> <div class="form-group row">
<div class="col-md-6"> <div class="col-md-6">
...@@ -136,10 +138,12 @@ ...@@ -136,10 +138,12 @@
</label> </label>
</div> </div>
</div> </div>
<div id="billing_team" class="<%= "col-md-6 " + (hiringTeam.getManageOwnBilling() ? "hide" : "show") %>" > <div class="col-md-6">
<div class="wider-select"> <oneit:recalcClass htmlTag="div" classScript="hiringTeam.getManageOwnBilling() ? 'hide': 'show'" hiringTeam="<%= hiringTeam %>">
<tagfile:ormsingleasso_select obj="<%= hiringTeam %>" assocName="BillingTeam" options="<%= Utils.getOtherHiringTeams(hiringTeam) %>"/> <div class="wider-select">
</div> <tagfile:ormsingleasso_select obj="<%= hiringTeam %>" assocName="BillingTeam" options="<%= Utils.getOtherHiringTeams(hiringTeam) %>"/>
</div>
</oneit:recalcClass>
</div> </div>
</div> </div>
<div class="form-brack-line-sub"></div> <div class="form-brack-line-sub"></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment