Fixed nutrients page. ready to use /nutrients/all

dmd-web-and-mobile · Feb 20, 2017 · c0820eb · c0820eb
1 parent c011acc
commit c0820eb
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 13 deletions.
diff --git 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
@@ -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
@@ -90,6 +90,13 @@ <h4>{{foodCRUD.name || "Add New Food"}}</h4>
 <p>Barcode: <span>{{foodCRUD.barcode}}</span></p>
 <p>Grade: <span>{{foodCRUD.rank.name}}</span></p>
 <p>Category: <span>{{foodCRUD.category.name}}</span></p>
+<p>Nutrition Facts:</p>
+<div ng-repeat="nutrient in nutrientDetail">
+  {{nutrient.nutrientName}}
+  {{nutrient.nutrientId}}
+  {{nutrient.units}}
+  {{nutrient.rank}}
+</div>
 
 <!-- NOTE: End of page content -->
 

diff --git 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
@@ -16,7 +16,7 @@ <h1 class="nutrientsTitle">Nutrient Manager</h1>
 </div>
 
 <!-- Modal -->
-<div ng-show="editMode || createMode" class="foodModal">
+<!-- <div ng-show="editMode || createMode" class="foodModal">
 <div class="CRUD">
 <h4>{{editMode && "Edit nutrient" || "Create a nutrient"}}</h4>
 
@@ -33,5 +33,5 @@ <h4>{{editMode && "Edit nutrient" || "Create a nutrient"}}</h4>
   </form>
 
 </div>
-</div>
+</div> -->
 <!-- End of Modal -->
diff --git 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
@@ -25,7 +25,7 @@
 				"nutrientId": 1,
 				"units": "g",
 				"rank": 2
-			},
+			}
 		]
 	}
 }