From 3423d3f3778ab3fedf69f2002ec736bebaeb2f7b Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Tue, 22 Nov 2016 17:00:26 +0530
Subject: [PATCH 1/2] resolved issues with the injecting dependencies.

---
 client/cat3/main.html                                        | 5 ++---
 client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js | 2 +-
 .../sections/dashboard/bots/controller/audittrailCtrl.js     | 2 +-
 .../sections/dashboard/bots/controller/libraryCtrl.js        | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/cat3/main.html b/client/cat3/main.html
index e65a5f86b..747bfcd47 100644
--- a/client/cat3/main.html
+++ b/client/cat3/main.html
@@ -108,12 +108,11 @@
 		<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/analytics/controller/usageCtrl.js"></script>
-        <script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/botsCtrl.js"></script>
-		<script src="src/partials/sections/dashboard/bots/controller/editParamsCtrl.js"></script>
-		
 		<script src="src/partials/sections/dashboard/bots/controller/audittrailCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/bots/controller/botLogsCtrl.js"></script>
+        <script src="src/partials/sections/dashboard/bots/controller/libraryCtrl.js"></script>
+		<script src="src/partials/sections/dashboard/bots/controller/editParamsCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/aDesignCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/controllers/addDockerTemplateCtrl.js"></script>
 		<script src="src/partials/sections/dashboard/design/controllers/appUrlCreateCtrl.js"></script>
diff --git a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js
index c63b895b8..8aa97d902 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/botsCtrl.js
@@ -7,7 +7,7 @@
 
 (function (angular) {
 	"use strict";
-	angular.module('dashboard.bots', ['library.bots', 'chefDataFormatter']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) {
+	angular.module('dashboard.bots', ['library.bots','library.params']).config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) {
 		var modulePerms = modulePermissionProvider.$get();
 		$stateProvider.state('dashboard.bots.library', {
 			url: "/library",
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
index f5abb6b81..3bb734e9a 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
@@ -7,7 +7,7 @@
 
 (function (angular) {
     "use strict";
-    angular.module('library.bots',[])
+    angular.module('dashboard.bots')
     .controller('audittrailCtrl',['$scope', '$rootScope', '$http', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', '$modal', 
     function ($scope, $rootScope, $http, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils, $modal) {
         var audit=this;
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 64b201432..0f9385150 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -7,7 +7,7 @@
 
 (function (angular) {
     "use strict";
-    angular.module('library.bots', ['library.params'])
+    angular.module('dashboard.bots')
     .controller('libraryCtrl',['$scope', '$rootScope', '$http', '$state', 'genericServices', 'confirmbox', 'workzoneServices', 'toastr', 'workzoneUIUtils', function ($scope, $rootScope, $http, $state, genSevs, confirmbox, workzoneServices, toastr, workzoneUIUtils) {
         var treeNames = ['Bots','Library'];
         $rootScope.$emit('treeNameUpdate', treeNames);

From a5656a8c0ec810cc453952e9508cac0280bb9eff Mon Sep 17 00:00:00 2001
From: Divakar Konakalla <divakar.konakalla@relevancelab.com>
Date: Tue, 22 Nov 2016 17:05:09 +0530
Subject: [PATCH 2/2] added display name property to show ui grid header values
 properly.

---
 .../sections/dashboard/bots/controller/audittrailCtrl.js  | 4 ++--
 .../sections/dashboard/bots/controller/libraryCtrl.js     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
index 3bb734e9a..da317cc3b 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/audittrailCtrl.js
@@ -23,8 +23,8 @@
                     cellTemplate:'<span title="{{row.entity.startedOn  | timestampToLocaleTime}}">{{row.entity.startedOn  | timestampToLocaleTime}}</span>', cellTooltip: true},
                 { name: 'End Time',field:'endedOn',
                     cellTemplate:'<span title="{{row.entity.endedOn  | timestampToLocaleTime}}">{{row.entity.endedOn  | timestampToLocaleTime}}</span>', cellTooltip: true},
-                { name: 'BOT Type',field:'auditTrailConfig.type'},
-                { name: 'BOT Name',field:'auditTrailConfig.name'},
+                { name: 'BOT Type',displayName: 'BOT Type',field:'auditTrailConfig.type'},
+                { name: 'BOT Name',displayName: 'BOT Name',field:'auditTrailConfig.name'},
                 { name: 'Status',field:'status'},
                 { name: 'Org',field:'masterDetails.orgName'},
                 { name: 'BU',field:'masterDetails.bgName'},
diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
index 0f9385150..7465e3e7f 100644
--- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js
@@ -24,13 +24,13 @@
                     '<img src="images/orchestration/jenkins.png" ng-show="row.entity.taskType==\'jenkins\'" alt="row.entity.taskType" title="Jenkins" class="task-type-img" />'+
                     '<img src="images/orchestration/script.jpg" ng-show="row.entity.taskType==\'script\'" alt="row.entity.taskType" title="Script" class="task-type-img" />'+
                     '<img src="images/devops-roles/devopsRole1.png" ng-show="row.entity.blueprintType" alt="row.entity.botType" title="Blueprint" class="task-type-img" />',cellTooltip: true},
-                { name: 'BOT Type',field:'botType'},
-                { name: 'BOT Name',field:'name'},
+                { name: 'BOT Type',displayName: 'BOT Type',field:'botType'},
+                { name: 'BOT Name',displayName: 'BOT Name',field:'name'},
                 { name: 'Category',field:'botCategory'},
                 { name: 'description',field:'shortDesc'},
-                { name: 'BOT History',cellTemplate:'<span ng-show="row.entity.blueprintType">NA</span>'+
+                { name: 'BOT History',displayName: 'BOT History',cellTemplate:'<span ng-show="row.entity.blueprintType">NA</span>'+
                         '<span class="btn cat-btn-update control-panel-button" title="History" ng-show="row.entity.taskType" ng-click="grid.appScope.botLogs(row.entity);"><i class="fa fa-header white"></i></span>'},
-                { name: 'BOT Action',cellTemplate:'<span class="btn cat-btn-update control-panel-button" title="Execute" ng-click="grid.appScope.launchInstance(row.entity);"><i class="fa fa-play white"></i></span>' +
+                { name: 'BOT Action',displayName: 'BOT Action',cellTemplate:'<span class="btn cat-btn-update control-panel-button" title="Execute" ng-click="grid.appScope.launchInstance(row.entity);"><i class="fa fa-play white"></i></span>' +
                     '<span class="btn btn-danger control-panel-button" title="Delete Task" ng-show="row.entity.taskType" ng-click="grid.appScope.deleteBotTask(row.entity);"><i class="fa fa-trash-o white"></i></span>' + 
                     '<span class="btn btn-danger control-panel-button" title="Delete Blueprint" ng-show="row.entity.blueprintType" ng-click="grid.appScope.deleteBotBP(row.entity);"><i class="fa fa-trash-o white"></i></span>'
                 }