Adding misc files to support flot graph library. Also completed phase 1 of getting the curved force diagram working. Closes #21.

Author: geekshe

graph.json

@@ -94,7 +94,7 @@ def load_env(data):
 def load_api(data):
     """Load values relating to the API as a whole."""
 
-    # [[TODO: Merge identical lines into the DB]]
+    # [[TODO: Don't issue api_id unless successful add]]
 
     # Read data from csv file and insert rows
     # But skip the header row: data[0]

miserables.json

@@ -71,10 +71,6 @@ def get_weighted_avg_latency(sql_filter):
     # Intitialize the total_latency variable
     total_latency = Decimal(0)
 
-    # Iterate through each item in the list and add it to the total
-    # for latency in all_latency:
-    #     total_latency += latency[0]
-
     # Get the volume percent for each call
     # Returns a dictionary
     env_call_volumes = calc_call_volume(sql_filter)
@@ -101,15 +97,6 @@ def index():
 
     sql_filter = '%prod%'
 
-    # all_latency = db.session.query(Agg_Request.avg_response_time).filter(Agg_Request.call_code.like(sql_filter)).all()
-
-    # total_latency = Decimal(0)
-
-    # for latency in all_latency:
-    #     total_latency += latency[0]
-
-    # avg_latency = total_latency / len(all_latency)
-
     avg_latency = get_weighted_avg_latency(sql_filter)
 
     # Compare avg_latency to a range of values. 
@@ -173,18 +160,30 @@ def calls_by_type():
 
     return render_template("calls.html", agg_requests=agg_requests, env_total=env_total)
 
+
 @app.route('/d3')
 def show_apps_customers():
     """Show relationship of apps to their customers and vice versa."""
 
     return render_template("d3.html")
 
-@app.route('/d3-force')
-def show_apps():
+
+@app.route('/d3-force-curve')
+def show_apps_curve():
+    """Show relationship of apps to their customers and vice versa."""
+
+    return render_template("d3-force-curve.html")
+
+
+@app.route('/miserables.json')
+def render_d3_relationships():
     """Show relationship of apps to their customers and vice versa."""
 
+    json_string = open('miserables.json').read()
+
+    # data_dict = json.loads(json_string)
 
-    return render_template("d3-force.html", jsonify(graph.json))
+    return json_string
 
 
 ################################################################################