From 6d87d47d68ffb3b1aed8d63869f7dbd8a0715fad Mon Sep 17 00:00:00 2001
From: dongpd <dongpd@beetinnovators.com>
Date: Fri, 22 Jan 2021 16:16:18 +0700
Subject: [PATCH] update new feature

---
 controllers/ApiController.php | 21 +++++++++++++++++----
 models/ListManagement.php     | 18 ++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/controllers/ApiController.php b/controllers/ApiController.php
index be3b14fb..f296f8fb 100644
--- a/controllers/ApiController.php
+++ b/controllers/ApiController.php
@@ -124,17 +124,30 @@ class ApiController extends Controller {
         $allFeatures = [];
         foreach ($listManagement as $key => $value) {
             $features = json_decode($value->image, true);
-            $f = [];
+//            $f = [];
+//            foreach ($features as $k => $v) {
+//                $f[] = $v['features'];
+//                if (isset($v['features512']))
+//                    if (count($v['features512']))
+//                        $f[] = $v['features512'];
+//            }
+//            $allFeatures[] = [
+//                "id" => $value->id,
+//                "name" => $this->convert_vi_to_en($value->name),
+//                "features" => $f
+//            ];
+            $feature1 = $feature2 = [];
             foreach ($features as $k => $v) {
-                $f[] = $v['features'];
+                $feature1[] = $v['features'];
                 if (isset($v['features512']))
                     if (count($v['features512']))
-                        $f[] = $v['features512'];
+                        $feature2[] = $v['features512'];
             }
             $allFeatures[] = [
                 "id" => $value->id,
                 "name" => $this->convert_vi_to_en($value->name),
-                "features" => $f
+                "feature1" => $feature1,
+                "feature2" => $feature2
             ];
         }
         Yii::$app->response->format = "json";
diff --git a/models/ListManagement.php b/models/ListManagement.php
index 8cca0fb0..eb0f9121 100644
--- a/models/ListManagement.php
+++ b/models/ListManagement.php
@@ -118,14 +118,24 @@ class ListManagement extends \yii\db\ActiveRecord {
 
     public function getAllFeatures() {
         $features = json_decode($this->image, true);
-        $f = [];
+//        $f = [];
+//        foreach ($features as $k => $v) {
+//            $f[] = $v['features'];
+//            if (isset($v['features512']))
+//                if (count($v['features512']))
+//                    $f[] = $v['features512'];
+//        }
+        $feature1 = $feature2 = [];
         foreach ($features as $k => $v) {
-            $f[] = $v['features'];
+            $feature1[] = $v['features'];
             if (isset($v['features512']))
                 if (count($v['features512']))
-                    $f[] = $v['features512'];
+                    $feature2[] = $v['features512'];
         }
-        return $f;
+        return [
+            "feature1" => $feature1,
+            "feature2" => $feature2
+        ];
     }
 
     public static function statisticFeatures() {