summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--res/css/style.css9
-rw-r--r--res/css/style.css.map7
-rw-r--r--res/css/style.scss13
-rw-r--r--src/rz_core.js4
-rw-r--r--src/textanalysis.js2
-rw-r--r--src/view/helpers.js18
-rw-r--r--src/view/node_info.js8
8 files changed, 41 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore
index a3abca6b..be8bf5e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ Rhizi Prototype1_files/
.idea/
src/local_config.js
+
+.sass-cache/
diff --git a/res/css/style.css b/res/css/style.css
index 473a8b8b..0e46e1bc 100644
--- a/res/css/style.css
+++ b/res/css/style.css
@@ -150,16 +150,19 @@ a:active {
.circle.person {
fill: #FCB924; }
-.circle.project {
+.circle.club {
fill: #009DDC; }
.circle.skill {
fill: #62BB47; }
-.circle.deliverable {
+.circle.interest {
+ fill: #f9f5f1; }
+
+.circle.third-internship-proposal {
fill: #202020; }
-.circle.objective {
+.circle.internship {
fill: #933E99; }
.circle.empty {
diff --git a/res/css/style.css.map b/res/css/style.css.map
new file mode 100644
index 00000000..d70a229e
--- /dev/null
+++ b/res/css/style.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "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",
+"sources": ["style.scss"],
+"names": [],
+"file": "style.css"
+}
diff --git a/res/css/style.scss b/res/css/style.scss
index d9aa3d14..0804de4e 100644
--- a/res/css/style.scss
+++ b/res/css/style.scss
@@ -187,7 +187,7 @@ input:focus {
}
-.circle.project {
+.circle.club {
fill: #009DDC;
}
@@ -195,11 +195,15 @@ input:focus {
fill: #62BB47;
}
-.circle.deliverable {
+.circle.interest {
+ fill: #f9f5f1;
+}
+
+.circle.third-internship-proposal {
fill: #202020;
}
-.circle.objective {
+.circle.internship {
fill: #933E99;
}
@@ -388,9 +392,6 @@ input:focus {
.local-storage-load {
}
-.deliverabletest{
-}
-
.poweredby{
position:fixed;
bottom:10px;
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);
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-16 14:03:00 +0000