viithiisys / adminAcufuel

Browse Code »

Commit bdc73f777e4fdd2eb4e6f38801c41beff6738881

Authored by Swarn Singh 2017-05-23 06:55:20 -0400

1 parent 089f3a3c29

Exists in master

validation issue resolved

Showing 2 changed files with 106 additions and 9 deletions Show diff stats

app/views/fbo-admin/dashboard.controller.js

Diff comments View file @bdc73f7

 'use strict';
  //Load controller
   angular.module('acuefuel')
 	.controller('DashboardController', function($scope, $state, FBOAdmin) {
 	    $(document).ready(function(){
           $('.i-checks').iCheck({
               checkboxClass: 'icheckbox_square-green',
               radioClass: 'iradio_square-green',
           });
           $('.fboadmin').addClass('active');
       });
     	$scope.userName = 'Dylan Goodwin';
       $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;
       $scope.feature.acuQuote = false;
       $scope.feature.acuTrack = false;
       $scope.feature.fuelProgram = false;
       $scope.feature.amstatIntegration = false;
       $scope.feature.posAccountingIntegration = false;
       $scope.feature.posVeederRootIntegration = false;
       $scope.checkUsername = function(){
         FBOAdmin.checkUsernameEmail($scope.user.email).then(function(status) {
           console.log(status)
           if(status != 200){
             toastr.error('This email has alreay taken', {
               closeButton: true
             })
           }
         })
       }
+      $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
           })
         }else if($scope.user.firstName == undefined || $scope.user.firstName == null){
           toastr.error('Please enter your First Name', {
             closeButton: true
           })
         }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
               })
           });
-        }
+        }*/
       }
       $scope.enableEssId = function(){
           if($scope.feature.essintaPosSystem == true){
             $scope.essAccountId = false;
             $("#esAccId").css({ opacity: 1 });
           }else{
             $scope.essAccountId = true;
             delete $scope.feature.essintaAccountUid;
             $("#esAccId").css({ opacity: 0.5 });
           }
       }
     });

app/views/fbo-admin/dashboard.html

Diff comments View file @bdc73f7

+<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>
             <button type="button" class="btn btn-primary btn-sm" ng-click="userData()">Save Changes</button>
         </div>
     </div>
 </div>
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
         <div class="col-lg-7">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <div class="pull-left">
                         <h5>Contact Information</h5>
                     </div>
                     <div class="pull-right my-toggle-switch">
                         <div class="switch">
                             <div class="onoffswitch">
                                 <input type="checkbox" ng-checked="status === true" ng-model="status" ng-init="status = true" class="onoffswitch-checkbox" id="example1">
                                 <label class="onoffswitch-label" for="example1">
                                     <span class="onoffswitch-inner"></span>
                                     <span class="onoffswitch-switch"></span>
                                 </label>
                             </div>
                         </div>
                     </div>
                     <div class="clearfix"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <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">
-                                    <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div>
+                                        <label>Email Username</label>
-                                    <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div>
+                                        <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>
                                     </div> -->
                             </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">
-                                <div class="form-group"><label>Phone</label> <input type="number" ng-model="user.phone" placeholder="Phone" class="form-control"></div>
+                                    <label>Password</label>
-                                <div class="form-group"><label>Mobile</label> <input type="number" ng-model="user.mobile" placeholder="Mobile" class="form-control"></div>
+                                    <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>
                 </div>
             </div>
         </div>
         <div class="col-lg-5">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
                     <h5>Client Notes</h5>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <textarea class="form-control" rows="10" ng-model="user.clientNote" id="comment"></textarea>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <div class="wrapper wrapper-content animated fadeInRight">
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox float-e-margins">
                 <div class="ibox-title" style="padding: 5px 15px 5px 15px;">
                     <div class="col-lg-8">
                         <h5 style="line-height: 34px;margin-bottom: 0;">Feature Account Control</h5>
                     </div>
                     <div class="col-lg-4">
                         <div class="form-group">
                             <label class="col-sm-2 control-label" style="line-height: 34px;margin-bottom: 0;">Level</label>
                             <div class="col-sm-10">
                                 <select class="form-control m-b" name="account" ng-model="feature.level" style="margin-bottom: 0;">
                                     <option value="silver" selected>Silver</option>
                                     <option value="gold">Gold</option>
                                 </select>
                             </div>
                         </div>
                     </div>
                     <div class="clearfix"></div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
                         <form role="form">
                             <div class="col-lg-3">
                                 <label style="color: #1ab394;">Modularized</label>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-change="enableEssId()" ng-model="feature.essintaPosSystem" icheck> Essinta POS system </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.acuQuote" icheck> AcuQuote </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.acuTrack" icheck> AcuTrack </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.fuelProgram" icheck> Fuel Program </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.amstatIntegration" icheck> AMSTAT Integration </label>
                                 </div>
                                  <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.posAccountingIntegration" icheck> POS Accounting Integration </label>
                                 </div>
                                 <div>
                                     <label> <input type="checkbox" class="i-checks" ng-model="feature.posVeederRootIntegration" icheck> POS VeederRoot Integration </label>
                                 </div>
                             </div>
                             <div class="col-lg-9" style="padding: 0;">
                                 <div class="col-lg-6">
                                     <div class="form-group" style="margin-top: 18px;" id="esAccId">
                                         <label class="control-label pull-left" style="color: #1ab394;line-height: 34px;">Essinta Account UID</label>
                                         <div class="col-lg-6">
                                             <input type="text" placeholder="" ng-disabled="essAccountId" style="border-color: #1ab394;" class="form-control" ng-model="feature.essintaAccountUid">
                                         </div>
                                     </div>
                                 </div>
                                 <div class="col-lg-6">
                                     <div class="form-group" style="margin-top: 18px;">
                                         <label class="control-label pull-left" style="color: #ffa149;line-height: 34px;">Additional Device Licences</label>
                                         <div class="col-lg-6">
                                             <input type="text" placeholder="" style="border-color: #ffa149 !important;" ng-model="feature.additionalLicences" class="form-control">
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </form>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>