Updated UI to read Subscriber Features
Change-Id: Ic81ce09e2c37af114214a0b960a37b7c9bc4ac44
diff --git a/views/ngXosViews/diagnostic/src/js/chart_data_service.js b/views/ngXosViews/diagnostic/src/js/chart_data_service.js
index 7526025..2bfc77a 100644
--- a/views/ngXosViews/diagnostic/src/js/chart_data_service.js
+++ b/views/ngXosViews/diagnostic/src/js/chart_data_service.js
@@ -94,7 +94,6 @@
cTag: subscriber.related.c_tag,
sTag: subscriber.related.s_tag
};
- console.log(subscriber);
this.addSubscriberTag(tags);
// add tags info to current subscriber
@@ -107,6 +106,7 @@
};
this.selectSubscriber = (subscriber) => {
+
// append the device with to config settings
serviceTopologyConfig.elWidths.push(160);
diff --git a/views/ngXosViews/diagnostic/src/js/logicTopology.js b/views/ngXosViews/diagnostic/src/js/logicTopology.js
index 5ab5d0f..a14ec57 100644
--- a/views/ngXosViews/diagnostic/src/js/logicTopology.js
+++ b/views/ngXosViews/diagnostic/src/js/logicTopology.js
@@ -91,19 +91,18 @@
};
// listen for subscriber modal event
- $rootScope.$on('subscriber.modal.open', () => {
-
- if(ChartData.currentSubscriber){
- this.subscriberStatusModal();
- }
- else{
- this.selectSubscriberModal();
- }
- });
+ // $rootScope.$on('subscriber.modal.open', () => {
+ //
+ // if(ChartData.currentSubscriber){
+ // this.subscriberStatusModal();
+ // }
+ // else{
+ // this.selectSubscriberModal();
+ // }
+ // });
// listen for subscriber modal event
$rootScope.$on('subscriber.modal.open', () => {
-
if(ChartData.currentSubscriber){
this.currentSubscriber = ChartData.currentSubscriber;
this.subscriberStatusModal();
diff --git a/views/ngXosViews/diagnostic/src/js/subscriber-modal.js b/views/ngXosViews/diagnostic/src/js/subscriber-modal.js
index 773be70..e99f7e2 100644
--- a/views/ngXosViews/diagnostic/src/js/subscriber-modal.js
+++ b/views/ngXosViews/diagnostic/src/js/subscriber-modal.js
@@ -47,10 +47,8 @@
if(!this.subscriber){
return;
}
- console.log(newVal, oldVal);
- console.log('subscriber change', newVal === oldVal);
- this.subscriber.uplink_speed = parseInt(this.subscriber.uplink_speed, 10) / mb;
- this.subscriber.downlink_speed = parseInt(this.subscriber.downlink_speed, 10) / mb;
+ this.subscriber.features.uplink_speed = parseInt(this.subscriber.features.uplink_speed, 10) / mb;
+ this.subscriber.features.downlink_speed = parseInt(this.subscriber.features.downlink_speed, 10) / mb;
});
this.close = () => {
@@ -64,8 +62,11 @@
let body = angular.copy(subscriber, body);
- body.uplink_speed = body.uplink_speed * mb;
- body.downlink_speed = body.downlink_speed * mb;
+ body.features.uplink_speed = body.features.uplink_speed * mb;
+ body.features.downlink_speed = body.features.downlink_speed * mb;
+
+ // remove read only attributes
+ delete body.related;
Subscribers.update(body).$promise
.then((res) => {