Index: /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.controller.js
===================================================================
--- /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.controller.js	(revision 2469)
+++ /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb.controller.js	(working copy)
@@ -170,31 +170,36 @@
                         dashboardService.getLLBStatistics(payload).then(function (res) {
                             serviceViewModel.loading = false;
                             if (res && res.status === 200) {
-                                if (res.data.results.length > 0) {
-                                    _.each(res.data.results[0].series, function (series) {
-                                        let device_ip = series.tags.agent_host;
-                                        if (deviceMap[device_ip]) {
-                                            _.each(series.values, function (data) {
-                                                let thresholdValue = parseInt(data[2]);
-                                                thresholdValue = formatBytes(thresholdValue * 1024); // Threshold value in kbps
-                                                llbList.push({
-                                                    "deviceIp": series.tags.agent_host,
-                                                    "linkName": series.tags.linkName,
-                                                    "linkGateway": data[1],
-                                                    "linkStatus": series.tags.linkStatus,
-                                                    "linkThresh": thresholdValue,
-                                                    "linkUsage": data[3],
-                                                    "received": storageService.ValueFormat1024(data[4] == null ? 0 : data[4]) + 'bps',
-                                                    "sent": storageService.ValueFormat1024(data[5] == null ? 0 : data[5]) + 'bps',
-                                                    "linkConn": data[6],
-                                                    "linkHits": data[7],
-                                                })
-                                                serviceViewModel.concurrentConnections += data[6];
-                                                serviceViewModel.totalHits += data[7];
-                                                serviceViewModel.totalReceived += data[4] == null ? 0 : data[4];
-                                                serviceViewModel.totalSent += data[5] == null ? 0 : data[5];
-                                            })
-                                        }
+                                if (res.data.length > 0) {
+                                    _.each(res.data, function (linkMetric) {
+                                        let llbMetric = [];
+                                        let linkMetricValues = linkMetric.values[0];
+
+                                        let thresholdValue = parseInt(linkMetricValues[2]);
+                                        thresholdValue = formatBytes(thresholdValue * 1024); // Threshold value in kbps
+                                        llbMetric.push(linkMetric.agent_host)
+                                        llbMetric.push(linkMetric.linkName)
+                                        llbMetric.push(linkMetric.linkStatus)
+                                        llbMetric.push(thresholdValue)
+                                        llbMetric = llbMetric.concat(linkMetricValues);
+                                        llbMetric[8] = storageService.ValueFormat1024(linkMetricValues[4] == null ? 0 : linkMetricValues[4]) + 'bps';
+                                        llbMetric[9] = storageService.ValueFormat1024(linkMetricValues[5] == null ? 0 : linkMetricValues[5]) + 'bps';
+                                        llbList.push({
+                                            "deviceIp": llbMetric[0],
+                                            "linkName": llbMetric[1],
+                                            "linkGateway": llbMetric[5],
+                                            "linkStatus": llbMetric[2],
+                                            "linkThresh": llbMetric[3],
+                                            "linkUsage": llbMetric[7],
+                                            "received": llbMetric[8],
+                                            "sent": llbMetric[9],
+                                            "linkConn": llbMetric[10],
+                                            "linkHits": llbMetric[11],
+                                        })
+                                        serviceViewModel.concurrentConnections += linkMetricValues[6];
+                                        serviceViewModel.totalHits += linkMetricValues[7];
+                                        serviceViewModel.totalReceived += linkMetricValues[4] == null ? 0 : linkMetricValues[4];
+                                        serviceViewModel.totalSent += linkMetricValues[5] == null ? 0 : linkMetricValues[5];
                                     })
                                 }
                                 serviceViewModel.llbList = llbList;
@@ -222,5 +227,3 @@
         }
     ])
 
-
-
Index: /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb_details.controller.js
===================================================================
--- /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb_details.controller.js	(revision 2469)
+++ /branches/amp_3_7/extensions/monitoring/webui/resource/llb/llb_details.controller.js	(working copy)
@@ -81,7 +81,7 @@
             });
 
             let throughputChartOptions = {
-                title: { text: " " },
+                title: {text: " "},
                 tooltip: {
                     "trigger": "axis",
                     "formatter": function (params) {
@@ -99,11 +99,18 @@
                         return tipText;
                     }
                 },
-                legend: { "formatter": textLabelFormatter(15) },
-                grid: { "left": "6%", "top": "50px", "bottom": "5%", "containLabel": true },
-                xAxis: [{ "name": 'Time', "type": "time", "axisLabel": {}, "splitNumber": 5, "minInterval": 60000, "splitLine": { "show": false } }],
-                yAxis: [{ "name": 'Throughput', "nameTextStyle": { "padding": [0, 0, 0, 30] }, "axisLabel": {}}],
-                dataZoom: { type: 'inside' },
+                legend: {"formatter": textLabelFormatter(15)},
+                grid: {"left": "6%", "top": "50px", "bottom": "5%", "containLabel": true},
+                xAxis: [{
+                    "name": 'Time',
+                    "type": "time",
+                    "axisLabel": {},
+                    "splitNumber": 5,
+                    "minInterval": 60000,
+                    "splitLine": {"show": false}
+                }],
+                yAxis: [{"name": 'Throughput', "nameTextStyle": {"padding": [0, 0, 0, 30]}, "axisLabel": {}}],
+                dataZoom: {type: 'inside'},
                 backgroundColor: this.backgroundColor,
                 series: [
                     {
@@ -123,13 +130,15 @@
                 ]
             };
             let usageChartOptions = {
-                title: { text: " " },
+                title: {text: " "},
                 tooltip: {
                     "trigger": "axis",
                     "formatter": function (params) {
                         let tipText = "";
                         for (let x = 0; x < params.length; x++) {
-                            if (x === 0) { tipText += params[x].axisValueLabel; }
+                            if (x === 0) {
+                                tipText += params[x].axisValueLabel;
+                            }
                             let value = params[x].value[1];
                             if (value != null) {
                                 value += "%";
@@ -139,11 +148,23 @@
                         return tipText;
                     }
                 },
-                legend: { "formatter": textLabelFormatter(15) },
-                grid: { "left": "6%", "top": "50px", "bottom": "5%", "containLabel": true },
-                xAxis: [{ "name": 'Time', "type": "time", "axisLabel": {}, "splitNumber": 5, "minInterval": 60000, "splitLine": { "show": false } }],
-                yAxis: [{ "name": 'Usage', "nameTextStyle": { "padding": [0, 0, 0, 30] }, "axisLabel": {}, "splitLine": { "show": false, } }],
-                dataZoom: { type: 'inside' },
+                legend: {"formatter": textLabelFormatter(15)},
+                grid: {"left": "6%", "top": "50px", "bottom": "5%", "containLabel": true},
+                xAxis: [{
+                    "name": 'Time',
+                    "type": "time",
+                    "axisLabel": {},
+                    "splitNumber": 5,
+                    "minInterval": 60000,
+                    "splitLine": {"show": false}
+                }],
+                yAxis: [{
+                    "name": 'Usage',
+                    "nameTextStyle": {"padding": [0, 0, 0, 30]},
+                    "axisLabel": {},
+                    "splitLine": {"show": false,}
+                }],
+                dataZoom: {type: 'inside'},
                 backgroundColor: this.backgroundColor,
                 series: [
                     {
@@ -155,13 +176,25 @@
                 ]
             };
             let connectionsChartOptions = {
-                title: { text: " " },
-                tooltip: { "trigger": "axis" },
-                legend: { "formatter": textLabelFormatter(15) },
-                grid: { "left": "6%", "top": "50px", "bottom": "5%", "containLabel": true },
-                xAxis: [{ "name": 'Time', "type": "time", "axisLabel": {}, "splitNumber": 5, "minInterval": 60000, "splitLine": { "show": false } }],
-                yAxis: [{ "name": 'Connections', "nameTextStyle": { "padding": [0, 0, 0, 30] }, "axisLabel": {}, "splitLine": { "show": false, } }],
-                dataZoom: { type: 'inside' },
+                title: {text: " "},
+                tooltip: {"trigger": "axis"},
+                legend: {"formatter": textLabelFormatter(15)},
+                grid: {"left": "6%", "top": "50px", "bottom": "5%", "containLabel": true},
+                xAxis: [{
+                    "name": 'Time',
+                    "type": "time",
+                    "axisLabel": {},
+                    "splitNumber": 5,
+                    "minInterval": 60000,
+                    "splitLine": {"show": false}
+                }],
+                yAxis: [{
+                    "name": 'Connections',
+                    "nameTextStyle": {"padding": [0, 0, 0, 30]},
+                    "axisLabel": {},
+                    "splitLine": {"show": false,}
+                }],
+                dataZoom: {type: 'inside'},
                 backgroundColor: this.backgroundColor,
                 series: [
                     {
@@ -173,13 +206,25 @@
                 ]
             };
             let hitsChartOptions = {
-                title: { text: " " },
-                tooltip: { "trigger": "axis" },
-                legend: { "formatter": textLabelFormatter(15) },
-                grid: { "left": "6%", "top": "50px", "bottom": "5%", "containLabel": true },
-                xAxis: [{ "name": 'Time', "type": "time", "axisLabel": {}, "splitNumber": 5, "minInterval": 60000, "splitLine": { "show": false } }],
-                yAxis: [{ "name": 'Total Hits', "nameTextStyle": { "padding": [0, 0, 0, 30] }, "axisLabel": {}, "splitLine": { "show": false, } }],
-                dataZoom: { type: 'inside' },
+                title: {text: " "},
+                tooltip: {"trigger": "axis"},
+                legend: {"formatter": textLabelFormatter(15)},
+                grid: {"left": "6%", "top": "50px", "bottom": "5%", "containLabel": true},
+                xAxis: [{
+                    "name": 'Time',
+                    "type": "time",
+                    "axisLabel": {},
+                    "splitNumber": 5,
+                    "minInterval": 60000,
+                    "splitLine": {"show": false}
+                }],
+                yAxis: [{
+                    "name": 'Total Hits',
+                    "nameTextStyle": {"padding": [0, 0, 0, 30]},
+                    "axisLabel": {},
+                    "splitLine": {"show": false,}
+                }],
+                dataZoom: {type: 'inside'},
                 backgroundColor: this.backgroundColor,
                 series: [
                     {
@@ -271,7 +316,7 @@
                     to: modalViewModel.time.to,
                 }).then(function (res) {
                     if (res && res.status === 200) {
-                        modalViewModel.llbStatistics = res.data.results[0].series[0];
+                        modalViewModel.llbStatistics = res.data[0];
                         modalViewModel.llbStatistics = modalViewModel.llbStatistics['values'];
                     }
                     modalViewModel.llbStatistics.forEach(function (stats) {
@@ -303,11 +348,11 @@
                 })
             }
 
-            $scope.stop = function() {
+            $scope.stop = function () {
                 clearInterval(modalViewModel.interval);
             };
 
-            $scope.$on('$destroy', function() {
+            $scope.$on('$destroy', function () {
                 $scope.stop();
             });
 
Index: /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js
===================================================================
--- /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js	(revision 2469)
+++ /branches/amp_3_7/extensions/monitoring/webui/resource/resource.service.js	(working copy)
@@ -2176,7 +2176,7 @@
             };
 
             function getLLBMonitoringStatistics(payload) {
-                let url = '/llb/graph_data';
+                let url = '/llb/stats/historical';
                 let post_data = {
                     query: {
                         "from_time": payload.from,
@@ -2189,3 +2189,4 @@
         }
     ]);
 
+
Index: /branches/amp_3_7/extensions/monitoring/webui/resource/sslvpn/sslvpn.controller.js
===================================================================
--- /branches/amp_3_7/extensions/monitoring/webui/resource/sslvpn/sslvpn.controller.js	(revision 2469)
+++ /branches/amp_3_7/extensions/monitoring/webui/resource/sslvpn/sslvpn.controller.js	(working copy)
@@ -162,7 +162,7 @@
                         }
                     }
                     if ((isDeviceAdmin && agentHost !== '') || !isDeviceAdmin) {
-                        dashboardService.composer_qurty(payload).then(function (res) {
+                        dashboardService.composer_query(payload).then(function (res) {
                             serviceViewModel.loading = false;
                             if (res && res.status === 200) {
                                 if (res.data.results.length > 0) {
@@ -200,3 +200,4 @@
         }
     ])
 
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.controller.js
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.controller.js	(revision 2469)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.controller.js	(working copy)
@@ -96,7 +96,7 @@
                     level :'config',
                     passwords: user.passwords,
                     email: user.email,
-                    phone_num: user.phone_num
+                    phone_num: user.phone_num ? user.phone_num : 0,
                 };
 
                 var modalInstance = $uibModal.open({
@@ -215,3 +215,4 @@
         }
     ]);
 
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.html
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.html	(revision 2469)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/administrator/userMgmt/userMgmt.html	(working copy)
@@ -25,7 +25,6 @@
                         <th class="d-type">{{ 'Type' | T }}</th>
                         <th class="d-type">{{ 'Role Name' | T }}</th>
                         <th class="d-name">{{ 'Email' | T }}</th>
-                        <th class="d-action">{{ 'Phone' | T }}</th>
                         <th class="d-action">{{ 'Action' | T }}</th>
                     </tr>
                     <tr>
@@ -37,8 +36,6 @@
                         <th></th>
                         <th><input st-search="email" placeholder="{{'Search by Email'|T}}" class="input-sm form-control"
                                    type="text"/></th>
-                        <th><input st-search="phone_num" placeholder="{{'Search by Phone'|T}}"
-                                   class="input-sm form-control" type="text"/></th>
                         <th></th>
                     </tr>
                     </thead>
@@ -59,7 +56,6 @@
                         <td ng-if="user.role_id == '0' && !user.root"><span>Common Admin</span></td>
                         <td><span ng-if="user.role_name">{{ user.role_name }}</span></td>
                         <td>{{ user.email }}</td>
-                        <td>{{ user.phone_num }}</td>
                         <td ng-if="userMgmt.show_action_button(user)">
                             <button class="btn-link" title="{{ 'Edit' | T }}" ng-click="userMgmt.editUserInfo(user)"><i
                                 class="array-edit"></i></button>
@@ -102,3 +98,4 @@
         opacity: 0;
     }
 </style>
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js	(revision 2469)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.controller.js	(working copy)
@@ -1,4 +1,4 @@
-ngular
+angular
     .module('cm.dashboard')
     .controller('monitorOverviewCtrl', [
         '$scope',
@@ -270,41 +270,16 @@
                 dashboardService.getLLBMonitoringStatistics(payload).then(function (res) {
                     overviewModel.llbLoading = false;
                     if (res && res.status === 200) {
-                        let hitsList = []
-                        if (res.data.results[0].series) {
-                            _.each(res.data.results[0].series[0].values, function (value) {
-                                hitsList.push({
-                                    'hits': value[1],
-                                    'name': value[2],
-                                    'device_ip': value[3],
-                                })
-                            })
+                        if (res.data[0]) {
+                            overviewModel.llbLists.hitsList = res.data[0].values;
                         }
-                        overviewModel.llbLists.hitsList = hitsList;
-
                         let connectionsList = [];
-                        if (res.data.results[1].series) {
-                            _.each(res.data.results[1].series[0].values, function (value) {
-                                connectionsList.push({
-                                    'connections': value[1],
-                                    'name': value[2],
-                                    'device_ip': value[3],
-                                })
-                            })
+                        if (res.data[1]) {
+                            overviewModel.llbLists.connectionsList = res.data[1].values;
                         }
-                        overviewModel.llbLists.connectionsList = connectionsList;
-                        let throughputList = [];
-                        if (res.data.results[1].series) {
-                            _.each(res.data.results[2].series[0].values, function (value) {
-                                throughputList.push({
-                                    'received': storageService.ValueFormat1024(value[2]) + 'bps',
-                                    'sent': storageService.ValueFormat1024(value[3]) + 'bps',
-                                    'name': value[4],
-                                    'device_ip': value[5],
-                                })
-                            })
+                        if (res.data[2]) {
+                            overviewModel.llbLists.throughputList = res.data[2].values
                         }
-                        overviewModel.llbLists.throughputList = throughputList
                     }
                 });
             }
@@ -921,3 +896,4 @@
     }])
 
 
+
Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html	(revision 2469)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/dashboard/overview/overview.html	(working copy)
@@ -477,8 +477,8 @@
                             </tr>
                             <tr ng-repeat="item in monitorOverview.llbLists.hitsList">
                                 <td class="num">{{$index + 1}}</td>
-                                <td style="cursor: pointer;" ui-sref="index.monitoring.resource.llb"><a class="name">{{ item.name }}</a></td>
-                                <td><span class="label label-default">{{item.hits}}</span></td>
+                                <td style="cursor: pointer;" ui-sref="index.monitoring.resource.llb"><a class="name">{{ item[2] }}</a></td>
+                                <td><span class="label label-default">{{item[1]}}</span></td>
                             </tr>
                         </tbody>
                     </table>
@@ -505,8 +505,8 @@
                             </tr>
                             <tr ng-repeat="item in monitorOverview.llbLists.connectionsList">
                                 <td class="num">{{$index + 1}}</td>
-                                <td style="cursor: pointer;" ui-sref="index.monitoring.resource.llb"><a class="name">{{ item.name }}</a></td>
-                                <td><span class="label label-default">{{item.connections}}</span></td>
+                                <td style="cursor: pointer;" ui-sref="index.monitoring.resource.llb"><a class="name">{{ item[2] }}</a></td>
+                                <td><span class="label label-default">{{item[1]}}</span></td>
                             </tr>
                         </tbody>
                     </table>
@@ -534,9 +534,9 @@
                         </tr>
                         <tr ng-repeat="item in monitorOverview.llbLists.throughputList">
                             <td class="num">{{$index + 1}}</td>
-                            <td style="cursor: pointer;" ui-sref="index.monitoring.resource.llb"><a class="name">{{ item.name }}</a></td>
-                            <td><span class="label label-default">{{item.sent}}</span></td>
-                            <td><span class="label label-default">{{item.received}}</span></td>
+                            <td style="cursor: pointer;" ui-sref="index.monitoring.resource.llb"><a class="name">{{ item[4] }}</a></td>
+                            <td><span class="label label-default">{{item[3]}}</span></td>
+                            <td><span class="label label-default">{{item[2]}}</span></td>
                         </tr>
                         </tbody>
                     </table>
@@ -631,3 +631,4 @@
 </style>
 
 
+