From bdc73f777e4fdd2eb4e6f38801c41beff6738881 Mon Sep 17 00:00:00 2001
From: swarn <swarn.singh@viithiisys.com>
Date: Tue, 23 May 2017 16:25:20 +0530
Subject: [PATCH] validation issue resolved

---
 app/views/fbo-admin/dashboard.controller.js | 64 ++++++++++++++++++++++++++++-
 app/views/fbo-admin/dashboard.html          | 51 +++++++++++++++++++----
 2 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/app/views/fbo-admin/dashboard.controller.js b/app/views/fbo-admin/dashboard.controller.js
index 9c4e902..5082373 100644
--- a/app/views/fbo-admin/dashboard.controller.js
+++ b/app/views/fbo-admin/dashboard.controller.js
@@ -15,6 +15,9 @@
       $scope.essAccountId = true;
       $("#esAccId").css({ opacity: 0.5 });
       $scope.user = {};
+      $scope.user.companyName = '';
+      $scope.user.email = '';
+      $scope.user.password = '';
       $scope.feature = {};
       $scope.feature.level = 'silver';
       $scope.feature.essintaPosSystem = false;
@@ -35,9 +38,66 @@
           }
         })
       }
+      $scope.comnayNameInvalid = false;
+      $scope.emailInvalid = false;
+      $scope.passwordInvalid = false;
+
+      $scope.companyNameValid = function(){
+        $scope.comnayNameInvalid = false;
+        $('.companyNameError').removeClass('customErrorInput');
+      }
+      $scope.emailValid = function(){
+        $scope.emailInvalid = false;
+        $('.emailIdError').removeClass('customErrorInput');
+      }
+      $scope.passwordValid = function(){
+        $scope.passwordInvalid = false;
+        $('.invalidPassword').removeClass('customErrorInput');
+      }
 
       $scope.userData = function(){
-        if($scope.user.email == undefined || $scope.user.email == null){
+        console.log('$scope.user', $scope.user);
+        if ($scope.user.companyName == '') {
+          $scope.comnayNameInvalid = true;
+          $('.companyNameError').addClass('customErrorInput');
+        }else if ($scope.user.email == '') {
+          $scope.emailInvalid = true;
+          $('.emailIdError').addClass('customErrorInput');
+        }else if ($scope.user.password == '') {
+          $scope.passwordInvalid = true;
+          $('.invalidPassword').addClass('customErrorInput');
+        }else{
+          if($scope.status == true){
+            $scope.user.status = 'active';
+          }else{
+            $scope.user.status = 'inactive';
+          }
+          $scope.user.username = $scope.user.email;
+          $scope.user.userType = 'fbo';
+          console.log($scope.user)
+          var formdata = "companyName=" + $scope.user.companyName + "&email=" + $scope.user.email + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&password=" + $scope.user.password + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&clientNote=" + $scope.user.clientNote;
+          FBOAdmin.registerUser(formdata).then(function(result) {
+            toastr.success('Created Successfully', {
+                closeButton: true
+            })
+            $scope.feature.accountId = result;
+            var featureControlData = "accountId=" + $scope.feature.accountId + "&level=" + $scope.feature.level + "&essintaPosSystem=" + $scope.feature.essintaPosSystem 
+            + "&acuQuote=" + $scope.feature.acuQuote + "&acuTrack=" + $scope.feature.acuTrack + "&fuelProgram=" + $scope.feature.fuelProgram + "&amstatIntegration=" + $scope.feature.amstatIntegration+ "&posAccountingIntegration=" 
+            + $scope.feature.posAccountingIntegration + "&posVeederRootIntegration=" + $scope.feature.posVeederRootIntegration 
+            + "&essintaAccountUid=" + $scope.feature.essintaAccountUid + "&additionalLicences=" + $scope.feature.additionalLicences;
+            
+            FBOAdmin.featureControl(featureControlData).then(function(response) {
+              console.log(response)
+                
+            })
+            $state.go('index.fboAdmin');
+          }, function (err) {
+              toastr.error('Error in registeration', {
+                closeButton: true
+              })
+          });
+        }
+        /*if($scope.user.email == ''){
           toastr.error('Please enter your email first', {
             closeButton: true
           })
@@ -75,7 +135,7 @@
                 closeButton: true
               })
           });
-        }
+        }*/
           
       }
 
diff --git a/app/views/fbo-admin/dashboard.html b/app/views/fbo-admin/dashboard.html
index b25da29..1ce7a3a 100644
--- a/app/views/fbo-admin/dashboard.html
+++ b/app/views/fbo-admin/dashboard.html
@@ -1,8 +1,25 @@
+<style type="text/css">
+    .customErrorMessage{
+        color: #8a1f11;
+        font-weight: bold;
+        margin-left: 10px;
+    }
+    .customErrorInput{
+        background-color: rgb(251, 227, 228);
+        border: 1px solid #fbc2c4;
+            color: #8a1f11;
+    }
+</style>
+
 </div>
     <div class="row wrapper border-bottom white-bg page-heading">
         <div class="col-lg-8">
             <!-- <h2 ng-click="editName()" ng-show="showCompany" style="cursor: pointer;">Tellus Institute</h2> -->
-            <div style="margin-top: 20px;"><input type="text" style="width:50%;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control"></div>
+            <div style="margin-top: 20px;">
+                <input type="text" style="width:50%; float: left;" placeholder="Enter Company Name" ng-model="user.companyName" class="form-control companyNameError" ng-keyup="companyNameValid()">
+                <label class="customErrorMessage" ng-show="comnayNameInvalid" style="margin-top: 7px;">This field is required.</label>
+                <div class="clearfix"></div>
+            </div>
         </div>
         <div class="col-lg-4" style="margin-top: 20px; text-align: right;">
             <button type="button" class="btn btn-default btn-sm" ui-sref="index.fboAdmin">Cancel</button>
@@ -36,9 +53,19 @@
                         <form role="form">
                             <div class="col-sm-6 b-r">
                                     <!-- <div class="form-group"><label>Company Name</label> <input type="text" placeholder="Company Name" ng-model="user.companyName" class="form-control"></div> -->
-                                    <div class="form-group"><label>Email Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control" ng-blur="checkUsername()"></div>
-                                    <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
-                                    <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
+                                    <div class="form-group">
+                                        <label>Email Username</label> 
+                                        <label class="customErrorMessage" ng-show="emailInvalid">This field is required.</label>
+                                        <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control emailIdError" ng-blur="checkUsername()" ng-keyup="emailValid()">
+                                    </div>
+                                    <div class="form-group">
+                                        <label>First Name</label> 
+                                        <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control">
+                                    </div>
+                                    <div class="form-group">
+                                        <label>Last Name</label> 
+                                        <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control">
+                                    </div>
                                     <!-- <div>
                                         <button class="btn btn-sm btn-primary pull-right m-t-n-xs" type="submit"><strong>Log in</strong></button>
                                         <label> <input type="checkbox" class="i-checks"> Remember me </label>
@@ -46,9 +73,19 @@
                                 
                             </div>
                             <div class="col-sm-6">
-                                <div class="form-group"><label>Password</label> <input type="password" ng-model="user.password" placeholder="Password" class="form-control"></div>
-                                <div class="form-group"><label>Phone</label> <input type="number" ng-model="user.phone" placeholder="Phone" class="form-control"></div>
-                                <div class="form-group"><label>Mobile</label> <input type="number" ng-model="user.mobile" placeholder="Mobile" class="form-control"></div>
+                                <div class="form-group">
+                                    <label>Password</label> 
+                                    <label class="customErrorMessage" ng-show="passwordInvalid">This field is required.</label>
+                                    <input type="password" ng-model="user.password" placeholder="Password" class="form-control invalidPassword" ng-keyup="passwordValid()">
+                                </div>
+                                <div class="form-group">
+                                    <label>Phone</label> 
+                                    <input type="number" ng-model="user.phone" placeholder="Phone" class="form-control">
+                                </div>
+                                <div class="form-group">
+                                    <label>Mobile</label> 
+                                    <input type="number" ng-model="user.mobile" placeholder="Mobile" class="form-control">
+                                </div>
                             </div>
                         </form>
                     </div>
-- 
2.0.0