diff --git a/app/pages/categories/ctrl.js b/app/pages/categories/ctrl.js index 9f515f9..41a927d 100644 --- a/app/pages/categories/ctrl.js +++ b/app/pages/categories/ctrl.js @@ -1,43 +1,4 @@ -function GetCategories() { - return [ - { - name: 'fruit', - rules: [ - { nutrient: 'sugar', - rule_id: '1', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] }, - { nutrient: 'sodium', - rule_id: '2', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gtoe', value: 2 } ] }, - { nutrient: 'satfat', - rule_id: '3', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] } ] - - }, - { - name: 'veggie', - rules: [ - { nutrient: 'sugar', - rule_id: '4', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] }, - { nutrient: 'sodium', - rule_id: '5', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] }, - { nutrient: 'satfat', - rule_id: '6', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] } ] - - } - ]; -} - function GetRanks() { return ['green', 'yellow']; } @@ -58,12 +19,17 @@ function SaveData(categories) { console.log('save'); } -app.controller('CategoryCtrl', ['$scope', function ($scope) { +app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Categories) { $scope.page.title = 'Categories'; $scope.page.id = 'cat'; $scope.page.yourVar = "globalStuff"; - $scope.categories = GetCategories(); + + // GET list of categories + Categories.get({}, function (data) { + $scope.categories = data.data; + }); + $scope.ranks = GetRanks(); $scope.nutrients = GetNutrients(); $scope.operations = GetOperations(); diff --git a/assets/js/bundle.js b/assets/js/bundle.js index 1a892e8..dc5bcbb 100644 --- a/assets/js/bundle.js +++ b/assets/js/bundle.js @@ -151,45 +151,6 @@ app.controller('404Ctrl', ['$scope', function ($scope) { -function GetCategories() { - return [ - { - name: 'fruit', - rules: [ - { nutrient: 'sugar', - rule_id: '1', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] }, - { nutrient: 'sodium', - rule_id: '2', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gtoe', value: 2 } ] }, - { nutrient: 'satfat', - rule_id: '3', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] } ] - - }, - { - name: 'veggie', - rules: [ - { nutrient: 'sugar', - rule_id: '4', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] }, - { nutrient: 'sodium', - rule_id: '5', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] }, - { nutrient: 'satfat', - rule_id: '6', - ranks: [ { name: 'green', operation: 'lt', value: 5 }, - { name: 'yellow', operation: 'gt', value: 2 } ] } ] - - } - ]; -} - function GetRanks() { return ['green', 'yellow']; } @@ -210,12 +171,17 @@ function SaveData(categories) { console.log('save'); } -app.controller('CategoryCtrl', ['$scope', function ($scope) { +app.controller('CategoryCtrl', ['$scope', 'Categories', function ($scope, Categories) { $scope.page.title = 'Categories'; $scope.page.id = 'cat'; $scope.page.yourVar = "globalStuff"; - $scope.categories = GetCategories(); + + // GET list of categories + Categories.get({}, function (data) { + $scope.categories = data.data; + }); + $scope.ranks = GetRanks(); $scope.nutrients = GetNutrients(); $scope.operations = GetOperations(); diff --git a/assets/json/categories.json b/assets/json/categories.json index d93b36c..78ae49f 100644 --- a/assets/json/categories.json +++ b/assets/json/categories.json @@ -1,22 +1,222 @@ { - "status": "ok", - "code": "200", - "data": [ - { - "id": "1", - "name": "Fruit" - }, - { - "id": "2", - "name": "Veggie" - }, - { - "id": "4", - "name": "Health" - }, - { - "id": "3", - "name": "Fattie" - } - ] + "status": "ok", + "code": "200", + "data": [ + { + "id": "1", + "name": "Fruit", + "rules": [ + { + "nutrient": "sugar", + "rule_id": "1", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gt", + "value": 2 + } + ] + }, + { + "nutrient": "sodium", + "rule_id": "2", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gtoe", + "value": 2 + } + ] + }, + { + "nutrient": "satfat", + "rule_id": "3", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gt", + "value": 2 + } + ] + } + ] + }, + { + "id": "2", + "name": "Veggie", + "rules": [ + { + "nutrient": "sugar", + "rule_id": "1", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gt", + "value": 2 + } + ] + }, + { + "nutrient": "sodium", + "rule_id": "2", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gtoe", + "value": 2 + } + ] + }, + { + "nutrient": "satfat", + "rule_id": "3", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gt", + "value": 2 + } + ] + } + ] + }, + { + "id": "4", + "name": "Health", + "rules": [ + { + "nutrient": "sugar", + "rule_id": "1", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gt", + "value": 2 + } + ] + }, + { + "nutrient": "sodium", + "rule_id": "2", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gtoe", + "value": 2 + } + ] + }, + { + "nutrient": "satfat", + "rule_id": "3", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gt", + "value": 2 + } + ] + } + ] + }, + { + "id": "3", + "name": "Fattie", + "rules": [ + { + "nutrient": "sugar", + "rule_id": "1", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gt", + "value": 2 + } + ] + }, + { + "nutrient": "sodium", + "rule_id": "2", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gtoe", + "value": 2 + } + ] + }, + { + "nutrient": "satfat", + "rule_id": "3", + "ranks": [ + { + "name": "green", + "operation": "lt", + "value": 5 + }, + { + "name": "yellow", + "operation": "gt", + "value": 2 + } + ] + } + ] + } + ] }