HT016 my details modifications

cmsWebApp/src/performa/form/SaveUserDetailsFP.java

+package performa.form;
+
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
+import oneit.logging.LogLevel;
+import oneit.logging.LogMgr;
+import oneit.objstore.StorageException;
+import oneit.objstore.parser.BusinessObjectParser;
+import oneit.security.SecUser;
+import oneit.servlets.forms.SubmissionDetails;
+import oneit.servlets.forms.SuccessfulResult;
+import oneit.servlets.process.ORMProcessState;
+import oneit.servlets.process.SaveFP;
+import oneit.utils.BusinessException;
+import oneit.utils.MultiException;
+import oneit.utils.StringUtils;
+import performa.orm.CompanyUser;
+
+
+public class SaveUserDetailsFP extends SaveFP 
+{
+    @Override
+    public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
+    {
+        HttpServletRequest  request     =   submission.getRequest();
+        CompanyUser         companyUser =   (CompanyUser) request.getAttribute("CompanyUser");
+        SecUser             secUser     =   companyUser.getUser();     
+        
+        LogMgr.log(CompanyUser.LOG, LogLevel.PROCESSING1,"In SaveUserDetailsFP saving CompanyUser : ", companyUser );
+         
+        if(companyUser.getConfirmPassword() != null)
+        {
+            secUser.setAttribute("md5:" + SecUser.FIELD_Password, companyUser.getConfirmPassword());
+        }
+        
+        return super.processForm(process, submission, params);
+    }
+    
+        
+    @Override
+    protected Map validate(SubmissionDetails submission, MultiException exceptions) 
+    {
+        HttpServletRequest  request     =   submission.getRequest();
+        CompanyUser         companyUser =   (CompanyUser) request.getAttribute("CompanyUser");
+        SecUser             secUser     =   companyUser.getUser();
+        
+        BusinessObjectParser.assertFieldCondition(StringUtils.isEmailAddress(secUser.getUserName()), secUser, SecUser.FIELD_Email, "invalid", 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);
+//        BusinessObjectParser.assertFieldCondition(CollectionUtils.equals(companyUser.getPassword(), companyUser.getConfirmPassword()), companyUser, Job.FIELD_ConfirmPassword, "passwordNotMatch", exceptions, true, request);
+        
+        return super.validate(submission, exceptions);
+    }
+}
\ No newline at end of file

cmsWebApp/src/performa/orm/CompanyUser.java

 package performa.orm;
 
+import oneit.logging.LoggingArea;
 import oneit.objstore.*;
 import oneit.utils.*;
 
@@ -7,7 +8,9 @@ import oneit.utils.*;
 public class CompanyUser extends BaseCompanyUser
 {
     private static final long serialVersionUID = 0L;
-    
+        
+    public  static LoggingArea  LOG = LoggingArea.createLoggingArea("CompanyUser");
+
     // This constructor should not be called
     public CompanyUser ()
     {

cmsWebApp/webroot/extensions/adminportal/CustomServlets_adminPortal.xml

@@ -38,6 +38,7 @@
             <AccountCreatedEmailer  factory="Participant"   class="oneit.email.ConfigurableArticleTemplateEmailer"  templateShortcut="AccountCreatedMail"/>
             <InvitationEmailer      factory="Participant"   class="oneit.email.ConfigurableArticleTemplateEmailer"  templateShortcut="InvitationMail"/>
         </FORM>
+        <FORM   name="*.saveUserDetails"                factory="Participant"   class="performa.form.SaveUserDetailsFP"/>
     </NODE>
     
     <NODE name="job_assessment_criteria_add_jsp" factory="Participant">

cmsWebApp/webroot/extensions/adminportal/my_details.jsp

@@ -29,7 +29,7 @@
                                 </div>              
                                 <div class="form-group">
                                     <oneit:label GUIName="Email Address" />
-                                    <oneit:ormInput obj="<%= loggedInUser %>" type="text" attributeName="Email"   cssClass="form-control" />                                
+                                    <oneit:ormInput obj="<%= loggedInUser %>" type="text" attributeName="UserName"  cssClass="form-control" />                                
                                 </div>
                                 <div class="form-group row">
                                     <div class="col-md-6">
@@ -48,11 +48,13 @@
                                 <div class="form-brack-line-sub"></div>
                                 <div class="form-group">
                                     <label><oneit:label GUIName="Confirm Password" /></label>
-                                    <oneit:ormInput obj="<%= loggedInUser %>" type="text" attributeName="LastName"   cssClass="form-control" />                                
+                                    <oneit:ormInput obj="<%= companyUser %>"    type="password" attributeName="ConfirmPassword" cssClass="form-control"/>
                                 </div>
                                 <div class="text-center form-group">
-                                    <oneit:button   value="Save Updates"    name="save" cssClass="btn btn-primary largeBtn"
-                                                    requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage).toMap() %>" />
+                                    <oneit:button   value="Save Updates"    name="saveUserDetails"  cssClass="btn btn-primary largeBtn"
+                                                    requestAttribs="<%= CollectionUtils.mapEntry("nextPage", nextPage)
+                                                                                        .mapEntry("CompanyUser", companyUser)
+                                                                                        .toMap() %>" />
                                 </div> 
                             </div>
                         </div>