diff --git a/app/app.js b/app/app.js index b5998c6..8ae4155 100644 --- a/app/app.js +++ b/app/app.js @@ -20,7 +20,7 @@ app.factory('Food', function ($resource) { }); app.factory('Categories', function($resource) { - return $resource('assets/json/categories.json'); + return $resource('http://foodbank.develop.digitalmediauconn.org/api/index.php/category/all'); }); // TODO: 'Nutrients' factory TEMPORARY diff --git a/app/pages/categories/ctrl.js b/app/pages/categories/ctrl.js index 41a927d..d99d832 100644 --- a/app/pages/categories/ctrl.js +++ b/app/pages/categories/ctrl.js @@ -44,32 +44,28 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego }; $scope.addRule = function(categoryName) { - var categoryIndex = $scope.getCategoryIndexFromName(categoryName); + /*var categoryIndex = $scope.getCategoryIndexFromName(categoryName); if(categoryIndex != -1) { $scope.categories[categoryIndex].rules.push({ nutrient: 'sugar', rule_id: '0', ranks: [ { name: 'green', operation: 'lt', value: 5 }, { name: 'yellow', operation: 'gt', value: 2 } ] }); - } + }*/ }; $scope.removeRule = function(category, rule) { - for(var i = 0; i < category.rules.length; i++) { + /*for(var i = 0; i < category.rules.length; i++) { if(category.rules[i] == rule) { category.rules.splice(i, 1); } - } + }*/ }; $scope.addCategory = function() { $scope.categories.push({name: 'New Category', rules: []}) }; - $scope.renameCategory = function(category, name) { - console.log(name); - }; - $scope.removeCategory = function(category) { for(var i = 0; i < $scope.categories.length; i++) { if($scope.categories[i] == category) { diff --git a/app/pages/categories/view.html b/app/pages/categories/view.html index 15c172b..7ecfec1 100644 --- a/app/pages/categories/view.html +++ b/app/pages/categories/view.html @@ -11,7 +11,7 @@ - +
|
- + |
-
+
|
@@ -46,13 +46,13 @@ |