Updated client logo in applicant portal.

Login verification updated applicant/admin.

cmsWebApp/src/performa/form/SendVerificationMailFP.java

@@ -43,7 +43,7 @@ public class SendVerificationMailFP extends SaveFP
             CompanyUser companyUser =   company.getAddedByUser();
             SecUser     secUser     =   companyUser.getUser();
             
-            BusinessObjectParser.assertFieldCondition(!isEmailFound(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
+            BusinessObjectParser.assertFieldCondition(!isCompanyUserEmailFound(process.getTransaction(), secUser.getEmail()), secUser, SecUser.FIELD_Email, "emailExists", exceptions, true, request);
         }
         else
         {
@@ -66,14 +66,36 @@ public class SendVerificationMailFP extends SaveFP
         {
             CompanyUser companyUser         =   company.getAddedByUser();
             SecUser     secUser             =   companyUser.getUser();
+            SecUser     availableSecUser    =   SecUser.searchNAME(objTran, secUser.getEmail());
             
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Started to send varification email.", companyUser);
                             
+            if(availableSecUser!=null)
+            {
+                if(availableSecUser.getExtension(CompanyUser.REFERENCE_CompanyUser)!=null)
+                {
+                    Debug.assertion(false, "user available", availableSecUser);
+                }
+                else
+                {
+                    LogMgr.log(LOG, LogLevel.PROCESSING1, "SecUser available", availableSecUser);
+
+                    availableSecUser.addToExtensions(companyUser);
+
+                    //remove new sec user obj
+                    secUser.removeFromExtensions(companyUser);
+                    secUser.delete();
+                }
+            }
+            else
+            {
+
                 secUser.setUserName(secUser.getEmail().toLowerCase());
                 secUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
                 secUser.addRole(Utils.getRole(Utils.ROLE_CLIENT, objTran));
                 
                 LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser);
+            }
 
             sendVerificationMail(companyUser, request);
 
@@ -91,20 +113,26 @@ public class SendVerificationMailFP extends SaveFP
 
             SecUser     secUser =   SecUser.searchNAME(objTran, email);
             
-            Debug.assertion(secUser == null, "user available", email);
+            if(secUser!=null)
+            {
+                Debug.assertion(secUser.getExtension(Candidate.REFERENCE_Candidate)==null, "user available", email, secUser);
+            }
 
             LogMgr.log(LOG, LogLevel.PROCESSING1, "Inside SendVerificationMailFP for send account verification mail for ", email);
             
             
-            SecUser     newSecUser  =   SecUser.createSecUser(objTran);
+            if(secUser==null)
+            {
+                secUser =   SecUser.createSecUser(objTran);
 
-            newSecUser.setUserName(email);
-            newSecUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
-            newSecUser.addRole(Utils.getRole(Utils.ROLE_APPLICANT, objTran));
+                secUser.setUserName(email);
+                secUser.setAttribute("md5:" + SecUser.FIELD_Password, DEFAULT_PASSWORD);
+                secUser.addRole(Utils.getRole(Utils.ROLE_APPLICANT, objTran));
+            }
             
-            Candidate   candidate   =   newSecUser.getExtensionOrCreate(Candidate.REFERENCE_Candidate);
+            Candidate   candidate   =   secUser.getExtensionOrCreate(Candidate.REFERENCE_Candidate);
             
-            LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", newSecUser);
+            LogMgr.log(LOG, LogLevel.PROCESSING1, "New user created :: ", secUser);
 
             sendVerificationMail(candidate, job, request);
 
@@ -206,13 +234,13 @@ public class SendVerificationMailFP extends SaveFP
     }
     
     
-    private Boolean isEmailFound(ObjectTransaction objTran, String email)
+    private Boolean isCompanyUserEmailFound(ObjectTransaction objTran, String email)
     {
         if(email!=null)
         {
             SecUser user    = SecUser.searchNAME(objTran, email.toLowerCase());
             
-            if(user!=null) //&& user.getExtension(CompanyUser.REFERENCE_CompanyUser)!=null
+            if(user!=null && user.getExtension(CompanyUser.REFERENCE_CompanyUser)!=null)
             {
                 return Boolean.TRUE;
             }

cmsWebApp/src/performa/orm/Job.java

@@ -413,4 +413,19 @@ public class Job extends BaseJob
         
         return Boolean.FALSE;
     }
+    
+    
+    //to check company logo availability
+    public Boolean isClientLogoAvailable()
+    {
+        if( getClient()!=null 
+            && getClient().getClientLogo()!=null
+            && getCompanyUser()!=null 
+            && getCompanyUser().getCompany().getHasClientSupport()==Boolean.TRUE )
+        {
+            return Boolean.TRUE;
+        }
+        
+        return Boolean.FALSE;
+    }
 }
\ No newline at end of file

cmsWebApp/webroot/css/common.css

@@ -5080,3 +5080,6 @@ label, label .label-title span {
     position: relative;
     top: -1px;
 }
+.no-height{
+  height: 0; 
+}
\ No newline at end of file

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

@@ -18,7 +18,7 @@
         <div class="officer-name">
             <div class="chief-officer">
                 <%
-                    if(job.getClient() != null)
+                    if(job.isClientLogoAvailable())
                     {
                         int logoWidth   =   27;
                 %>

cmsWebApp/webroot/extensions/applicantportal/application_outline.jsp

@@ -76,18 +76,17 @@
     }
     
     process.setAttribute("JobApplication", jobApplication);
-%>
-        <div class="welcome-aust-logo">
-            <%
-                if(job.getClient() != null)
+ 
+    if(job.isClientLogoAvailable())
     {
         int logoWidth   =   45;
-            %>
+%>
+        <div class="welcome-aust-logo">
             <tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
-            <%
-                }
-            %>
         </div>
+<%
+    }
+%>
         <div class="welcome-title">Welcome <oneit:toString value="<%= candidate.getFirstName() %>"/>, here's your application outline</div>
         <div class="appli-aust-title">
             <oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/>

cmsWebApp/webroot/extensions/applicantportal/job_match_assessment.jsp

@@ -91,7 +91,7 @@
     <div class="main-application-outline">
         <div class="selection-aust-logo">
             <%
-                if(job.getClient() != null)
+                if(job.isClientLogoAvailable())
                 {
                     int logoWidth   =   45;
             %>
@@ -100,6 +100,7 @@
                 }
             %>
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
+            <div class="clearfix no-height"></div>
         </div>
         <div class="show-mobile-title">
             <div class="mobile-title-page">Your Work Style</div>

cmsWebApp/webroot/extensions/applicantportal/job_overview.jsp

@@ -28,17 +28,17 @@
         </style>
         
         <div class="main-position-overview">
-            <div class="aust-logo">
             <%
-                if(job.getClient() != null)
+                if(job.isClientLogoAvailable())
                 {
                     int logoWidth   =   45;
             %>
+                <div class="aust-logo">
                     <tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
+                </div>
             <%
                 }
             %>
-            </div>
             <div class="overview-title">
                 <oneit:toString value="<%= job.getJobTitle() %>"   mode="EscapeHTML"/>
             </div>

cmsWebApp/webroot/extensions/applicantportal/selection_criteria.jsp

@@ -46,7 +46,7 @@
     <div class="main-application-outline">
         <div class="selection-aust-logo">
             <%
-                if(job.getClient() != null)
+                if(job.isClientLogoAvailable())
                 {
                     int logoWidth   =   45;
             %>
@@ -55,6 +55,7 @@
                 }
             %>
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
+            <div class="clearfix no-height"></div>
         </div>
         <div class="show-mobile-title">
             <div class="mobile-title-page">Requirements</div>

cmsWebApp/webroot/extensions/applicantportal/sign_in.jsp

@@ -79,17 +79,17 @@
     </style>
     
     <div class="main-verify-identity">
-        <div class="verify-aust-logo">
         <%
-                if(job.getClient() != null)
+            if(job.isClientLogoAvailable())
             {
                 int logoWidth   =   45;
         %>
+                <div class="verify-aust-logo">
                     <tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
+                </div>
         <%
             }
         %>
-        </div>
         <div class="pl-verify">Please verify your identity before applying to:</div>
         <div class="verify-i-title">
             <oneit:toString value="<%= job.getJobTitle() %>"   mode="EscapeHTML"/>

cmsWebApp/webroot/extensions/applicantportal/submit_application.jsp

@@ -18,7 +18,7 @@
     <div class="main-application-outline">
         <div class="selection-aust-logo">
             <%
-                if(job.getClient() != null)
+                if(job.isClientLogoAvailable())
                 {
                     int logoWidth   =   45;
             %>
@@ -27,6 +27,7 @@
                 }
             %>
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
+            <div class="clearfix no-height"></div>
         </div>    
         <div class="mobile-successfull-show display-none">Thank you <span><img  class="mob-smile-face" src="images/smile-face.png" /></span></div>            
         <div class="section-page-area complete-back">

cmsWebApp/webroot/extensions/applicantportal/verify_identity.jsp

@@ -100,17 +100,17 @@
         <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>
         
         <div class="main-verify-identity">
-            <div class="verify-aust-logo">
             <%
-                if(job.getClient() != null)
+                if(job.isClientLogoAvailable())
                 {
                     int logoWidth   =   45;
             %>
+                    <div class="verify-aust-logo">
                         <tagfile:img src="<%= ThumbnailUtils.filterImage(DiskFileBinaryContent.getRelativeURL(job.getClient().getClientLogo()), "KEEP", new ScaleWithin (logoWidth, 0)) %>" />
+                    </div>
             <%
                 }
             %>
-            </div>
             <div class="pl-confirm text-center">Please confirm your details to continue</div>
             <div class="main-box-layout main-verify-step-2">
                 <div class="form-group text-left">

cmsWebApp/webroot/extensions/applicantportal/workplace_culture.jsp

@@ -69,7 +69,7 @@
     <div class="main-application-outline">
         <div class="selection-aust-logo">
             <%
-                if(job.getClient() != null)
+                if(job.isClientLogoAvailable())
                 {
                     int logoWidth   =   45;
             %>
@@ -78,6 +78,7 @@
                 }
             %>
             <span><oneit:toString value="<%= job.getJobTitle() %>"  mode="EscapeHTML"/></span>
+            <div class="clearfix no-height"></div>
         </div>
         <div class="show-mobile-title">
             <div class="mobile-title-page">Culture</div>