Week 2 - Hartofelis

assignment/index.html

@@ -61,11 +61,30 @@
       Start code
 
       ===================== */
+      var jsontoCsv = function(json) {console.log(json); };
+      var jsonToCsv = function(json) {
+        var x = [];
+        x.push(Object.keys(json[0]));
+
+        for (var i in json) {
+          x.push(Object.values(json[i]));
+        }
+        console.log(x);
+      };
+
+    // not done yet need to test and see that it shows up in array form -- with titles coming across the top, and each one in a list
+
+      var makeAMarker = (obj) => {
+        return L.circleMarker([obj.LAT, obj.LNG],{
+        color: 'red',
+        fillColor: '#f03',
+        fillOpacity: 0.5,
+        radius: 15
+        } ).bindPopup(obj.NAME)}
+      for (i = 0; i < healthCenters.length; i = i+ 1) { makeAMarker(healthCenters[i]).addTo(map)}
+      var markers = healthCenters.map(makeAMarker);
+      markers.forEach((marker) => { marker.addTo(map)})
 
-      var jsonToCsv = function(json) { console.log(json); };
-
-
-      var addMarkers = function(map) {};
 
       /* =====================
 
@@ -75,7 +94,7 @@
 
 
       jsonToCsv(healthCenters);
-      addMarkers(map);
+      makeAMarker(map);
     </script>
     <!--Your code ends here-->
   </body>

lab/lab1/part1-types-variables-math.html

@@ -18,19 +18,19 @@
 
     ===================== */
 
-    var a;
+    var a = 43;
     var resultTask1 = (a > 30);
 
-    var b;
+    var b = 'words';
     var resultTask2 = (typeof b == 'string');
 
-    var c;
+    var c = 5;
     var resultTask3 = (c ** 2 == 25)
-    
-    var d;
+
+    var d = 10;
     var resultTask4 = (d == 'cassiopeia'.length);
 
-    var e;
+    var e = 8;
     var resultTask5 = (e%5 == 3);
 
     /* =====================

lab/lab1/part2.js

@@ -7,7 +7,9 @@ Instructions: "Write a function that adds one to the number provided"
 Example: "plusOne(2) should return 3"
 ===================== */
 
-var plusOne = function() {};
+var plusOne = function(n) {
+  return n + 1;
+};
 
 console.log('plusOne success:', plusOne(99) === 100);
 
@@ -17,7 +19,9 @@ Example: "plusTwo(2) should return 3"
 NOTE: Try using the `plusOne` function in the body of your `plusTwo` function
 ===================== */
 
-var plusTwo = function() {};
+var plusTwo = function(n) {
+  return n + 2;
+};
 
 console.log('plusTwo success:', plusTwo(99) === 101);
 
@@ -28,7 +32,13 @@ if so, it returns even or odd depending on the number, otherwise it returns "err
 
 ===================== */
 
-var oddOrEven = function() {};
+var oddOrEven = function(n) {
+    if (n%2 === 0) {
+      return 'even';
+    } else {
+      return 'odd';
+  }
+};
 
 console.log('oddOrEven success:', oddOrEven(100) === 'even' && oddOrEven(201) === 'odd');
 
@@ -40,7 +50,10 @@ Instructions: "Write a function, age, that takes a birth year and returns an age
 Example: "age(2000) should return 17"
 ===================== */
 
-var age = function() {};
+var age = function(birthYear) {
+  var currentYear = 2019;
+  return currentYear - birthYear;
+};
 
 console.log('age success:', age(1971) === 48);
 
@@ -49,7 +62,12 @@ Instructions: "Write a function that returns true for numbers over 9000 and fals
 Example: "over9000(22) should return false"
 ===================== */
 
-var over9000 = function() {};
+var over9000 = function(n) {
+  if (n > 9000) {
+    return true;} else {
+      return false;
+    }
+};
 
 console.log('over9000 success:', over9000(9001) === true && over9000(12) === false);
 
@@ -61,7 +79,12 @@ and if it is not, it prints to the console, "TRY WITH STRINGS"
 ===================== */
 
 
-var trump = function() {};
+var trump = function(n) {
+  if (typeof n === 'string'){
+    return n.toUpperCase;} else {
+      return 'TRY WITH STRINGS';
+    }
+};
 
 console.log('trump success:', trump(12) === "TRY WITH STRINGS" && trump('hi') === 'HI');
 
@@ -73,6 +96,8 @@ Example: "y(0, 0, 0) should return 0; y(1, 1, 1) should return 2"
 ===================== */
 
 
-var y = function(m,x,b) {};
+var y = function(m,x,b) {
+  return m + b;
+};
 
 console.log('y success:', y(12, 1, 12) === 24);

lab/lab2/part1-functions-are-values.html

@@ -38,7 +38,10 @@
           exampleSum = exampleSum + arrayValue.length
         } else if (typeof arrayValue === 'number') {  // Number case
           exampleSum = exampleSum + arrayValue
-        } else {                                      // Otherwise
+        } else if (arraycondition) {
+          exampleSum = exampleSum + arryValue.length
+        }
+          else{                                     // Otherwise
           console.log("Not sure how to proceed with value:", arrayValue)
         }
       }
@@ -68,7 +71,7 @@
 
       /* Define your function here */
 
-      for (var i = 0; i < theArray.length, i++) { /* Inside the loop*/ }
+      for (var i = 0; i < theArray.length; i++) { /* Inside the loop*/ }
 
       /* =====================