Merge pull request #50 from huangqun/dev

More Fixes

Author: ajefts

src/app/billing_account_resources/billingaccountresources.list.html

@@ -2,6 +2,9 @@
     <!-- add client button row -->
     <div class="row">
         <div class="col col-md-12 col-lg-12">
+            <a class="btn btn-primary pull-right m-b" ui-sref="index.billingaccounts.list" style="margin-left: 20px">
+                <strong>Back</strong>
+            </a>
             <a class="btn btn-info pull-right m-b" ui-sref="index.billingaccountresources.new({accountId: billingAccountId})">
                 <strong><i class="fa fa-plus"></i> Add Resource</strong>
             </a>

src/app/billing_account_resources/billingaccountresources.new.html

@@ -7,7 +7,7 @@
                         <div class="row">
                             <div class="form-group col-md-6" ng-class="{'has-error': addResourceForm.name.$touched && addResourceForm.name.$invalid}">
                                 <label for="resource-name">TC Handle</label>
-                                <input id="resource-name" type="text" class="form-control" ng-model="newResource.name" name="name" required="required" placeholder="Handle">
+                                <input id="resource-name" type="text" data-find-user class="form-control" ng-model="newResource.name" name="name" required="required" placeholder="Handle">
                             </div>
                             <div class="form-group col-md-6" ng-class="{'has-error': addResourceForm.status.$touched && addResourceForm.status.$invalid}">
                                 <label for="resource-status">Status</label>
@@ -21,7 +21,7 @@
                         <div class="row">
                             <div class="form-group col-md-12" ng-class="{'has-error': addResourceForm.userId.$touched && addResourceForm.userId.$invalid}">
                                 <label for="resource-user-id">User ID</label>
-                                <input id="resource-user-id" type="text" class="form-control" ng-model="newResource.userId" name="userId" required="required" placeholder="User ID">
+                                <input id="resource-user-id" type="text" class="form-control" ng-model="newResource.userId" name="userId" required="required" placeholder="User ID" disabled="disabled">
                             </div>
                         </div>
                         <div class="row ">

src/app/billing_accounts/billingaccounts.list.controller.js

@@ -32,6 +32,7 @@ module.controller('billingaccount.BillingAccountsListController', ['$scope', '$r
       $scope.accounts = [];
 
       $scope.search = function () {
+        $scope.formSearch.setLoading(true);
         BillingAccountService.search({
           customer: $scope.formSearch.criteria.customer,
           user: $scope.formSearch.criteria.user,

src/app/clients/clients.edit.html

@@ -11,7 +11,7 @@
                             </div>
                             <div class="form-group col-md-6" ng-class="{'has-error': editClientForm.codeName.$touched && editClientForm.codeName.$invalid}">
                                 <label for="client-code-name">Code Name</label>
-                                <input id="client-code-name" type="text" class="form-control" ng-model="client.codeName" name="codeName" required="required">
+                                <input id="client-code-name" type="text" class="form-control" ng-model="client.codeName" name="codeName">
                             </div>
                         </div>
                         <div class="row">

src/app/clients/clients.new.html

@@ -11,7 +11,7 @@
                             </div>
                             <div class="form-group col-md-6" ng-class="{'has-error': addClientForm.codeName.$touched && addClientForm.codeName.$invalid}">
                                 <label for="client-code-name">Code Name</label>
-                                <input id="client-code-name" type="text" class="form-control" ng-model="newClient.codeName" name="codeName" required="required">
+                                <input id="client-code-name" type="text" class="form-control" ng-model="newClient.codeName" name="codeName">
                             </div>
                         </div>
                         <div class="row">

src/app/directives.js

@@ -38,6 +38,29 @@ angular.module('supportAdminApp')
             }
         };
     })
+    .directive('findUser', function (UserService, Alert, $rootScope) {
+        return {
+            restrict: 'A',
+            link: function (scope, element, attributes) {
+                element.on('blur', function () {
+                    var handle = $(this).val();
+                    if (handle && handle.length) {
+                        UserService.find({
+                            filter: 'handle=' + handle
+                        }).then(function (data) {
+                            var id = '';
+                            if (data.length) {
+                                id = data[0].id;
+                            } else {
+                                Alert.error('Can not find ID with handle : ' + handle, $rootScope);
+                            }
+                            scope.newResource.userId = id;
+                        })
+                    }
+                });
+            }
+        };
+    })
     // disable keyboard input event on single element
     .directive('disableKeyboard', function () {
         return {