From 75073b956d85686409b147863ed8bafd53638266 Mon Sep 17 00:00:00 2001 From: dongpd Date: Wed, 9 Dec 2020 17:13:48 +0700 Subject: [PATCH] =?UTF-8?q?update=20t=C6=B0=C6=A1ng=20=E1=BB=A9ng=20v?= =?UTF-8?q?=E1=BB=9Bi=20db=20m=E1=BB=9Bi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/ApiController.php | 2 +- controllers/ListManagementController.php | 21 +++++++++++++++-- models/ListManagement.php | 2 +- views/capture-logs/index.tpl | 6 +++++ views/control-logs/index.tpl | 5 ++++ views/list-management/index.tpl | 8 ++++++- web/js/capture-logs.js | 6 +++++ web/js/list-management.js | 29 ++++++++++++++++++++---- 8 files changed, 70 insertions(+), 9 deletions(-) diff --git a/controllers/ApiController.php b/controllers/ApiController.php index 52597a97..4ad4a69b 100644 --- a/controllers/ApiController.php +++ b/controllers/ApiController.php @@ -71,7 +71,7 @@ class ApiController extends Controller { "Staff" => $post["id"], "Time" => $time, "Image" => $fileName, - "Confidence" => $post["confidence"] + "Confidence" => strval($post["confidence"]) ]); Yii::$app->response->format = "json"; return ["status" => "success"]; diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index a6c5500d..58e47178 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -64,6 +64,9 @@ class ListManagementController extends Controller { Yii::$app->response->format = "json"; if (Yii::$app->request->post()) { $data = Yii::$app->request->post(); + $check = ListManagement::findOne(['code' => $data['code']]); + if ($check) + return ["status" => false]; $features = json_decode(common::requestToEngine("/get-feature", [ "image_paths" => [ ["url" => "/var/www/html/BiFace_Server_Lite/web/data/uploads/face/" . $data['image'], "type" => "raw"] @@ -83,7 +86,7 @@ class ListManagementController extends Controller { Yii::$app->response->format = "json"; if (Yii::$app->request->post()) { $data = Yii::$app->request->post(); - $listManagement = ListManagement::findOne(['name' => $data['name']]); + $listManagement = ListManagement::findOne(['code' => $data['code']]); $url = CaptureLogs::findOne($data['id'])->image; if ($listManagement) { $images = json_decode($listManagement->image, true); @@ -99,8 +102,13 @@ class ListManagementController extends Controller { ] ]), true); $images[] = ["url" => $url, "features" => $features['results'][0]['feature']]; + $listManagement->type = $data['type']; + $listManagement->name = $data['name']; + $listManagement->gender = $data['gender']; + $listManagement->birthday = $data['birthday'] === "" ? 0 : date_format(date_create_from_format('d/m/Y', $data['birthday']), 'U'); + $listManagement->telephone = $data['telephone']; + $listManagement->address = $data['address']; $listManagement->image = json_encode($images); - $listManagement->time = time(); $listManagement->save(); file_get_contents("http://localhost:2305/update-feature"); return ["status" => true]; @@ -129,6 +137,7 @@ class ListManagementController extends Controller { Yii::$app->response->format = "json"; return [ "type" => $ListManagement->type, + "code" => $ListManagement->code, "name" => $ListManagement->name, "gender" => $ListManagement->gender, "birthday" => date("d/m/Y", $ListManagement->birthday), @@ -143,6 +152,9 @@ class ListManagementController extends Controller { if (Yii::$app->request->post()) { $data = Yii::$app->request->post(); $model = $this->findModel($data['id']); + $check = ListManagement::findOne(['code' => $data['code']]); + if ($check && $check->id != $model->id) + return false; if ($data['image'] !== "") { $features = json_decode(common::requestToEngine("/get-feature", [ "image_paths" => [ @@ -153,6 +165,7 @@ class ListManagementController extends Controller { $images[] = ["url" => $data['image'], "features" => $features['results'][0]['feature']]; $model->image = json_encode($images); } + $model->code = $data['code']; $model->type = $data['type']; $model->name = $data['name']; $model->gender = $data['gender']; @@ -294,4 +307,8 @@ class ListManagementController extends Controller { } } + public function actionTest() { + return base64_encode(file_get_contents("http://api.demo.beetai.com/view/image/5fd0845d9a4eb65bcfb0ea3b")); + } + } diff --git a/models/ListManagement.php b/models/ListManagement.php index 77b2f7cd..8013b889 100644 --- a/models/ListManagement.php +++ b/models/ListManagement.php @@ -59,7 +59,7 @@ class ListManagement extends \yii\db\ActiveRecord { public function create($data) { $r = $this->load([ - 'code' => $data['Code'], + 'code' => $data['code'], 'type' => $data['type'], 'name' => $data['name'], 'image' => $data['image'], diff --git a/views/capture-logs/index.tpl b/views/capture-logs/index.tpl index 99cf51b0..8fed06d1 100644 --- a/views/capture-logs/index.tpl +++ b/views/capture-logs/index.tpl @@ -96,6 +96,12 @@ +
+
Code
+
+ +
+
Name
diff --git a/views/control-logs/index.tpl b/views/control-logs/index.tpl index f1e4f311..dddede42 100644 --- a/views/control-logs/index.tpl +++ b/views/control-logs/index.tpl @@ -51,6 +51,11 @@ 'headerOptions' => ['class' => 'text-center', 'style' => 'width:15%'], 'value' => \app\helpers\CaptureLogsGrid::image() ], + [ + 'attribute' => 'confidence', + 'contentOptions' => ['class' => 'text-center'], + 'headerOptions' => ['class' => 'text-center'] + ], 'listManagement.name', 'listManagement.gender', 'listManagement.telephone', diff --git a/views/list-management/index.tpl b/views/list-management/index.tpl index 0b8a704c..7cddb904 100644 --- a/views/list-management/index.tpl +++ b/views/list-management/index.tpl @@ -40,7 +40,7 @@ 'rowOptions' => \app\helpers\ListManagementGrid::rows(), 'columns' => [ [ - 'attribute' => 'id', + 'attribute' => 'code', 'contentOptions' => ['class' => 'text-center'], 'headerOptions' => ['class' => 'text-center'] ], @@ -196,6 +196,12 @@
+
+
Code
+
+ +
+
Name
diff --git a/web/js/capture-logs.js b/web/js/capture-logs.js index 8f6fc6f3..fd0e750b 100644 --- a/web/js/capture-logs.js +++ b/web/js/capture-logs.js @@ -18,6 +18,11 @@ function _close() { } function _save(e) { + var code = $("input[name='Code']").val(); + if (code === "") { + alert("Hãy nhập mã đối tượng!"); + return; + } var name = $("input[name='Name']").val(); if (name === "") { alert("Hãy nhập tên!"); @@ -28,6 +33,7 @@ function _save(e) { url: $(e).attr("data-href"), type: 'POST', data: { + code: code, name: name, type: $("select[name='Type']").val(), gender: $("select[name='Gender']").val(), diff --git a/web/js/list-management.js b/web/js/list-management.js index 990a8a37..45c79b9f 100644 --- a/web/js/list-management.js +++ b/web/js/list-management.js @@ -60,6 +60,7 @@ function _formModified(e) { success: function (data) { common.modalBlock(false); $("select[name='Type']").val(data.type); + $("input[name='Code']").val(data.code); $("input[name='Name']").val(data.name); $("select[name='Gender']").val(data.gender); $("input[name='Birthday']").val(data.birthday); @@ -77,6 +78,11 @@ function _formModified(e) { } function _update(e) { + var code = $("input[name='Code']").val(); + if (code === "") { + alert("Hãy nhập mã đối tượng!"); + return; + } var name = $("input[name='Name']").val(); if (name === "") { alert("Hãy nhập tên!"); @@ -87,6 +93,7 @@ function _update(e) { url: $(e).attr("data-href"), type: 'POST', data: { + code: code, name: name, type: $("select[name='Type']").val(), gender: $("select[name='Gender']").val(), @@ -97,8 +104,12 @@ function _update(e) { image: $("input[name='AnhNhanVienUrl']").val() }, success: function (data) { - alert("Cập nhật dữ liệu thành công!"); - window.location.reload(true); + common.modalBlock(false); + if (data) { + alert("Cập nhật dữ liệu thành công!"); + window.location.reload(true); + } else + alert("Mã đối tượng đã tồn tại!"); }, error: function (jqXHR, textStatus, errorThrown) { common.modalBlock(false); @@ -225,6 +236,11 @@ function btnImage() { } function _create(e) { + var code = $("input[name='Code']").val(); + if (code === "") { + alert("Hãy nhập mã đối tượng!"); + return; + } var name = $("input[name='Name']").val(); if (name === "") { alert("Hãy nhập tên!"); @@ -240,6 +256,7 @@ function _create(e) { url: $(e).attr("data-href"), type: 'POST', data: { + code: code, name: name, type: $("select[name='Type']").val(), gender: $("select[name='Gender']").val(), @@ -249,8 +266,12 @@ function _create(e) { image: image }, success: function (data) { - alert("Cập nhật dữ liệu thành công!"); - window.location.reload(true); + common.modalBlock(false); + if (data.status) { + alert("Cập nhật dữ liệu thành công!"); + window.location.reload(true); + } else + alert("Mã đối tượng đã tồn tại!"); }, error: function (jqXHR, textStatus, errorThrown) { common.modalBlock(false);