tutorial progress

Author: ShMcK

coderoad.json

@@ -28,23 +28,46 @@
                 "1/01/02-filter"
               ],
               "actions": [
-                "insert('// note: data is set as a global\nvar myData = data.filter // call filter condition here\n')"
+                "insert('/**\n * Data is set as a global. Example:\n * [{\n * \"course\": \"Relational Databases\",\n * \"instructor\": \"Sean Quentin Lewis\",\n * \"name\": \"Ada Lovelace\",\n * \"score\": 91,\n * \"grade\": \"A\"\n * },\n * ...\n * ]\n */\n')",
+                "insert('// call filter condition here\nvar myData = data.filter();\n\n')"
               ]
             },
             {
-              "description": "Set `var myBest` to your scores, excluding any grades that are \"D\" or \"F\".",
+              "description": "Write a filter condition called `isGoodGrade` that will filter out any \"D\" or \"F\" grades.",
               "tests": [
                 "1/01/03-filter"
               ],
               "actions": [
-                "insert('var myBest = myData.filter // filter out \"D\"'s and \"F\"'s here\n')"
+                "insert('// return true if student \"grade\" is not a \"D\" or \"F\"\nfunction isGoodGrade() {\n\n}\n')"
+              ]
+            },
+            {
+              "description": "Set `var myBest` to your scores, excluding any grades that are \"D\" or \"F\".",
+              "tests": [
+                "1/01/04-filter"
+              ],
+              "actions": [
+                "insert('// filter out \"D\"'s and \"F\"'s here\nvar myBest = myData.filter();\n\n')"
               ]
             }
           ]
         },
         {
           "title": "Sort",
-          "description": "Array -> sorted Array"
+          "description": "Array -> sorted Array",
+          "explanation": "Your grades are filtered down to your name and good scores - but wouldn't it be better if your best grades were shown at the top? Besides, your parents rarely read all the way down to the bottom.\n\nWe can use the array method `sort` to arrange our data. Let's see how it works.",
+          "tasks": [
+            {
+              "description": "Write a sort condition function called `sortByScore` that can sort your data by score.",
+              "tests": [
+                "1/02/01-sort"
+              ],
+              "actions": [
+                "open('02-sort.js')",
+                "set('function sortByScore(a, b) {\n  // it should return -1 a's score is bigger than b's\n\n  // it should return 1 if a's score is less than b's\n\n  // it should return 0 if a has the same score as b\n\n}\n')"
+              ]
+            }
+          ]
         },
         {
           "title": "Map",

tutorial/1/01/01-filter.spec.js

@@ -2,7 +2,7 @@ var expect = require('chai').expect;
 var path = require('path');
 var loadJS = require('../../common/loadJS').default;
 if (!global.data) {
-  global.data = JSON.parse(JSON.stringify(require('./data.json')));
+  global.data = JSON.parse(JSON.stringify(require('../../data/students.json')));
 }
 loadJS('01-filter.js');
 

tutorial/1/01/02-filter.spec.js

@@ -2,7 +2,7 @@ var expect = require('chai').expect;
 var path = require('path');
 var loadJS = require('../../common/loadJS').default;
 if (!global.data) {
-  global.data = JSON.parse(JSON.stringify(require('./data.json')));
+  global.data = JSON.parse(JSON.stringify(require('../../data/students.json')));
 }
 loadJS('01-filter.js');
 

tutorial/1/01/03-filter.spec.js

@@ -2,32 +2,39 @@ var expect = require('chai').expect;
 var path = require('path');
 var loadJS = require('../../common/loadJS').default;
 if (!global.data) {
-  global.data = JSON.parse(JSON.stringify(require('./data.json')));
+  global.data = JSON.parse(JSON.stringify(require('../../data/students.json')));
 }
 loadJS('01-filter.js');
 
-describe('var myBest', function() {
+describe('isGoodGrade', function() {
 
   it('doesn\'t exist', function() {
-    expect(myBest).to.not.be.undefined;
+    expect(isGoodGrade).to.not.be.undefined;
   });
 
-  it('doesn\'t output an array', function() {
-    expect(myBest).to.be.an('array');
+  it('isn\'t a Function', function() {
+    expect(isGoodGrade).to.be.a('function');
   });
 
-  it('doesn\'t output exactly ten items', function() {
-    expect(myBest).to.have.length(7);
+  it('doesn\'t have any params', function() {
+    expect(isGoodGrade.length).to.equal(1);
   });
 
-  it('isn\'t the right filtered data for "Ada Lovelace"', function() {
-    var values = [91, 88, 81, 73, 93, 82, 88];
-    myBestVals = myBest.map(function(x) {
-      return x.score;
-    });
-    values.forEach(function(value) {
-      expect(myBestVals).contains(value);
-    });
+  it('doesn\'t return true when an items name matches "Ada Lovelace"', function() {
+    var test = [{
+      grade: 'A'
+    }, {
+      grade: 'D'
+    }, {
+      grade: 'F'
+    }, {
+      grade: 'B'
+    }];
+    expect(test.filter(isGoodGrade)).to.deep.equal([{
+      grade: 'A'
+    }, {
+      grade: 'B'
+    }]);
   });
 
 });

tutorial/1/01/04-filter.spec.js

@@ -0,0 +1,33 @@
+var expect = require('chai').expect;
+var path = require('path');
+var loadJS = require('../../common/loadJS').default;
+if (!global.data) {
+  global.data = JSON.parse(JSON.stringify(require('../../data/students.json')));
+}
+loadJS('01-filter.js');
+
+describe('var myBest', function() {
+
+  it('doesn\'t exist', function() {
+    expect(myBest).to.not.be.undefined;
+  });
+
+  it('doesn\'t output an array', function() {
+    expect(myBest).to.be.an('array');
+  });
+
+  it('doesn\'t output exactly ten items', function() {
+    expect(myBest).to.have.length(7);
+  });
+
+  it('isn\'t the right filtered data for "Ada Lovelace"', function() {
+    var values = [91, 88, 81, 73, 93, 82, 88];
+    myBestVals = myBest.map(function(x) {
+      return x.score;
+    });
+    values.forEach(function(value) {
+      expect(myBestVals).contains(value);
+    });
+  });
+
+});

tutorial/1/01/filter.md

@@ -65,14 +65,44 @@ function isAda(x) {
 @test('1/01/02-filter')
 @action(insert(
 ```
-// note: data is set as a global
-var myData = data.filter // call filter condition here
+/**
+ * Data is set as a global. Example:
+ * [{
+ * "course": "Relational Databases",
+ * "instructor": "Sean Quentin Lewis",
+ * "name": "Ada Lovelace",
+ * "score": 91,
+ * "grade": "A"
+ * },
+ * ...
+ * ]
+ */
+```
+))
+@action(insert(
+```
+// call filter condition here
+var myData = data.filter();
+
 ```))
 
++ Write a filter condition called `isGoodGrade` that will filter out any "D" or "F" grades.
+@test('1/01/03-filter')
+@action(insert(
+```
+// return true if student "grade" is not a "D" or "F"
+function isGoodGrade() {
+
+}
+```
+))
+
 + Set `var myBest` to your scores, excluding any grades that are "D" or "F".
 
-@test('1/01/03-filter')
+@test('1/01/04-filter')
 @action(insert(
 ```
-var myBest = myData.filter // filter out "D"'s and "F"'s here
+// filter out "D"'s and "F"'s here
+var myBest = myData.filter();
+
 ```))

tutorial/1/02/01-sort.spec.js

@@ -0,0 +1,9 @@
+var expect = require('chai').expect;
+var path = require('path');
+var loadJS = require('../../common/loadJS').default;
+if (!global.data) {
+  global.data = JSON.parse(JSON.stringify(require('../../data/students.json')));
+}
+loadJS('02-sort.js');
+
+describe('', function () {});

tutorial/1/02/sort.md

@@ -1,2 +1,21 @@
 ### Sort
 Array -> sorted Array
+
+Your grades are filtered down to your name and good scores - but wouldn't it be better if your best grades were shown at the top? Besides, your parents rarely read all the way down to the bottom.
+
+We can use the array method `sort` to arrange our data. Let's see how it works.
+
++ Write a sort condition function called `sortByScore` that can sort your data by score.
+@test('1/02/01-sort')
+@action(open('02-sort.js'))
+@action(set(
+```
+function sortByScore(a, b) {
+  // it should return -1 a's score is bigger than b's
+
+  // it should return 1 if a's score is less than b's
+
+  // it should return 0 if a has the same score as b
+
+}
+```))