From 5630d7383c5237b4cc229b00d45920067eac5542 Mon Sep 17 00:00:00 2001
From: michael mead <michaelmead007@icloud.com>
Date: Thu, 10 Aug 2017 22:23:57 -0500
Subject: [PATCH] some bugs here, and we probably want to refactor but you can
 select nodes from dropdown, a couple things return undefined, but I don't
 know if thats just old stuff

---
 src/api/index.py               | 10 ++++++++--
 src/api/static/js/dashboard.js | 22 ++++++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/api/index.py b/src/api/index.py
index 39b86e7..6e19647 100644
--- a/src/api/index.py
+++ b/src/api/index.py
@@ -96,7 +96,6 @@ def get_apps():
 	return json.dumps(r)
 
 
-
 @app.route('/1/get/summary/<id>')
 def get_summary(id):
 	"""
@@ -119,6 +118,8 @@ def get_summary(id):
 	except Exception,e:
 		print (e)
 	return json.dumps(r)
+
+
 @app.route("/1/sys/usage/trend")
 def get_usage_trend():
 	"""
@@ -135,6 +136,7 @@ def get_usage_trend():
 		print (e)
 	return json.dumps(r)
 
+
 @app.route("/1/app/usage/trend")
 def get_usage_detail():
 	"""
@@ -153,6 +155,8 @@ def get_usage_detail():
 	except Exception,e:
 		print (e)
 	return json.dumps(r)
+
+
 @app.route('/1/app/status')
 def app_status() :
     	"""
@@ -178,6 +182,8 @@ def app_status() :
 		print e
 
 	return json.dumps(r)
+
+
 #@app.route('/get/<id>')
 #def procs(id):
 	#try:
@@ -282,7 +288,7 @@ def sandbox():
 	#headers = {"content-disposition":"attachment; filename=requirements.txt"}
 	#return Response(stream,mimetype='text/plain',headers=headers)
 
-@app.route('/dashboard')
+@app.route('/dashboard/<node>')
 def dashboard():
 	context = PARAMS['context']
 	if 'title' in PARAMS :
diff --git a/src/api/static/js/dashboard.js b/src/api/static/js/dashboard.js
index 49b4120..2859b86 100755
--- a/src/api/static/js/dashboard.js
+++ b/src/api/static/js/dashboard.js
@@ -4,7 +4,7 @@ function getNode(name){
   var nodeName = {}
   nodeName.name = name
   console.log('nodename...', nodeName.name)
-  // dashboard.initChartist(nodeName)
+  dashboard.initChartist(nodeName)
 }
 
 dashboard = {
@@ -22,17 +22,19 @@ dashboard = {
         });
     },
 
-    initChartist: function(){
+    initChartist: function(nodeName){
         var getData = $.get('/1/app/usage/trend');
         getData.done(function(results) {
             var data = JSON.parse(results)
-            // if (typeof nodeName === 'undefined'){
-            //   console.log("undefined nodename.........")
-            // } else {
-            //   var node = data[nodeName.name]
-            //   console.log('data.name..', data[name])
-            // }
-            var node = data['apps@michaels-MBP'];
+            if (typeof nodeName === 'undefined'){
+              var node = data['apps@michaels-MBP'];
+              console.log("undefined nodename.........")
+            } else {
+              console.log('this is nodeName...', nodeName)
+              console.log('this is nodeName.name...', nodeName.name)
+              var node = data[nodeName.name]
+              console.log('data.name..', data[name])
+            }
             var app = node['chrome'];
             var cpu = app['cpu'];
             var memory_used = app['memory_used'];
@@ -46,7 +48,7 @@ dashboard = {
 // monitoring apps chart
         var dataChart = {
           labels: ['24','23','22','21','20','19','18','17','16','15','14','13','12','11','10','9','8','7','6','5','4','3','2','1' ],
-          series: [cpu, memory_used, [1,2,3,5], ] // TODO: Check the order, the graph is by index not name.
+          series: [cpu, memory_used, [0,0.1,0.3,0.2,0.4,0.6,0.2], ] // TODO: Check the order, the graph is by index not name.
         };
 
         dataChartArray = dataChart.series