diff --git a/controllers/ApiController.php b/controllers/ApiController.php index bd4c5090..eb3137d7 100644 --- a/controllers/ApiController.php +++ b/controllers/ApiController.php @@ -159,6 +159,7 @@ class ApiController extends Controller { } public function actionResetData() { + return file_get_contents("https://bischool.beetai.com/view/image/5f7c1b22dfe5aaf427a6dfa1"); \Yii::$app->db->createCommand()->truncateTable('capture_logs')->execute(); \Yii::$app->db->createCommand()->truncateTable('list_management')->execute(); } diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index 507752bc..366ea1b2 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -308,7 +308,8 @@ class ListManagementController extends Controller { return [ "title" => " Đồng bộ từ máy chủ", "form" => $this->renderPartial("list-server", [ - "datas" => $datas['data'] + "datas" => $datas['data'], + "allID" => ListManagement::getAllID() ]) ]; } @@ -343,13 +344,16 @@ class ListManagementController extends Controller { foreach ($data['images'] as $key => $value) { $key = common::generateRandomString(); $fileName = "face_" . $key . "_" . time() . ".png"; - file_put_contents($targetPath . "/" . $fileName, file_get_contents($value)); - $features = json_decode(common::requestToEngine("/get-feature", [ - "image_paths" => [ - ["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $fileName, "type" => "raw"] - ] - ]), true); - $ft[] = ["url" => $fileName, "features" => $features['results'][0]['feature']]; + $img = file_get_contents($value); + if ($img !== "null") { + file_put_contents($targetPath . "/" . $fileName, $img); + $features = json_decode(common::requestToEngine("/get-feature", [ + "image_paths" => [ + ["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $fileName, "type" => "raw"] + ] + ]), true); + $ft[] = ["url" => $fileName, "features" => $features['results'][0]['feature']]; + } } $model = ListManagement::findOne(['code' => $data['idStaff']]); if ($model) { diff --git a/models/ListManagement.php b/models/ListManagement.php index 7d676909..85549cf0 100644 --- a/models/ListManagement.php +++ b/models/ListManagement.php @@ -98,4 +98,13 @@ class ListManagement extends \yii\db\ActiveRecord { return $res; } + public static function getAllID() { + $res = []; + $ls = self::find()->all(); + foreach ($ls as $key => $value) { + $res[] = $value->code; + } + return $res; + } + } diff --git a/views/list-management/list-server.tpl b/views/list-management/list-server.tpl index e5c38af1..03bf2928 100644 --- a/views/list-management/list-server.tpl +++ b/views/list-management/list-server.tpl @@ -12,8 +12,13 @@ {foreach from=$datas item=arr} - - {$arr.idStaff} + + + {$arr.idStaff} + {if in_array($arr.idStaff,$allID)} + + {/if} + {$arr.name} {$arr.department} @@ -35,7 +40,7 @@
Đã lựa chọn 0 đối tượng.
-
+
-
+
+ diff --git a/web/js/list-management.js b/web/js/list-management.js index d1741478..59332458 100644 --- a/web/js/list-management.js +++ b/web/js/list-management.js @@ -332,6 +332,12 @@ function checkAllSync(stt) { } } +function checkAllNotInList() { + $("#sync-lists").find("tr").removeClass("success").attr("data-stt", "false"); + $(".not-in-list").addClass("success").attr("data-stt", "true"); + $("#totals-choose").html($(".not-in-list").length); +} + var progress = 0; var totals = 0; function _sync() { @@ -348,7 +354,7 @@ function _sync() { $("#progress-form").removeClass("hidden"); totals = lists.length; for (var i = 0; i < lists.length; i++) { - syncFeatureFromDevice(lists[i]); + syncFeatureFromDevice(lists[i]); } }