spending vis hooked up to all-time data

browser/js/meals/meals.js

@@ -128,7 +128,7 @@ app.factory('MealFactory', function($http) {
     MealFactory.getMealPlan = function(userId) {
         return $http.get(`api/users/${userId}/meals`)
             .then(function(response) {
-                return response.data;
+                return response.data[0];
             });
     };
 

browser/js/my-account/my-account.js

@@ -13,6 +13,9 @@ app.config(function ($stateProvider) {
                 .then(function(user) {
                     return MemberInfoFactory.getUser(user.id);
                 })
+            },
+            activeMealPlan: function(VisFactory, currentUser) {
+                return VisFactory.getActiveMealPlan(currentUser.id)
             }
         }
     })

browser/js/visualizations/categories/categories-vis.js

@@ -1,12 +1,7 @@
-app.controller('CategoriesCtrl', ($scope, $log, currentUser, VisFactory) => {
+app.controller('CategoriesCtrl', ($scope, $log, currentUser, activeMealPlan, VisFactory) => {
 
-	VisFactory.getActiveMealPlan(currentUser.id)
-	.then(mealPlan => {
-		// array of recipe objects in active mealPlan
-		$scope.activeMealPlan = mealPlan;
-		$scope.data = VisFactory.buildCategoryData($scope.activeMealPlan);
-	})
-	.catch($log.error);
+	$scope.activeMealPlan = activeMealPlan[0];
+	$scope.data = VisFactory.buildCategoryData($scope.activeMealPlan);
 
 	$scope.options = {
 		chart: {
@@ -16,5 +11,4 @@ app.controller('CategoriesCtrl', ($scope, $log, currentUser, VisFactory) => {
 			duration: 250
 		}
 	};
-
 });

browser/js/visualizations/overlap/overlap-vis.js

@@ -1,6 +1,6 @@
 /* eslint-disable */
 
-app.controller('OverlapCtrl', ($scope, $log, currentUser, VisFactory) => {
+app.controller('OverlapCtrl', ($scope, $log, currentUser, activeMealPlan, VisFactory) => {
 
 	$scope.diameter = 600;
 
@@ -21,8 +21,6 @@ app.controller('OverlapCtrl', ($scope, $log, currentUser, VisFactory) => {
 	    .angle(function(d) { return d.x / 180 * Math.PI; });
 
 	var svg = d3.select("svg")
-	    // .attr("width", $scope.diameter)
-	    // .attr("height", $scope.diameter)
 	    .attr("preserveAspectRatio", "xMinYMin meet")
 	    .attr("viewBox", "0 0 600 600")
 	  .append("g")
@@ -32,37 +30,33 @@ app.controller('OverlapCtrl', ($scope, $log, currentUser, VisFactory) => {
 	    node = svg.append("g").selectAll(".node");
 
 	// get user data
-	VisFactory.getActiveMealPlan(currentUser.id)
-	.then(mealPlan => {
-		$scope.activeMealPlan = mealPlan;
-		$scope.data = VisFactory.buildOverlapData($scope.activeMealPlan)
-
-		// build data into chart
-	  	var nodes = cluster.nodes(packageHierarchy($scope.data)),
-	      	links = packageImports(nodes);
-
-	  	link = link
-	    	  	.data(bundle(links))
-	   		.enter().append("path")
-	      		.each(function(d) {
-	      		d.source = d[0];
-	      		d.target = d[d.length - 1]
-	      	})
-	      	.attr("class", "link")
-	      	.attr("d", line);
-
-	  	node = node
-	      		.data(nodes.filter(function(n) { return !n.children; }))
-	    	.enter().append("text")
-	      		.attr("class", "node")
-	      		.attr("dy", ".31em")
-	      		.attr("transform", function(d) { return "rotate(" + (d.x - 90) + ")translate(" + (d.y + 8) + ",0)" + (d.x < 180 ? "" : "rotate(180)"); })
-	      		.style("text-anchor", function(d) { return d.x < 180 ? "start" : "end"; })
-	      		.text(function(d) { return d.key; })
-	      		.on("mouseover", mouseovered)
-	      		.on("mouseout", mouseouted);
-	})
-	.catch($log.error);
+	$scope.activeMealPlan = activeMealPlan[0];
+	$scope.data = VisFactory.buildOverlapData($scope.activeMealPlan)
+
+	// build data into chart
+  	var nodes = cluster.nodes(packageHierarchy($scope.data)),
+      	links = packageImports(nodes);
+
+  	link = link
+    	  	.data(bundle(links))
+   		.enter().append("path")
+      		.each(function(d) {
+      		d.source = d[0];
+      		d.target = d[d.length - 1]
+      	})
+      	.attr("class", "link")
+      	.attr("d", line);
+
+  	node = node
+      		.data(nodes.filter(function(n) { return !n.children; }))
+    	.enter().append("text")
+      		.attr("class", "node")
+      		.attr("dy", ".31em")
+      		.attr("transform", function(d) { return "rotate(" + (d.x - 90) + ")translate(" + (d.y + 8) + ",0)" + (d.x < 180 ? "" : "rotate(180)"); })
+      		.style("text-anchor", function(d) { return d.x < 180 ? "start" : "end"; })
+      		.text(function(d) { return d.key; })
+      		.on("mouseover", mouseovered)
+      		.on("mouseout", mouseouted);
 
 	function mouseovered(d) {
 	  node

browser/js/visualizations/spending/spending-vis.js

@@ -1,14 +1,33 @@
-app.controller('SpendingCtrl', ($scope, currentUser) => {
+app.controller('SpendingCtrl', ($scope, $log, currentUser, activeMealPlan, VisFactory) => {
+
+	$scope.activeMealPlan = [activeMealPlan[0]];
+	$scope.lightActiveMealPlan = activeMealPlan[1];
+
+	VisFactory.getCompletedMealPlans(currentUser.id)
+	.then(mpArr => {
+		$scope.lightCompletedMealPlans = mpArr[0];
+		$scope.completedMealPlans = mpArr[1];
+	})
+	.then(() => {
+		VisFactory.getUserPrefs(currentUser.id)
+		.then(prefs => {
+			$scope.numPeople = prefs.numPeople;
+			let loadedMealArr = [...$scope.completedMealPlans, ...$scope.activeMealPlan];
+			let lightMealArr = [...$scope.lightCompletedMealPlans, $scope.lightActiveMealPlan];
+			$scope.data = VisFactory.buildSpendingData(loadedMealArr, lightMealArr, $scope.numPeople);
+		})
+		.catch($log.error);
+	})
+	.catch($log.error);
 
 	$scope.options = {
 		chart: {
 			type: 'lineChart',
 			height: 500,
 			margin: {
 				top: 20,
-				// right: 400,
-				bottom: 50
-				// left: 400
+				bottom: 50,
+				left: 40
 			},
 			x: (d) => { return d[0] },
 			y: (d) => { return d[1] },
@@ -28,48 +47,4 @@ app.controller('SpendingCtrl', ($scope, currentUser) => {
             }
 		},
 	};
-
-	$scope.data = [{
-		key: 'Marley Spoon',
-		values: [[1, 10.33], [2, 10.33], [3, 10.33], [4, 10.33], [5, 10.33], [6, 10.33]]	// $62
-	}, {
-		key: 'Blue Apron',
-		values: [[1, 9.99], [2, 9.99], [3, 9.99], [4, 9.99], [5, 9.99], [6, 9.99]]	// $59.94
-	}, {
-		key: 'Dish\'d',
-		values: [
-			[1, 2.99], [2, 7.34], [3, 1.52], [4, 2.57], [5, 3.87], [6, 4.70]]
-	}]
-
-	// nv.utils.windowResize = function(scope, handler) {
-	//     // Legacy support
-	//     if (typeof scope === 'function') {
-	//         handler = scope;
-	//         scope = undefined;
-	//         nv.deprecated('WARNING: Failed to pass $scope when binding to windowResize event');
-	//     }
-
-	//     if (window.addEventListener) {
-	//         window.addEventListener('resize', handler);
-	//     } else {
-	//         nv.log("ERROR: Failed to bind to window.resize with: ", handler);
-	//     }
-	//     // return object with clear function to remove the single added callback.
-	//     var retObj = {
-	//         callback: handler,
-	//         clear: function() {
-	//             window.removeEventListener('resize', handler);
-	//         }
-	//     };
-
-	//     // Hookup our auto-destroy if passed scope
-	//     if (scope){
-	//         scope.$on('$destroy', function(){
-	//             'use strict';
-	//             retObj.clear();
-	//         });
-	//     }
-
-	//     return retObj;
-	// };
 });

browser/js/visualizations/vis-factory.js

@@ -2,7 +2,21 @@ app.factory('VisFactory', function($http){
     return {
         getActiveMealPlan: (userId) => {
             return $http.get(`api/users/${userId}/meals`)
-            .then((response) => {
+            .then(response => {
+                return response.data;
+            })
+        },
+
+        getCompletedMealPlans: (userId) => {
+            return $http.get(`api/users/${userId}/history`)
+            .then(response => {
+                return response.data;
+            })
+        },
+
+        getUserPrefs: (userId) => {
+            return $http.get(`api/users/${userId}/preferences`)
+            .then(response => {
                 return response.data;
             })
         },
@@ -127,6 +141,41 @@ app.factory('VisFactory', function($http){
                 }
             });
             return data;
+        },
+
+        buildSpendingData: (loadedMealArr, lightMealArr, numPeople) => {
+            let data = [{
+                key: 'Marley Spoon',
+                values: []
+            }, {
+                key: 'Blue Apron',
+                values: []
+            }, {
+                key: 'Dish\'d',
+                values: []
+            }]
+
+            // build data in d3 format
+            for (let i = 0; i < lightMealArr.length; i++) {
+                let price = +lightMealArr[i].price;
+                let divisor = loadedMealArr[i].length * numPeople;
+                let pricePerServ = price / divisor;
+
+                data[0].values.push([i + 1, 10.33]);
+                data[1].values.push([i + 1, 9.99]);
+                data[2].values.push([i + 1, pricePerServ]);
+            }
+            return data;
         }
     }
 });
+
+
+
+
+
+
+
+
+
+

server/app/routes/user/history-routes.js

@@ -5,9 +5,10 @@ const Recipe = db.model('recipe');
 const router = require('express').Router({mergeParams: true});
 const Promise = require('bluebird');
 
+// mounted on /api/users/:userId/history
+
 // get detailed history.
 router.get('', (req, res, next) => {
-
 	let id = req.params.userId;
 	let mealPlansLight = {}
 
@@ -37,7 +38,6 @@ router.get('', (req, res, next) => {
 		res.send([mealPlansLight, detailedMealPlans]);
 	})
 	.catch(next);
-
 });
 
 // get details of one meal plan.

server/app/routes/user/meal-routes.js

@@ -23,7 +23,7 @@ router.get('', (req, res, next) => {
       let planPromises = plan.meals.map(recId => Recipe.findById(recId));
       Promise.all(planPromises)
       .then(meals => {
-        res.send(meals)
+        res.send([meals, plan])
       })
       .catch(next);
     }
@@ -57,6 +57,20 @@ router.get('', (req, res, next) => {
   })
 });
 
+// add price for a particular meal plan
+router.put('/:mealPlanId', (req, res, next) => {
+  MealPlan.findById(req.params.mealPlanId)
+  .then(mealPlan => {
+    return mealPlan.update({
+      price: req.body.price
+    })
+    .then(updatedPlan => {
+      res.json(updatedPlan);
+    })
+  })
+  .catch(next);
+});
+
 //mark existing plan as completed and get a fresh meal plan
 router.put('', (req, res, next) => {
 

server/db/models/meal-plan-model.js

@@ -8,7 +8,11 @@ const db = require('../_db');
 module.exports = db.define('mealPlan', {
   status: Sequelize.ENUM('active', 'complete'),
   meals: Sequelize.ARRAY(Sequelize.INTEGER),
-  groceryList: Sequelize.JSON
+  groceryList: Sequelize.JSON,
+  price: {
+  	type: Sequelize.DECIMAL,
+  	defaultValue: 0.00
+  }
 },
 {
 	instanceMethods: {