Commit ba09a76c authored by Fintan Mc Gee's avatar Fintan Mc Gee

fixed issues where QBE was attempting to access the model of the application controller directly

parent 4ca1fedc
...@@ -147,13 +147,13 @@ ...@@ -147,13 +147,13 @@
</tr> </tr>
<tr > <tr >
<th> <th>
<div style="height:150px;text-align: left;overflow-x: auto;overflow-y: auto;" class="panel-body" ng-show="!model.isLoading"> <div style="height:150px;text-align: left;overflow-x: auto;overflow-y: auto;" class="panel-body" ng-show="!getIsLoading()">
<div ng-repeat="node in model.nodes | filter :model.researchEntity" ng-show="!model.entitiesAreLoading"> <div ng-repeat="node in model.nodes | filter :model.researchEntity" ng-show="!model.entitiesAreLoading">
<div id={{'node_'+node.label}} class="selectable-element" ng-click="selectNode(node)">{{node.label}}</div> <div id={{'node_'+node.label}} class="selectable-element" ng-click="selectNode(node)">{{node.label}}</div>
</div> </div>
</div> </div>
<div class="panel-body" style="height:100px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="model.isLoading"> <div class="panel-body" style="height:100px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="getIsLoading()">
<img class = "centered" src="img/preloader_big.gif" ng-show="model.isLoading"/> <img class = "centered" src="img/preloader_big.gif" ng-show="getIsLoading()"/>
</div> </div>
<div class="panel-body" style="height:120px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="model.entitiesAreLoading"> <div class="panel-body" style="height:120px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="model.entitiesAreLoading">
<img class = "centered" src="img/preloader_big.gif" ng-show="model.entitiesAreLoading"/> <img class = "centered" src="img/preloader_big.gif" ng-show="model.entitiesAreLoading"/>
...@@ -172,12 +172,13 @@ ...@@ -172,12 +172,13 @@
</tr> </tr>
<tr > <tr >
<th> <th>
<div class="panel-body" style="height:150px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="!model.isLoading"> <div class="panel-body" style="height:150px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="!getIsLoading()">
<div class="panel-body" style="height:150px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="!getIsLoading()">
<div ng-repeat="link in model.links | filter :model.researchEntity" ng-show="!model.entitiesAreLoading"> <div ng-repeat="link in model.links | filter :model.researchEntity" ng-show="!model.entitiesAreLoading">
<div id={{'link_'+link.label}} class="selectable-element" ng-click="selectLink(link)">{{link.label}}</div> <div id={{'link_'+link.label}} class="selectable-element" ng-click="selectLink(link)">{{link.label}}</div>
</div> </div>
</div> </div>
<div class="panel-body" style="height:100px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="model.isLoading"> <div class="panel-body" style="height:100px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="getIsLoading()">
<img class = "centered" src="img/preloader_big.gif" ng-show="model.isLoading"/> <img class = "centered" src="img/preloader_big.gif" ng-show="model.isLoading"/>
</div> </div>
<div class="panel-body" style="height:120px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="model.entitiesAreLoading"> <div class="panel-body" style="height:120px;text-align: left;overflow-x: auto;overflow-y: auto;" ng-show="model.entitiesAreLoading">
......
...@@ -5,7 +5,7 @@ angular.module('blizaarModule.controllers') ...@@ -5,7 +5,7 @@ angular.module('blizaarModule.controllers')
.controller('SideMenuCtrl', ['$scope', '$location','dataService', function($scope, $location,dataService) { .controller('SideMenuCtrl', ['$scope', '$location','dataService', function($scope, $location,dataService) {
console.log("SideMenuCtrl installed"); console.log("SideMenuCtrl installed");
$scope.model = {}; //$scope.model = {};
// $scope.model.leftItemName = 'view_expandable'; // $scope.model.leftItemName = 'view_expandable';
$scope.model.leftItemName = 'left_buttons'; $scope.model.leftItemName = 'left_buttons';
......
...@@ -674,7 +674,8 @@ angular.module('blizaarModule.directives') ...@@ -674,7 +674,8 @@ angular.module('blizaarModule.directives')
}); });
svg.on("mousemove", drawLine); svg.on("mousemove", drawLine);
scope.model.isLoading = false; //scope.model.isLoading = false;
scope.setIsLoading(false);
/*if (scope.model.selectedNode === undefined && scope.model.selectedLink === undefined) { /*if (scope.model.selectedNode === undefined && scope.model.selectedLink === undefined) {
$('#distributionDisplay').empty(); $('#distributionDisplay').empty();
svg3Clean(); svg3Clean();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment