Explorar o código

solo panel work

Torkel Ödegaard %!s(int64=11) %!d(string=hai) anos
pai
achega
3dd383ba11

+ 1 - 1
src/app/panels/overview/module.js

@@ -1,7 +1,7 @@
 define([
 define([
   'angular',
   'angular',
   'app',
   'app',
-  'underscore',
+  'lodash',
   '../graph/timeSeries',
   '../graph/timeSeries',
   'services/panelSrv',
   'services/panelSrv',
 ],
 ],

+ 5 - 4
src/app/partials/solo-panel.html

@@ -1,7 +1,8 @@
 <div class="container-fluid main">
 <div class="container-fluid main">
-	<div class="span12">
-		<div class="panel nospace" ng-if="panel">
-			<kibana-panel type="panel.type" ng-cloak></kibana-panel>
+	<div class="row-fluid">
+		<div class="span12">
+			<div class="panel nospace" ng-if="panel" style="display:block;">
+				<grafana-panel type="panel.type" ng-cloak></kibana-panel>
+			</div>
 		</div>
 		</div>
-	</div>
 </div>
 </div>

+ 18 - 14
src/app/routes/solo-panel-route.js

@@ -14,28 +14,32 @@ function (angular) {
       });
       });
   });
   });
 
 
-  module.controller('SoloPanelCtrl', function($scope, $rootScope, datasourceSrv, $routeParams, alertSrv, dashboard) {
+  module.controller('SoloPanelCtrl', function($scope, $rootScope, datasourceSrv, $routeParams, alertSrv, dashboardSrv, filterSrv) {
 
 
     var db = datasourceSrv.getGrafanaDB();
     var db = datasourceSrv.getGrafanaDB();
 
 
     db.getDashboard($routeParams.id, false)
     db.getDashboard($routeParams.id, false)
-      .then(function(dashboard) {
-        $scope.initPanelScope(dashboard);
+      .then(function(dashboardData) {
+        $scope.initPanelScope(dashboardData);
       }).then(null, function(error) {
       }).then(null, function(error) {
         alertSrv.set('Error', error, 'error');
         alertSrv.set('Error', error, 'error');
       });
       });
-  });
-
-
-  $scope.initPanelScope = function(dashboard){
-    $scope.dashboard = dashboard.create(dashboardData);
-    $scope.grafana.style = $scope.dashboard.style;
 
 
-    $scope.filter = filterSrv;
-    $scope.filter.init($scope.dashboard);
-
-
-  };
+    $scope.initPanelScope = function(dashboardData) {
+      $scope.dashboard = dashboardSrv.create(dashboardData);
+      $scope.grafana.style = $scope.dashboard.style;
+      $scope.row = {
+        height: '300px',
+      };
+      $scope.test = "Hej";
+      $scope.$index = 0;
+      $scope.panel = $scope.dashboard.rows[0].panels[0];
+      $scope.panel.span = 12;
+
+      $scope.filter = filterSrv;
+      $scope.filter.init($scope.dashboard);
+    };
 
 
+  });
 
 
 });
 });