client: remove third-internship-proposal; Fixes #356

4 files changed, 6 insertions, 12 deletions

diff --git a/res/templates/index.html b/res/templates/index.html
index 5a4073cc..fe4365a8 100644
--- a/res/templates/index.html
+++ b/res/templates/index.html
@@ -56,9 +56,6 @@ var rz_config = { // set as a global variable
             <li class="dropdown-item dropdown-item-type dropdown-item-type-person">
               <label><input type="checkbox" checked="checked" name="person">Person</label>
             </li>
-            <li class="dropdown-item dropdown-item-type dropdown-item-type-Internship-proposal">
-              <label><input type="checkbox" checked="checked" name="internship-proposal">Internship Proposal</label>
-            </li>
           </ul>
         </div>
       </div>
@@ -89,7 +86,11 @@ var rz_config = { // set as a global variable
             <textarea id="editname"></textarea></p>
             <label class="info-card-attr">Type</label>
             <select id="edittype" class="select-dropdown">
-                <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>
+                <option value="person">Person</option>
+                <option value="club">Club</option>
+                <option value="skill">Skill</option>
+                <option value="interest">Interest</option>
+                <option value="internship">Internship</option>
             </select><br/>
             <div id="status">
                 <label class="info-card-attr">Status</label>
diff --git a/src/client/consts.js b/src/client/consts.js
index 670b92b7..ff693d08 100644
--- a/src/client/consts.js
+++ b/src/client/consts.js
@@ -7,7 +7,6 @@ define(function() {
         club: 'A shared club or project within the CRI',
         skill: 'Ability or expertise you possess',
         interest: 'Scientific skill or domain expertise you wish you had',
-        'third-internship-proposal': 'Create this to submit your third internship proposal',
         internship: "Title of first or second internship you've done"
     };
 
diff --git a/src/client/view/graph_view.js b/src/client/view/graph_view.js
index b6372307..464c6756 100644
--- a/src/client/view/graph_view.js
+++ b/src/client/view/graph_view.js
@@ -516,7 +516,7 @@ function GraphView(spec) {
         var nodes = graph.nodes();
         for (var i = 0; i < nodes.length; i++) {
             var current = nodes[i];
-            if (current.type === "third-internship-proposal") {
+            if (current.type === "internship") {
                 deliverables.push({
                     "id": nodes[i].id,
                     "startdate": nodes[i].start,
diff --git a/src/client/view/helpers.js b/src/client/view/helpers.js
index f01f812f..4e4bd58d 100644
--- a/src/client/view/helpers.js
+++ b/src/client/view/helpers.js
@@ -13,9 +13,6 @@ function customColor(type) {
         case "skill":
             color = '#fad900'; //yellow
             break;
-        case "third-internship-proposal":
-            color = '#33c2e0'; //cyan
-            break;
         case "internship":
             color = '#ff8b11'; //orange
             break;
@@ -51,9 +48,6 @@ function customSize(type) {
         case "skill":
             size = 12;
             break;
-        case "third-internship-proposal":
-            size = 12;
-            break;
         case "internship":
             size = 12;
             break;