Made container = true on all new concepts, modified world view to dis…

…play container=true, added onboarding type. #70
codeandcognition · Jun 27, 2018 · 0170943 · 0170943
1 parent 367129c
commit 0170943
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/src/data/ConceptAbbreviations.js b/src/data/ConceptAbbreviations.js
@@ -69,7 +69,8 @@ export const g = {
 
 export const t = {
   semantic: "semantic",
-  template: "template"
+  template: "template",
+  onboarding: "onboarding"
 }
 
 export default g;
diff --git a/src/data/ConceptMap.js b/src/data/ConceptMap.js
@@ -11,8 +11,8 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
-    type: t.semantic
+    container: true,
+    type: t.onboarding
   },
   [g.dataTypes]: {
     dependencies: [g.howCodeRuns],
@@ -24,7 +24,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.semantic
   },
   [g.printStatements]: {
@@ -37,7 +37,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.semantic
   },
   [g.variables]: {
@@ -50,7 +50,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.semantic
   },
   [g.arithmeticOperators]: {
@@ -63,7 +63,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.semantic
   },
   [g.relationalOperators]: {
@@ -76,7 +76,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.semantic
   },
   [g.variableSwap]: {
@@ -89,7 +89,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.template
   },
   [g.digitProcessing]: {
@@ -102,7 +102,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.template
   },
   [g.floatEquality]: {
@@ -115,7 +115,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.template
   },
   [g.conditionals]: {
@@ -128,7 +128,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.semantic
   },
   [g.findMaxMin]: {
@@ -141,7 +141,7 @@ export const conceptInventory = {
       future: []
     },
     should_teach: true,
-    container: false,
+    container: true,
     type: t.template
   },
 };

diff --git a/src/ui/koconut/containers/WorldView.js b/src/ui/koconut/containers/WorldView.js
@@ -18,7 +18,7 @@ class WorldView extends Component {
 	 * @returns {Array.<*>}
 	 */
 	getOrderedConcepts(): ConceptKnowledge[] {
-		return MasteryModel.model.filter((concept) => concept.teach && !concept.container).sort(
+		return MasteryModel.model.filter((concept) => concept.teach && concept.container).sort(
 				(a, b) => (b.dependencyKnowledge / b.knowledge -
 						a.dependencyKnowledge / a.knowledge));
 	}