From 670747d99ca24e1f4470c2d8ed381515e5e52bba Mon Sep 17 00:00:00 2001
From: birendra.kumar <birendra.kumar@ebix.com>
Date: Thu, 16 Jan 2020 17:10:35 +0530
Subject: [PATCH]  admin user update fixed

---
 400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts    |  6 +++---
 400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.ts |  4 ++--
 400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html          |  5 ++++-
 400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts            | 20 +++++++++++---------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
index 13918f2..44f5f64 100644
--- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/addlicense.component.ts
@@ -35,9 +35,9 @@ export class AddLicense implements OnInit {
   divClass: string = '';
   topPos: string = '2000px';
   datePipe: DatePipe = new DatePipe('en-US');
-  bsValue1: Date = new Date();
-  bsValue2: Date = new Date();
-  bsValue3: Date = new Date();
+  bsValue1: Date = null;//new Date();
+  bsValue2: Date = null;//new Date();
+  bsValue3: Date = null;//new Date();
   modalRef: BsModalRef;
   editionLoginsText: string;
   rowIndex: number = 0;
diff --git a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.ts b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.ts
index ee67869..a9d2a44 100644
--- a/400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/LicenseEntity/searchlicense.component.ts
@@ -36,8 +36,8 @@ export class SearchLicense implements OnInit, AfterViewChecked {
   topPos: string = '2000px';
   selectedRow: number = 0;
   datePipe: DatePipe = new DatePipe('en-US');
-  bsValue1: Date = new Date();
-  bsValue2: Date = new Date();
+  bsValue1: Date = null;//new Date();
+  bsValue2: Date = null;//new Date();
   selectedId: number = 0;
   modalRef: BsModalRef;
   checkedRecords: Array<number>;
diff --git a/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html b/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
index 1ecced3..25250dd 100644
--- a/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
+++ b/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.html
@@ -204,7 +204,10 @@
                     <label for="inputPassword3" class="col-sm-5 control-label">Confirm Password <span class="red">*</span> :</label>
                     <div class="col-sm-7">
                       <input type="password" class="form-control input-sm" id="cpassword" placeholder="" formControlName="ConfirmPassword">
-                      <div *ngIf="!adduserFrm.controls.ConfirmPassword.valid && adduserFrm.controls.ConfirmPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Confirm Password is required</div>
+                      <div *ngIf="!adduserFrm.controls.ConfirmPassword.valid && !adduserFrm.controls.ConfirmPassword.value && adduserFrm.controls.ConfirmPassword.dirty" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">Confirm Password is required</div>                 
+                       <div *ngIf="adduserFrm.controls.ConfirmPassword.value!=adduserFrm.controls.Password.value && adduserFrm.controls.ConfirmPassword.valid" class="alert alert-danger" style="padding: 2px; margin-bottom: 2px;">
+                         Password not match.
+                       </div>
                     </div>
                   </div>
                   <div class="form-group">
diff --git a/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts b/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
index a824ed4..cefab55 100644
--- a/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
+++ b/400-SOURCECODE/Admin/src/app/components/UserEntity/users.component.ts
@@ -347,29 +347,31 @@ export class UsersList implements OnInit, AfterViewChecked {
   }
 
   public UpdateUser() {
-    this.alerts = '';
-    if (this.adduserFrm.value.UserName == '') {
-      this.alerts += '<span>User Name minimum 8 characters is required.</span>';
+    this.alerts = '';   
+    if (this.adduserFrm.value.UserName == '' ||(!this.adduserFrm.controls.UserName.valid))
+    {
+      this.alerts += '<span>User Name of minimum 8 characters is required.</span>';
     }
-    if (this.adduserFrm.value.Password == '') {
+    if (this.adduserFrm.value.Password == '' ||(!this.adduserFrm.controls.Password.valid )) {
       this.alerts += '</br><span>Password of minimum 8 characters is required.</span>';
     }
     if (this.adduserFrm.value.ConfirmPassword == '') {
       this.alerts += '</br><span>Confirm Password is required.</span>';
     }
-    if (this.adduserFrm.value.EmailId == '') {
+    if (this.adduserFrm.value.Password != this.adduserFrm.value.ConfirmPassword) {
+      this.alerts += '</br><span>Password and confirm password must be same</span>';
+    }
+    if (this.adduserFrm.value.EmailId == '' ||(!this.adduserFrm.controls.EmailId.valid)) {
       this.alerts += '</br><span>Email Id is required.</span>';
     }
+  
     if (this.adduserFrm.value.FirstName == '') {
       this.alerts += '</br><span>First Name is required.</span>';
     }
     if (this.adduserFrm.value.LastName == '') {
       this.alerts += '</br><span>Last Name is required.</span>';
     }
-    if (this.adduserFrm.value.Password != this.adduserFrm.value.ConfirmPassword) {
-      this.alerts += '</br><span>Password and confirm password must be same</span>';
-    }
-    
+       
     if (this.adduserFrm.valid && this.alerts == '') {
       this.adduserFrm.controls['isActive'].setValue(this.adduserFrm.value.UserStatusActive) 
       
--
libgit2 0.21.4