Layout fix on diagnostic and added subscriber status handling
diff --git a/views/ngXosViews/diagnostic/src/js/logicTopology.js b/views/ngXosViews/diagnostic/src/js/logicTopology.js
index b12bfb5..edd64ea 100644
--- a/views/ngXosViews/diagnostic/src/js/logicTopology.js
+++ b/views/ngXosViews/diagnostic/src/js/logicTopology.js
@@ -57,14 +57,37 @@
handleSvg($element[0]);
LogicTopologyHelper.setupTree(svg);
- this.openSubscriberModal = () => {
- this.subscriberModal = true;
+ this.selectSubscriberModal = () => {
+ this.openSelectSubscriberModal = true;
+ $scope.$apply();
+ };
+
+ this.subscriberStatusModal = () => {
+ this.openSubscriberStatusModal = true;
$scope.$apply();
};
// listen for subscriber modal event
$rootScope.$on('subscriber.modal.open', () => {
- this.openSubscriberModal();
+
+ 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();
+ }
+ else{
+ this.selectSubscriberModal();
+ }
});
}