From 4c25c98b52af32479f9b682b399a65f9bd1f4d1e Mon Sep 17 00:00:00 2001
From: "kuldeep.arora" <kuldeep.arora@viithiisys.com>
Date: Wed, 21 Feb 2018 12:31:59 +0530
Subject: [PATCH] email validation

---
 .../accountSetting/accountSetting.Controller.js    | 42 ++++++++++++++++------
 app/partials/accountSetting/accountSetting.html    |  4 +--
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/app/partials/accountSetting/accountSetting.Controller.js b/app/partials/accountSetting/accountSetting.Controller.js
index 221652a..a3db25b 100644
--- a/app/partials/accountSetting/accountSetting.Controller.js
+++ b/app/partials/accountSetting/accountSetting.Controller.js
@@ -68,29 +68,51 @@
 	            
             })
           }
+          $scope.accountdata = {};
+          $scope.accountdata.userName = '';
+          $scope.accountdata.status = true;
 
             $scope.addAccount = function(){
               $('#demo-modal').css('display', 'block');
           }
 
           $scope.cancelAddAccount = function(){
-        	  $scope.accountdata = {};
+           	  $scope.accountdata = {};
               $('#demo-modal').css('display', '');
           }
+
            $scope.additionalAccnObj = {};
            $scope.createAddAccount = function(){
-              AccountSettingService.addAdditionalAccount($scope.accountdata).then(function(result) {
-            	  getAdditionalAccounts();
-            	  $scope.accountdata = {};
-            	  $('#demo-modal').css('display', '');
-                toastr.success(''+result.success+'', {
+              if ($scope.accountdata.userName === '') {
+                toastr.error('Please enter all the fields.', {
                     closeButton: true
                 })
-              })
-	        
+              }else{
+                if (validateEmail($scope.accountdata.userName)) {
+                   AccountSettingService.addAdditionalAccount($scope.accountdata).then(function(result) {
+                      getAdditionalAccounts();
+                      $scope.accountdata = {};
+                      $('#demo-modal').css('display', '');
+                      toastr.success(''+result.success+'', {
+                          closeButton: true
+                      })
+                    }) 
+                }else{
+                  toastr.error('Please enter valid email.', {
+                      closeButton: true
+                  })
+                }
+              }
+              	        
           }
-           
-           $scope.changeStatus = function(id, index){
+
+        /*Validate Email */
+         function validateEmail(email) {
+            var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+            return re.test(email);
+          }
+
+               $scope.changeStatus = function(id, index){
                event.stopPropagation();
                var id = id;
                var statusData = "status=" + $scope.additionalAccounts[index].status + "&id=" + $scope.additionalAccounts[index].id + "&firstName=" + $scope.additionalAccounts[index].firstName 
diff --git a/app/partials/accountSetting/accountSetting.html b/app/partials/accountSetting/accountSetting.html
index 7e49eaf..353691f 100644
--- a/app/partials/accountSetting/accountSetting.html
+++ b/app/partials/accountSetting/accountSetting.html
@@ -191,7 +191,7 @@
 
                                   <div class="col-md-6">
                                      <div class="pull-left" style="width: calc(140% - 170px);">
-                                       <input type="text" ng-model="accountdata.userName" placeholder="XYZfbo@gmail.com" class="form-control" >
+                                       <input type="email"  ng-model="accountdata.userName" placeholder="XYZfbo@gmail.com" class="form-control" required >
                                     </div>
                                    
                                     <div class="clearfix"></div>
@@ -230,7 +230,7 @@
             </div>
            
             <div class="modal-footer" style="border-top: 0;">
-                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="createAddAccount()">Save</button>
+                <button type="button" class="btn btn-primary step step-1" data-step="1" ng-click="createAddAccount()" >Save</button>
                 <button type="button" class="btn btn-default" ng-click="cancelAddAccount()" data-dismiss="modal">Cancel</button>
            </div>
         </div>
-- 
2.0.0