From b0b54c81edf54581ef4bdcae52e83086e6e9de33 Mon Sep 17 00:00:00 2001
From: steve <steve@the-phi.com>
Date: Thu, 22 Dec 2016 10:29:03 -0600
Subject: [PATCH] status handling backend and front-end refactoring

---
 src/api/static/js/dashboard.js | 22 ++++++++++++----------
 src/monitor.py                 | 15 ++++++++++++++-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/api/static/js/dashboard.js b/src/api/static/js/dashboard.js
index a437d6e..617abee 100644
--- a/src/api/static/js/dashboard.js
+++ b/src/api/static/js/dashboard.js
@@ -31,16 +31,18 @@ monitor.processes.init = function(x){
 monitor.processes.render = function(label,data) {
 	var status = {"idle":'<i class="fa fa-ellipsis-h" title="IDLE"></i>',"running":'<i class="fa fa-check" title="RUNNING"></i>',"crash":'<i class="fa fa-times" title="CRASHED"></i>'}
 	data = jx.utils.patterns.visitor(data,function(row){
-		var m = row.memory_usage >0
-		var c = row.cpu_usage > 0
-		var r = row.memory_available > 0
-		if ( r && c && m) {
-			row.status = status['running']
-		}else if (r && (!m || !c) ){
-			row.status = status['idle']
-		}else if (!r){
-			row.status = status['crash']
-		}
+		console.log(row)
+		row.status = status[row.status]
+// 		var m = row.memory_usage >0
+// 		var c = row.cpu_usage > 0
+// 		var r = row.memory_available > 0
+// 		if ( r && c && m) {
+// 			row.status = status['running']
+// 		}else if (r && (!m || !c) ){
+// 			row.status = status['idle']
+// 		}else if (!r){
+// 			row.status = status['crash']
+// 		}
 		
 		return row
 	})
diff --git a/src/monitor.py b/src/monitor.py
index 815b296..93c276f 100755
--- a/src/monitor.py
+++ b/src/monitor.py
@@ -154,8 +154,21 @@ class DetailProcess(Analysis):
 			row =  [float(value) for value in row if value.strip() != '' and name not in value ] +[re.sub('\$|^','',name)]
 			r.append(row)
 		return r
+	def status(self,row):
+		x = row['memory_usage']
+		y = row['cpu_usage']
+		z = row['memory_available']
+		if z :
+			if y :
+				return "running"
+			return "idle"
+		else:
+			return "crash"
 	def format(self,row):
-		return {"memory_usage":row[0],"cpu_usage":row[1],"memory_available":row[2]/1000,"label":row[3]}
+		r= {"memory_usage":row[0],"cpu_usage":row[1],"memory_available":row[2]/1000,"label":row[3]}
+		status = self.status(r)
+		r['status'] = status
+		return r
 	def composite(self):
 		#value = self.evaluate(self.name)
 		#row= {"memory_usage":value[0],"cpu_usage":value[1]}