Merged 'develop'.

cmsWebApp/src/performa/batch/PullStripeDataBatch.java

@@ -52,6 +52,12 @@ public class PullStripeDataBatch  extends ORMBatch
             
             for (Plan plan : plansList)
             {
+                if(plan.getAmount() == null)
+                {
+                    // tired plans have null value for amount: performa is not using tired plans
+                    continue;
+                }
+                
                 Filter<PaymentPlan> filter      =   PaymentPlan.SearchByAll().andStripeReference(new EqualsFilter<>(plan.getId()));
                 List<PaymentPlan>   activePlans =   (List<PaymentPlan>) CollectionFilter.filter(Arrays.asList(paymentPlans) , filter);
             

cmsWebApp/src/performa/form/SelectHiringTeamFP.java

@@ -17,11 +17,12 @@ public class SelectHiringTeamFP extends ORMProcessFormProcessor
     {
         HttpServletRequest  request =   submission.getRequest();
         CompanyUser         companyUser =   (CompanyUser) request.getAttribute("CompanyUser");
+        String              nextPage    =   (String) request.getAttribute("nextPage");
 
         LogMgr.log(Job.LOG, LogLevel.PROCESSING1, "Inside SelectHiringTeamFP for ", companyUser, " selected hiring team : ", companyUser.getSelectedTeam());
         
         request.getSession().setAttribute("SelectedHiringTeam", companyUser.getSelectedTeam());
         
-        return RedisplayResult.getInstance();
+        return new ProcessRedirectResult (nextPage, new String[]{});
     }
 }
\ No newline at end of file

cmsWebApp/webroot/css/common.css

@@ -1356,10 +1356,11 @@ input.btn.btn-primary.top-margin-25{
 .work-rating,.work-l-rating,.friend-rating {
     background: #eff0f2;
     padding: 15px 20px;
-    display: inline-block;
+    display: block;
     font-size: 13px;
     position: relative;
     margin: 10px -25px;
+    /*width: 100%;*/
 }
 .rate-toggle {
     float: right;
@@ -1732,7 +1733,8 @@ p.job-txt , p.job-txt span{
     text-align: right;
 }
 .apply-job-logo-header .logo-img img {
- height: 100%;
+    height: 100%;
+    width: auto; 
 }
 
 .apply-job-logo-header .header-title {
@@ -1905,11 +1907,11 @@ table.pos-table{
     border-radius: 3px;
     display: inline-block;
     margin: 0 auto;
-    width: 84.617%;
+    width: 56%;
 }
 .social-login li {
     display: inline-block;    
-    padding: 7.1% 7.8%;
+    padding: 10.1% 10.8%;
     border-left: 2px solid #d3d3d3;
 }
 .social-login li a{
@@ -7719,4 +7721,4 @@ input{
     
 /*
     End of CV Cover Letter Popup
-*/
+*/
\ No newline at end of file

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

@@ -6,6 +6,9 @@
 
 <oneit:dynIncluded>
     <div class="form-page-section">
+    <style>
+        .rate-background{overflow: hidden;}
+    </style>
     <script type="text/javascript">
         
         function moveImportanceSection(elementRating){

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

@@ -168,7 +168,7 @@
                             
                             <oneit:button   name="selectHiringTeam"  value="Save"    cssClass="change-hiring-team hidden"
                                                 requestAttribs="<%= CollectionUtils.mapEntry("CompanyUser", companyUser)
-//                                                                                    .mapEntry("nextPage", currentPage)
+                                                                                    .mapEntry("nextPage", homeUrl)
                                                                                     .toMap() %>" />
                             <%-- 
                             <div class="inset-shadow"></div>

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

@@ -324,6 +324,11 @@
                             
                             for(FactorClass factorClass : factorClassDtls.keySet())
                             {
+                                if(roleScoreMap.get(factorClass) == null)
+                                {
+                                    continue;
+                                }
+                                
                                 Map<FactorLevelLink, Map>   factorDetails   =   factorClassDtls.get(factorClass);
                                 Double                      rating          =   roleScoreMap.get(factorClass).get2();
                                 ColorCode                   colorCode       =   roleScoreMap.get(factorClass).get1();
@@ -364,7 +369,7 @@
                                                     <div class="tab-view-label">
                                                         <oneit:toString value="<%= factorLevelLink.getFactor() %>"  mode="EscapeHTML"/>
                                                         <%
-                                                            if(job.isExpressJob())
+                                                            if(false)//if(job.isExpressJob())
                                                             {
                                                         %>
                                                                 <div class="ja-exp-fact-score">

cmsWebApp/webroot/extensions/adminportal/job_review_submit.jsp

@@ -256,7 +256,7 @@
                             <div class="form-brack-line-sub"></div>
                             <div class="form-group">
                                 <div class="beloning">
-                                    <oneit:toString value="<%= criteria.getName() %>" mode="EscapeHTML"/>
+                                    <oneit:toString value="<%= criteria.getDescription() %>" mode="EscapeHTML"/>
                                 </div>
                             </div>
                     <%
@@ -297,7 +297,7 @@
                             </span>
                         </div>
                     </div>
-                            <div class=" job-detail-subsection">       
+                    <div class=" job-detail-subsection">       
                     <%
                         for(CultureClass cultureClass : CultureClass.getCultureClassArray())
                         {

cmsWebApp/webroot/extensions/applicantportal/sign_in.jsp

@@ -140,6 +140,7 @@
                             <img src="<%= request.getContextPath() %>/images/login-facebok-icon.svg" />
                         </oneit:button>
                     </li>
+                    <%--
                     <li>
                         <oneit:button   value=" "  name="googleOAuthLogin"     skin="link"  cssClass="social_login_btn"
                                         disabled="<%= Utils.googleAvailable() ? "false" : "true" %>"
@@ -147,6 +148,7 @@
                             <img src="<%= request.getContextPath() %>/images/login-google.png" />
                         </oneit:button>
                     </li>
+                    --%>
                 </ul>                    
             </oneit:form>
                         

cmsWebApp/webroot/extensions/performa/upgrades/20190205_Alter_FactorScoreResult.sql

+update tl_level_factor set to_score= 13 where level_number = 1002 and factor_number = 13 and from_score = 9;