diff --git a/app/app.js b/app/app.js
index 809ba8b..bb19e5f 100644
--- a/app/app.js
+++ b/app/app.js
@@ -9,9 +9,11 @@ app.factory('Foods', function($resource) {
return $resource('assets/json/foods.json');
});
-// app.factory('FoodDetail', function($resource) {
-// return $resource('assets/json/foodDetail.json');
-// });
+app.factory('FoodDetail', function($resource) {
+ // http://foodbank.develop.digitalmediauconn.org/api/getProductInfo/049000031249
+ // return $resource('https://example.com/api/food/:barcode', {barcode: '@barcode'});
+ return $resource('assets/json/foodDetail.json');
+});
app.factory('Categories', function($resource) {
return $resource('assets/json/categories.json');
diff --git a/app/pages/food/ctrl.js b/app/pages/food/ctrl.js
index a0b201b..ee72c58 100644
--- a/app/pages/food/ctrl.js
+++ b/app/pages/food/ctrl.js
@@ -1,4 +1,4 @@
-app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'Categories', '$cookies', function ($scope, $http, Foods, Categories, $cookies) {
+app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categories', '$cookies', function ($scope, $http, Foods, FoodDetail, Categories, $cookies) {
$scope.page.title = 'Food';
$scope.page.id = 'food';
@@ -22,6 +22,7 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'Categories', '$cookies'
// Initialize CRUD form
$scope.foodCRUD = {};
+ $scope.nutrientDetail = [];
// GET foods
Foods.get({}, function (data) {
@@ -62,6 +63,9 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'Categories', '$cookies'
$scope.view = function (foodToView) {
$scope.showModal = true;
$scope.foodCRUD = foodToView;
+ FoodDetail.get({barcode: foodToView.barcode}, function (data) {
+ $scope.nutrientDetail = data.data.nutrients;
+ });
};
// Modal : Cancel
diff --git a/app/pages/food/view.html b/app/pages/food/view.html
index a9e8d36..0384f0f 100644
--- a/app/pages/food/view.html
+++ b/app/pages/food/view.html
@@ -90,6 +90,13 @@
{{foodCRUD.name || "Add New Food"}}
Barcode: {{foodCRUD.barcode}}
Grade: {{foodCRUD.rank.name}}
Category: {{foodCRUD.category.name}}
+Nutrition Facts:
+
+ {{nutrient.nutrientName}}
+ {{nutrient.nutrientId}}
+ {{nutrient.units}}
+ {{nutrient.rank}}
+
diff --git a/app/pages/nutrients/ctrl.js b/app/pages/nutrients/ctrl.js
index 8c8b196..0616215 100644
--- a/app/pages/nutrients/ctrl.js
+++ b/app/pages/nutrients/ctrl.js
@@ -1,4 +1,4 @@
-app.controller('NutrientsCtrl', ['$scope', 'Nutrients', 'Nutrient', function ($scope, Nutrients, Nutrient) {
+app.controller('NutrientsCtrl', ['$scope', 'Nutrients', function ($scope, Nutrients) {
$scope.page.title = 'Nutrients';
$scope.page.id = 'nutrients';
diff --git a/app/pages/nutrients/view.html b/app/pages/nutrients/view.html
index 439a3c7..accb775 100644
--- a/app/pages/nutrients/view.html
+++ b/app/pages/nutrients/view.html
@@ -16,7 +16,7 @@ Nutrient Manager
-
+
diff --git a/assets/js/bundle.js b/assets/js/bundle.js
index cbd2ac1..43cd678 100644
--- a/assets/js/bundle.js
+++ b/assets/js/bundle.js
@@ -9,9 +9,11 @@ app.factory('Foods', function($resource) {
return $resource('assets/json/foods.json');
});
-// app.factory('FoodDetail', function($resource) {
-// return $resource('assets/json/foodDetail.json');
-// });
+app.factory('FoodDetail', function($resource) {
+ // http://foodbank.develop.digitalmediauconn.org/api/getProductInfo/049000031249
+ // return $resource('https://example.com/api/food/:barcode', {barcode: '@barcode'});
+ return $resource('assets/json/foodDetail.json');
+});
app.factory('Categories', function($resource) {
return $resource('assets/json/categories.json');
@@ -237,7 +239,7 @@ app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Catego
};
}]);
-app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'Categories', '$cookies', function ($scope, $http, Foods, Categories, $cookies) {
+app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'FoodDetail', 'Categories', '$cookies', function ($scope, $http, Foods, FoodDetail, Categories, $cookies) {
$scope.page.title = 'Food';
$scope.page.id = 'food';
@@ -261,6 +263,7 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'Categories', '$cookies'
// Initialize CRUD form
$scope.foodCRUD = {};
+ $scope.nutrientDetail = [];
// GET foods
Foods.get({}, function (data) {
@@ -301,6 +304,9 @@ app.controller('FoodCtrl', ['$scope', '$http', 'Foods', 'Categories', '$cookies'
$scope.view = function (foodToView) {
$scope.showModal = true;
$scope.foodCRUD = foodToView;
+ FoodDetail.get({barcode: foodToView.barcode}, function (data) {
+ $scope.nutrientDetail = data.data.nutrients;
+ });
};
// Modal : Cancel
@@ -403,7 +409,7 @@ app.factory('loginService', ['$http', function($http) {
}
};
}]);
-app.controller('NutrientsCtrl', ['$scope', 'Nutrients', 'Nutrient', function ($scope, Nutrients, Nutrient) {
+app.controller('NutrientsCtrl', ['$scope', 'Nutrients', function ($scope, Nutrients) {
$scope.page.title = 'Nutrients';
$scope.page.id = 'nutrients';
diff --git a/assets/json/foodDetail.json b/assets/json/foodDetail.json
index 88ce343..3f989d9 100644
--- a/assets/json/foodDetail.json
+++ b/assets/json/foodDetail.json
@@ -25,7 +25,7 @@
"nutrientId": 1,
"units": "g",
"rank": 2
- },
+ }
]
}
}