diff --git a/api/routes/category.php b/api/routes/category.php index 137363d..84a24cb 100644 --- a/api/routes/category.php +++ b/api/routes/category.php @@ -15,19 +15,21 @@ ], "data" => [] ]; - +//[strtolower($rule->getRank()->getName())][$rule->getNutrient()->getName()] foreach( $cats as $cat ) { $rules = []; $q = new CategoryRankNutrientQuery; - $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByRankId()->find(); + $requestedCatRules = $q->filterByCategoryId($cat->getId())->orderByNutrientId()->find(); foreach($requestedCatRules as $rule) { - $rules[$rule->getNutrient()->getName()][] = [ - "nutrientName" => $rule->getNutrient()->getName(), - "nutrientId" => $rule->getNutrient()->getId(), - "operator" => $rule->getOperator(), - "threshold" => $rule->getThreshold(), - "units" => $rule->getUnits(), - "rank" => $rule->getRankId() + $rules[] = [ + "ruleId" => $rule->getId(), + "nutrientName" => $rule->getNutrient()->getName(), + "nutrientId" => $rule->getNutrient()->getId(), + "operator" => $rule->getOperator(), + "threshold" => $rule->getThreshold(), + "units" => $rule->getUnits(), + "rank" => $rule->getRankId(), + "categoryId" => $rule->getCategoryId() ]; } @@ -35,7 +37,7 @@ $response_json["data"][] = [ "id" => $cat->getId(), "name" => $cat->getName(), - "rules" => $rules + "rules" => [$rules] ]; } diff --git a/api/routes/rules.php b/api/routes/rules.php index 0b81736..83b1d1e 100644 --- a/api/routes/rules.php +++ b/api/routes/rules.php @@ -14,12 +14,14 @@ foreach($requestedCatRules as $rule) { $response_json["data"][] = [ + "ruleId" => $rule->getId(), "nutrientName" => $rule->getNutrient()->getName(), "nutrientId" => $rule->getNutrient()->getId(), "operator" => $rule->getOperator(), "threshold" => $rule->getThreshold(), "units" => $rule->getUnits(), - "rank" => $rule->getRankId() + "rank" => $rule->getRankId(), + "categoryId" => $rule->getCategoryId() ]; }