1 files changed, 28 insertions, 54 deletions

diff --git a/scripts/rhizicore.js b/scripts/rhizicore.js
index 4692602b..d39471d1 100644
--- a/scripts/rhizicore.js
+++ b/scripts/rhizicore.js
@@ -31,7 +31,7 @@ function myGraph(el) {
     function makeNewNode(spec) {
         return {
             'id': spec.id,
-            'text': spec.text,
+            'name': spec.name,
             'type': spec.type,
             'state': spec.state,
             'start': spec.start,
@@ -46,13 +46,13 @@ function myGraph(el) {
         var start = 0,
             end = 0;
         var status = "unknown";
-        var text = id;
+        var name = id;
         id = id.toLowerCase();
         var node = findNode(id, null);
         if (node === undefined) {
             var new_node = makeNewNode({
                 "id": id,
-                "text": text,
+                "name": name,
                 "type": type,
                 "state": state,
                 "start": start,
@@ -66,9 +66,8 @@ function myGraph(el) {
         }
     }
 
-    this.addNodeComplete = function(id, type, state, start, end, status) {
+    this.addNodeComplete = function(id, name, type, state, start, end, status) {
         // No history recorded - this is a helper for loading from files / constant graphs
-        var text = id;
         id = id.toLowerCase();
         var node = findNode(id, null);
         if (node !== undefined) {
@@ -76,7 +75,7 @@ function myGraph(el) {
         } else {
             nodes.push(makeNewNode({
                 "id": id,
-                "text": text,
+                "name": name,
                 "type": type,
                 "state": state,
                 "start": start,
@@ -224,7 +223,7 @@ function myGraph(el) {
     }
 
     this.editName = function(id, type, newname) {
-        var new_text = newname;
+        var new_name = newname;
         id = id && id.toLowerCase();
         var new_id = newname.toLowerCase();
         var index2 = undefined;
@@ -251,7 +250,7 @@ function myGraph(el) {
                 }
             }else{
                 index.id = new_id;
-                index.text = new_text;
+                index.name = new_name;
             }
         }
     }
@@ -426,17 +425,19 @@ function myGraph(el) {
 
     function load_from_json(json) {
         var data = JSON.parse(json);
+        var i, node, link;
+
         if (data == null) {
             console.log('load callback: no data to load');
             return;
         }
-        for(var i=0; i<data["nodes"].length; i++){
-          var node=data.nodes[i];
-          graph.addNodeComplete(node.id,node.type,"perm",new Date(node.start),new Date(node.end),node.status);
+        for(i = 0; i < data["nodes"].length; i++){
+          node = data.nodes[i];
+          graph.addNodeComplete(node.id, node.name, node.type,"perm",new Date(node.start),new Date(node.end),node.status);
           autoSuggestAddName(node.id);
         }
-        for(var j=0; j<data["links"].length; j++){
-          var link=data.links[j];
+        for(i = 0; i < data["links"].length; i++){
+          link = data.links[i];
           graph.addLink(link.source,link.target,link.name,"perm");
         }
         graph.recenterZoom();
@@ -598,13 +599,16 @@ function myGraph(el) {
 
         node.select('g.node text')
             .text(function(d) {
+                if (!d.name) {
+                    return "";
+                }
                 if (d.state === "temp" || d.state === 'chosen') {
-                     return d.text;
+                     return d.name;
                 } else {
-                    if (d.text.length < 28) {
-                        return d.text;
+                    if (d.name.length < 28) {
+                        return d.name;
                     } else {
-                        return d.text.substring(0, 25) + "...";
+                        return d.name.substring(0, 25) + "...";
                     }
                 }
             });
@@ -676,8 +680,6 @@ function myGraph(el) {
 
         node.exit().remove();
 
-        //d3.select("body").on("mousedown", mousedown);
-
         force.on("tick", tick);
 
         //update deliverables
@@ -833,41 +835,6 @@ function tick(e) {
     node.attr('visibility', 'visible');
 }
 
-
-
-
-function deliverableTest() {
-    links=[];
-    nodes=[];
-    var status = "unknown";
-    var nodecounter = 150;
-    for (var i = 0; i < nodecounter; i++) {
-        if (Math.random() > 0.7) status = "done";
-        else if (Math.random() > 0.5) status = "current";
-        else status = "waiting";
-        var end = randomDate(new Date(), new Date("01/01/2018"));
-        var start = randomDate(new Date(), end);
-        graph.addNodeComplete("Task " + i, "deliverable", "perm", start, end, status);
-    }
-
-    for (var i = 0; i < nodecounter; i++) {
-        var endindex = Math.floor(Math.random() * nodecounter);
-        var startindex = Math.floor(Math.random() * nodecounter);
-        if (nodes[endindex].start > nodes[startindex].start && startindex !== endindex) {
-            graph.addLink("Task " + startindex, "Task " + endindex, "depends on", "perm");
-        } else {
-            graph.addLink("Task " + endindex, "Task " + startindex, "depends on", "perm");
-        }
-    }
-
-    function randomDate(start, end) {
-        return new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()));
-    }
-
-    graph.update();
-}
-
-
 function showInfo(d, i) {
   if (d.state !== "chosen") {
     graph.highlightNode(d.id, null);
@@ -1066,8 +1033,15 @@ function customSize(type) {
 }
 
 function expand(obj){
+<<<<<<< HEAD
+    if (!obj.savesize) {
+        obj.savesize = obj.size;
+    }
+    obj.size = Math.max(obj.savesize, obj.value.length);
+=======
     if (!obj.savesize)
         obj.savesize = obj.size;
     obj.size = Math.max(obj.savesize,obj.value.length);
 
+>>>>>>> #62
 }