Applicant Portal review changes

cmsWebApp/src/performa/form/VerifyIdentityFP.java

+package performa.form;
+
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import oneit.logging.*;
+import oneit.objstore.parser.BusinessObjectParser;
+import oneit.security.SecUser;
+import oneit.servlets.forms.*;
+import oneit.servlets.process.*;
+import oneit.utils.*;
+import performa.orm.*;
+ 
+
+public class VerifyIdentityFP extends SaveFP
+{
+    private static LoggingArea  LOG =   LoggingArea.createLoggingArea("VerifyIdentity");
+    
+    @Override
+    protected Map validate(SubmissionDetails submission, MultiException exceptions) 
+    {
+        HttpServletRequest  request     =   submission.getRequest();
+        Job                 job         =   (Job) request.getAttribute("Job");
+        Candidate           candidate   =   (Candidate) request.getAttribute("Candidate");
+        SecUser             secUser     =   candidate.getUser();
+        
+        BusinessObjectParser.assertFieldCondition(job.getEmail()!= null, job, Job.FIELD_Email, "mandatory", exceptions, true, request);
+        BusinessObjectParser.assertFieldCondition(secUser.getFirstName() != null, secUser, SecUser.FIELD_FirstName, "mandatory", exceptions, true, request);
+        BusinessObjectParser.assertFieldCondition(secUser.getLastName() != null, secUser, SecUser.FIELD_LastName, "mandatory", exceptions, true, request);
+        
+        return super.validate(submission, exceptions);
+    }
+}
\ No newline at end of file

cmsWebApp/webroot/extensions/applicantportal/CustomServlets_applicantPortal.xml

@@ -2,7 +2,8 @@
 <OBJECTS name="AdminPortal">
 
     <NODE name="dynamic_content_form::APPLICANT_PORTAL"   factory="Participant">
-        <FORM   name="*.signIn"   factory="Participant"   class="performa.form.SignInCandidateFP"/>
+        <FORM   name="*.signIn"         factory="Participant"   class="performa.form.SignInCandidateFP"/>
+        <FORM   name="*.verifyIdentity" factory="Participant"   class="performa.form.VerifyIdentityFP"/>
     </NODE>
     
 </OBJECTS>

cmsWebApp/webroot/extensions/applicantportal/job_overview.jsp

@@ -5,17 +5,17 @@
 
 <oneit:dynIncluded>
 <%
-    String              nextPage    =   WebUtils.getSamePageInRenderMode(request, "SignIn");
-    Job                 job         =   (Job) process.getAttribute("Job");
-    String              id          =   request.getParameter("id");
-    String              key         =   request.getParameter("key");
+    String  nextPage    =   WebUtils.getSamePageInRenderMode(request, "SignIn");
+    Job     job         =   (Job) process.getAttribute("Job");
+    String  id          =   request.getParameter("id");
+    String  key         =   request.getParameter("key");
     
     if(id != null && key != null)
     {
         job = Job.searchJobKey(transaction, Long.parseLong(id), key);
     }
     
-    if(job!=null)
+    if(job != null)
     {
 %>
         <div class="main-position-overview">

cmsWebApp/webroot/extensions/applicantportal/messages/fieldnamesOverride.txt

+
+Job.Email           =   Email Address
+
+SecUser.FirstName   =   First Name
+SecUser.LastName    =   Last Name

cmsWebApp/webroot/extensions/applicantportal/sign_in.jsp

@@ -5,16 +5,17 @@
 
 <oneit:dynIncluded>
 <%
-    ObjectTransaction   objTran         = process.getTransaction ();
-    String              nextPage        = WebUtils.getSamePageInRenderMode(request, "VerifyIdentity");
-    Job                 job             = (Job) process.getAttribute("Job");
-
+    ObjectTransaction   objTran     =   process.getTransaction ();
+    String              nextPage    =   WebUtils.getSamePageInRenderMode(request, "VerifyIdentity");
+    Job                 job         =   (Job) process.getAttribute("Job");
+    
+    Debug.assertion(job != null, "Job is null in applicant portal");
 %>
     <script>
         $(document.body).addClass('bg-color');
     </script>
     
-    <oneit:form name="applyJob" method="post" enctype="multipart/form-data">
+    <oneit:form name="applyJob" method="post"   enctype="multipart/form-data">
         
         <oneit:dynInclude   page="/extensions/applicantportal/inc/multifieldtext.jsp"   data="<%= CollectionUtils.EMPTY_MAP%>"/>
         

cmsWebApp/webroot/extensions/applicantportal/verify_identity.jsp

@@ -9,6 +9,8 @@
     Job         job         =   (Job) process.getAttribute("Job");
     Candidate   candidate   =   (Candidate) process.getAttribute("Candidate");
     
+    Debug.assertion(job != null, "Job is null in applicant portal");
+    
     if(candidate == null)
     {
         Tuple.T2<Candidate, Boolean>    tuple   =   job.getUserOrCreate();
@@ -22,7 +24,6 @@
             %><%@include file="/saferedirect.jsp" %><%
         }
     }
-
     SecUser secUser =   candidate.getUser();
 %>
     <script>
@@ -38,26 +39,28 @@
             <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">
-                    <label>Email Address</label>
-                    <oneit:ormInput obj="<%= secUser %>"        type="text" attributeName="UserName"    cssClass="form-control second-style" />
+                    <label><oneit:ormlabel  obj="<%= job %>"    field="Email" /></label>
+                    <oneit:ormInput obj="<%= job %>"    type="text" attributeName="Email"   cssClass="form-control second-style" />
                 </div>
                 <div class="row">
                     <div class="form-group text-left col-sm-6 col-xs-12">
-                        <label>First Name</label>
+                        <label><oneit:ormlabel  obj="<%= secUser %>"    field="FirstName" /></label>
                         <oneit:ormInput obj="<%= secUser %>"    type="text" attributeName="FirstName"   cssClass="form-control second-style" />
                     </div>
                     <div class="form-group text-left col-sm-6 col-xs-12">
-                        <label>Last Name</label>
+                        <label><oneit:ormlabel  obj="<%= secUser %>"    field="LastName" /></label>
                         <oneit:ormInput obj="<%= secUser %>"    type="text" attributeName="LastName"    cssClass="form-control second-style" />
                     </div>
                 </div>
                 <div class="form-group text-left">
-                    <label>Phone</label>
+                    <label><oneit:ormlabel  obj="<%= candidate %>"    field="Phone" /></label>
                     <oneit:ormInput obj="<%= candidate %>"      type="text" attributeName="Phone"       cssClass="form-control second-style" />
                 </div>
                 <div class="text-center">
-                    <oneit:button   value="Verify and proceed"  name="save" cssClass="box-btn margin-top-18"
+                    <oneit:button   value="Verify and proceed"  name="verifyIdentity"   cssClass="box-btn margin-top-18"
                                     requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
+                                                                    .mapEntry("Job", job)
+                                                                    .mapEntry("Candidate", candidate)
                                                                     .mapEntry("attribNamesToRestore", CollectionUtils.createSet("Job","Candidate"))
                                                                     .mapEntry("restartProcess", Boolean.TRUE)
                                                                     .toMap() %>"/>