diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index 3d05251b..20867f74 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -445,13 +445,15 @@ class ListManagementController extends Controller { foreach ($datas['data'] as $key => $value) { $filters[$value['id']] = $value['code'] . " - " . $value['name'] . " - " . $value['department']; } + $deviceDatas = ListManagement::getAllID(); Yii::$app->response->format = "json"; return [ "title" => " " . Yii::t("app", "DONG_BO_TU_MAY_CHU"), "form" => $this->renderPartial("list-server", [ "datas" => $datas['data'], "filters" => $filters, - "allID" => ListManagement::getAllID() + "personImage" => $deviceDatas["imgCountArr"], + "allID" => $deviceDatas["idArr"] ]) ]; } @@ -555,13 +557,13 @@ class ListManagementController extends Controller { $model->image = json_encode($ft); $model->last_modified = time(); $model->save(); -// if ($totals <= 10) -// common::updateFeature([ -// "cmd" => "update", -// "id" => $model->id, -// "name" => common::convert_vi_to_en($model->name), -// "features" => $model->allFeatures -// ]); + if ($totals <= 10) + common::updateFeature([ + "cmd" => "update", + "id" => $model->id, + "name" => common::convert_vi_to_en($model->name), + "features" => $model->allFeatures + ]); } else { if (isset($data['images'])) { $extractFeature = $this->extractFeature($data['images'], $data['files_name'], $data['id']); @@ -587,13 +589,13 @@ class ListManagementController extends Controller { ]); $finish = $this->getCurrentTime(); $processTime["insertDB"] = round(($finish - $start), 4); -// if ($totals <= 10) -// common::updateFeature([ -// "cmd" => "create", -// "id" => $model->id, -// "name" => common::convert_vi_to_en($model->name), -// "features" => $model->allFeatures -// ]); + if ($totals <= 10) + common::updateFeature([ + "cmd" => "create", + "id" => $model->id, + "name" => common::convert_vi_to_en($model->name), + "features" => $model->allFeatures + ]); } $totalFinish = $this->getCurrentTime(); $processTime["total"] = round(($totalFinish - $totalStart), 4); diff --git a/messages/en/app.php b/messages/en/app.php index de3f286f..59a30fc6 100644 --- a/messages/en/app.php +++ b/messages/en/app.php @@ -136,5 +136,6 @@ return [ "MAT_KHAU" => "Password", "RESET_THIET_BI_LOI" => "Error connecting to the server. Please check your internet connection and try again.", "THU_LAI" => "Try again", - "TEN_DANG_NHAP_HOAC_MAT_KHAU_KHONG_DUNG" => "Incorrect username or password." + "TEN_DANG_NHAP_HOAC_MAT_KHAU_KHONG_DUNG" => "Incorrect username or password.", + "DOI_TUONG_CHUA_DU_ANH_MAU" => "Object does not have enough images" ]; diff --git a/messages/ja/app.php b/messages/ja/app.php index 9b8f1c66..3e814626 100644 --- a/messages/ja/app.php +++ b/messages/ja/app.php @@ -136,5 +136,6 @@ return [ "MAT_KHAU" => "パスワード", "RESET_THIET_BI_LOI" => "サーバーへの接続中にエラーが発生しました。インターネット接続を確認して、もう一度お試しください", "THU_LAI" => "再試行", - "TEN_DANG_NHAP_HOAC_MAT_KHAU_KHONG_DUNG" => "ユーザーネームまたはパスワードが違います" + "TEN_DANG_NHAP_HOAC_MAT_KHAU_KHONG_DUNG" => "ユーザーネームまたはパスワードが違います", + "DOI_TUONG_CHUA_DU_ANH_MAU" => "オブジェクトに十分な画像がありません" ]; diff --git a/messages/vi/app.php b/messages/vi/app.php index 8a5c16d2..a86cfb9d 100644 --- a/messages/vi/app.php +++ b/messages/vi/app.php @@ -136,5 +136,6 @@ return [ "MAT_KHAU" => "Mật khẩu", "RESET_THIET_BI_LOI" => "Lỗi kết nối đến server. Hãy kiểm tra lại kết nối internet và thử lại.", "THU_LAI" => "Thử lại", - "TEN_DANG_NHAP_HOAC_MAT_KHAU_KHONG_DUNG" => "Tên đăng nhập hoặc mật khẩu không đúng." + "TEN_DANG_NHAP_HOAC_MAT_KHAU_KHONG_DUNG" => "Tên đăng nhập hoặc mật khẩu không đúng.", + "DOI_TUONG_CHUA_DU_ANH_MAU" => "Đối tượng chưa đủ ảnh mẫu" ]; diff --git a/models/ListManagement.php b/models/ListManagement.php index 8e4158ce..849ec48c 100644 --- a/models/ListManagement.php +++ b/models/ListManagement.php @@ -110,12 +110,18 @@ class ListManagement extends \yii\db\ActiveRecord { } public static function getAllID() { - $res = []; + $idArr = []; + $imgCountArr = []; $ls = self::find()->all(); foreach ($ls as $key => $value) { - $res[] = $value->staff_id; + $idArr[] = $value->staff_id; + $images = json_decode($value->image, true); + $imgCountArr[$value->staff_id] = count($images); } - return $res; + return [ + "idArr" => $idArr, + "imgCountArr" => $imgCountArr + ]; } public static function staffArray() { diff --git a/views/list-management/list-server.tpl b/views/list-management/list-server.tpl index 5db6277c..07087c62 100644 --- a/views/list-management/list-server.tpl +++ b/views/list-management/list-server.tpl @@ -15,6 +15,11 @@ +
{json_encode($arr)}
{$arr.code}
@@ -38,7 +51,11 @@
{/if}
|
- {$arr.name} | ++ [{$totalImg}] + [{count($arr.images)}] + {$arr.name} + | {$arr.abbreviated_name} | {$arr.department} | @@ -56,6 +73,8 @@ |