From 92eb91a3c605cbd830d20dae6488a44d3679299c Mon Sep 17 00:00:00 2001
From: garbash <dor.garbash@gmail.com>
Date: Fri, 28 Nov 2014 13:51:23 +0200
Subject: Changed node types names resolving #162

---
 src/rz_core.js        |  4 ++--
 src/textanalysis.js   |  2 +-
 src/view/helpers.js   | 18 ++++++++++++------
 src/view/node_info.js |  8 ++++----
 4 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/rz_core.js b/src/rz_core.js
index cb0365a6..44dd02fb 100644
--- a/src/rz_core.js
+++ b/src/rz_core.js
@@ -382,7 +382,7 @@ function update_view__graph(no_relayout) {
     var nodes = graph.nodes();
     for (var i = 0; i < nodes.length; i++) {
         var current = nodes[i];
-        if (current.type === "deliverable") {
+        if (current.type === "third-internship-proposal") {
             deliverables.push({
                 "id": nodes[i].id,
                 "startdate": nodes[i].start,
@@ -436,7 +436,7 @@ function tick(e) {
     var linktext = vis.selectAll(".linklabel").data(graph.links());
 
     function transform(d) {
-        if (graphstate === "GRAPH" || d.type === "deliverable") {
+        if (graphstate === "GRAPH" || d.type === "third-internship-proposal") {
             if (check_for_nan(d.x) || check_for_nan(d.y)) {
                 return;
             }
diff --git a/src/textanalysis.js b/src/textanalysis.js
index fbfeab0d..9114bbff 100644
--- a/src/textanalysis.js
+++ b/src/textanalysis.js
@@ -4,7 +4,7 @@ define(['rz_core', 'model/core', 'model/util', 'model/diff', 'signal', 'consts']
 function(rz_core,   model_core,   model_util,   model_diff,   signal,   consts) {
 
 var typeindex = 0;
-var nodetypes = ["person", "project", "skill", "deliverable", "objective"];
+var nodetypes = ["person", "club", "skill", "interest", "third-internship-proposal", "internship"];
 var typeStack = [];
 
 var lastnode;
diff --git a/src/view/helpers.js b/src/view/helpers.js
index be0e289e..41d99891 100644
--- a/src/view/helpers.js
+++ b/src/view/helpers.js
@@ -7,16 +7,19 @@ function customColor(type) {
         case "person":
             color = '#FCB924';
             break;
-        case "project":
+        case "club":
             color = '#009DDC';
             break;
         case "skill":
             color = '#62BB47';
             break;
-        case "deliverable":
+        case "third-internship-proposal":
             color = '#202020';
             break;
-        case "objective":
+        case "internship":
+            color = '#933E99';
+            break;
+        case "interest":
             color = '#933E99';
             break;
         case "empty":
@@ -42,16 +45,19 @@ function customSize(type) {
         case "person":
             size = 12;
             break;
-        case "project":
+        case "club":
             size = 12;
             break;
         case "skill":
             size = 12;
             break;
-        case "deliverable":
+        case "third-internship-proposal":
+            size = 12;
+            break;
+        case "internship":
             size = 12;
             break;
-        case "objective":
+        case "interest":
             size = 12;
             break;
         case "empty":
diff --git a/src/view/node_info.js b/src/view/node_info.js
index 5e107174..7bf1540b 100644
--- a/src/view/node_info.js
+++ b/src/view/node_info.js
@@ -4,12 +4,12 @@ function($, view_helpers, internal) {
 function show(d) {
     internal.edit_tab.show('node');
 
-    if (d.type === "deliverable") {
-      $('.info').html('Name: ' + d.name + '<br/><form id="editbox"><label>Type:</label><select id="edittype"><option value="person">Person</option><option value="project">Project</option><option value="skill">Skill</option><option value="deliverable">Deliverable</option><option value="objective">Objective</option></select><br/><label>Status</label><select id="editstatus"><option value="waiting">Waiting</option><option value="current">Current</option><option value="done">Done</option></select><br/><label>Start date:</label><input id="editstartdate"/></br><label>End date:</label><input id="editenddate"/></br><button>Save</button><button id="deletenode">Delete</button></form>');
+    if (d.type === "third-internship-proposal") {
+      $('.info').html('Name: ' + d.name + '<br/><form id="editbox"><label>Type:</label><select id="edittype"><option value="person">Person</option><option value="club">Club</option><option value="skill">Skill</option><option value="interest">Interest</option><option value="third-internship-proposal">Third-internship-proposal</option><option value="internship">Internship</option></select><br/><label>Status</label><select id="editstatus"><option value="waiting">Waiting</option><option value="current">Current</option><option value="done">Done</option></select><br/><label>Start date:</label><input id="editstartdate"/></br><label>End date:</label><input id="editenddate"/></br><button>Save</button><button id="deletenode">Delete</button></form>');
     } else if(d.type=== "chainlink"){
       $('.info').html('Name: ' + d.name + '<br/><form id="editbox"><button>Save</button><button id="deletenode">Delete</button></form>');
     }else{
-      $('.info').html('Name: ' + d.name + '<br/><form id="editbox"><label>Type:</label><select id="edittype"><option value="person">Person</option><option value="project">Project</option><option value="skill">Skill</option><option value="deliverable">Deliverable</option><option value="objective">Objective</option></select><br/><label>URL:</label><input id="editurl"/><br/><button>Save</button><button id="deletenode">Delete</button></form>');
+      $('.info').html('Name: ' + d.name + '<br/><form id="editbox"><label>Type:</label><select id="edittype"><option value="person">Person</option><option value="club">Club</option><option value="skill">Skill</option><option value="interest">Interest</option><option value="third-internship-proposal">Third-internship-proposal</option><option value="internship">Internship</option></select><br/><label>URL:</label><input id="editurl"/><br/><button>Save</button><button id="deletenode">Delete</button></form>');
     }
 
     $('.info').css("border-color", view_helpers.customColor(d.type));
@@ -32,7 +32,7 @@ function show(d) {
 
     $('#editurl').val(d.url);
 
-    if (d.type === "deliverable") {
+    if (d.type === "third-internship-proposal") {
       $('#editstartdate').val(d.start);
       $('#editenddate').val(d.end);
     }
-- 
cgit v1.3.1