diff --git a/controllers/ApiController.php b/controllers/ApiController.php index eb3137d7..78166b18 100644 --- a/controllers/ApiController.php +++ b/controllers/ApiController.php @@ -159,7 +159,7 @@ class ApiController extends Controller { } public function actionResetData() { - return file_get_contents("https://bischool.beetai.com/view/image/5f7c1b22dfe5aaf427a6dfa1"); +// 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/CaptureLogsController.php b/controllers/CaptureLogsController.php index 731c2f9b..f3c67cb9 100644 --- a/controllers/CaptureLogsController.php +++ b/controllers/CaptureLogsController.php @@ -8,6 +8,7 @@ use app\models\CaptureLogsSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; +use app\models\ListManagement; /** * CaptureLogsController implements the CRUD actions for CaptureLogs model. @@ -43,17 +44,17 @@ class CaptureLogsController extends Controller { $dataProvider->query->andWhere(["BETWEEN", "capture_logs.time", $f, $t]); $dataProvider->query->orderBy(["time" => SORT_DESC]); - $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ - 'http' => [ - 'header' => "Content-Type: application/json", - 'method' => "POST" - ] - ])), true); - $data = json_decode($tempConfig['data'], true); - $last = \app\models\ListManagement::find()->orderBy(['id' => SORT_DESC])->limit(1)->one(); - if (!is_object($last)) - $last = (object) ['id' => 0]; - $idAuto = $data['data']['box_id'] . "_" . ($last->id + 1); +// $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ +// 'http' => [ +// 'header' => "Content-Type: application/json", +// 'method' => "POST" +// ] +// ])), true); +// $data = json_decode($tempConfig['data'], true); +// $last = \app\models\ListManagement::find()->orderBy(['id' => SORT_DESC])->limit(1)->one(); +// if (!is_object($last)) +// $last = (object) ['id' => 0]; +// $idAuto = $data['data']['box_id'] . "_" . ($last->id + 1); return $this->render('index', [ 'searchModel' => $searchModel, @@ -61,7 +62,8 @@ class CaptureLogsController extends Controller { 'statusArray' => CaptureLogs::$statusArray, 'f' => $f, 't' => $t, - 'idAuto' => $idAuto +// 'idAuto' => $idAuto, + "staffArray" => ListManagement::staffArray() ]); } diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index 3882d43a..40f4155b 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -50,17 +50,17 @@ class ListManagementController extends Controller { $dataProvider->query->andWhere(["gender" => $gender]); $dataProvider->query->orderBy(["time" => SORT_DESC]); - $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ - 'http' => [ - 'header' => "Content-Type: application/json", - 'method' => "POST" - ] - ])), true); - $data = json_decode($tempConfig['data'], true); - $last = \app\models\ListManagement::find()->orderBy(['id' => SORT_DESC])->limit(1)->one(); - if (!is_object($last)) - $last = (object) ['id' => 0]; - $idAuto = $data['data']['box_id'] . "_" . ($last->id + 1); +// $tempConfig = json_decode(file_get_contents("http://localhost:4004/ReadEngineConfig", false, stream_context_create([ +// 'http' => [ +// 'header' => "Content-Type: application/json", +// 'method' => "POST" +// ] +// ])), true); +// $data = json_decode($tempConfig['data'], true); +// $last = \app\models\ListManagement::find()->orderBy(['id' => SORT_DESC])->limit(1)->one(); +// if (!is_object($last)) +// $last = (object) ['id' => 0]; +// $idAuto = $data['data']['box_id'] . "_" . ($last->id + 1); return $this->render('index', [ 'searchModel' => $searchModel, 'dataProvider' => $dataProvider, @@ -68,7 +68,8 @@ class ListManagementController extends Controller { 't' => $t, 'typeArray' => ListManagement::$typeArray, 'genderArray' => ListManagement::$genderArray, - 'idAuto' => $idAuto +// 'idAuto' => $idAuto, + "staffArray" => ListManagement::staffArray() ]); } @@ -382,7 +383,7 @@ class ListManagementController extends Controller { 'type' => "wl", 'name' => $data['name'], 'image' => json_encode($ft), - 'gender' => "", + 'gender' => "Male", 'birthday' => "", 'telephone' => "", 'address' => $data['department'] @@ -451,4 +452,19 @@ class ListManagementController extends Controller { } } + public function actionChooseStaff() { + if (Yii::$app->request->post()) { + $post = Yii::$app->request->post(); + $staff = ListManagement::findOne(['code' => $post['code']]); + Yii::$app->response->format = "json"; + return [ + "name" => $staff->name, + "gender" => $staff->gender, + "birthday" => date("d/m/Y", $staff->birthday), + "telephone" => $staff->telephone, + "department" => $staff->address + ]; + } + } + } diff --git a/models/ListManagement.php b/models/ListManagement.php index 85549cf0..266b5e11 100644 --- a/models/ListManagement.php +++ b/models/ListManagement.php @@ -107,4 +107,13 @@ class ListManagement extends \yii\db\ActiveRecord { return $res; } + public static function staffArray() { + $res = []; + $ls = self::find()->all(); + foreach ($ls as $key => $value) { + $res[$value->code] = $value->code . " - " . $value->name; + } + return $res; + } + } diff --git a/views/capture-logs/index.tpl b/views/capture-logs/index.tpl index bd376099..06c93831 100644 --- a/views/capture-logs/index.tpl +++ b/views/capture-logs/index.tpl @@ -14,6 +14,12 @@ .table-striped > tbody > tr:nth-of-type(odd){ background-color: rgb(210, 210, 210); } + .select2-container { + width: 100% !important; + } + .select2-container--default .select2-selection--single, .select2-selection .select2-selection--single{ + border-color: green; + }
@@ -99,7 +105,10 @@
ID
- +
diff --git a/views/control-logs/index.tpl b/views/control-logs/index.tpl index dddede42..09059359 100644 --- a/views/control-logs/index.tpl +++ b/views/control-logs/index.tpl @@ -65,7 +65,8 @@ 'headerOptions' => ['class' => 'text-center'], 'value' => \app\helpers\CaptureLogsGrid::birthday() ], - 'listManagement.address' + 'listManagement.address', + 'sync_status' ] ])}
diff --git a/views/list-management/index.tpl b/views/list-management/index.tpl index 22f2b08c..32003c05 100644 --- a/views/list-management/index.tpl +++ b/views/list-management/index.tpl @@ -25,8 +25,13 @@ background-color: red; color: #fff; } + .select2-container { + width: 100% !important; + } + .select2-container--default .select2-selection--single, .select2-selection .select2-selection--single{ + border-color: green; + } - @@ -144,9 +149,9 @@

- + *} @@ -203,10 +208,13 @@
-
+
diff --git a/web/js/capture-logs.js b/web/js/capture-logs.js index fd0e750b..8ccd621e 100644 --- a/web/js/capture-logs.js +++ b/web/js/capture-logs.js @@ -1,6 +1,7 @@ $(function () { common.dateTimePickerByClass("datepicker", "HH:mm DD/MM/YYYY"); common.dateTimePickerDay("birthday"); + $("#Code").select2(); }); function _search(e) { @@ -18,9 +19,9 @@ function _close() { } function _save(e) { - var code = $("input[name='Code']").val(); + var code = $("select[name='Code']").val(); if (code === "") { - alert("Hãy nhập mã đối tượng!"); + alert("Hãy chọn đối tượng!"); return; } var name = $("input[name='Name']").val(); @@ -51,4 +52,27 @@ function _save(e) { common.ajaxError(); } }); +} + +function chooseStaff(e) { + common.modalBlock(true); + $.ajax({ + url: $(e).attr("data-href"), + type: 'POST', + data: { + code: $(e).val() + }, + success: function (data) { + common.modalBlock(false); + $("input[name='Name']").val(data.name); + $("select[name='Gender']").val(data.gender); + $("input[name='Birthday']").val(data.birthday); + $("input[name='Telephone']").val(data.telephone); + $("input[name='Address']").val(data.department); + }, + error: function (jqXHR, textStatus, errorThrown) { + common.modalBlock(false); + common.ajaxError(); + } + }); } \ No newline at end of file diff --git a/web/js/list-management.js b/web/js/list-management.js index b424c040..fa9b7337 100644 --- a/web/js/list-management.js +++ b/web/js/list-management.js @@ -15,6 +15,7 @@ $(function () { } }); btnImage(); + $("#Code").select2(); }); function _search(e) { @@ -60,7 +61,7 @@ function _formModified(e) { success: function (data) { common.modalBlock(false); $("select[name='Type']").val(data.type); - $("input[name='Code']").val(data.code); + $("select[name='Code']").val(data.code); $("input[name='Name']").val(data.name); $("select[name='Gender']").val(data.gender); $("input[name='Birthday']").val(data.birthday); @@ -78,9 +79,9 @@ function _formModified(e) { } function _update(e) { - var code = $("input[name='Code']").val(); + var code = $("select[name='Code']").val(); if (code === "") { - alert("Hãy nhập mã đối tượng!"); + alert("Hãy chọn đối tượng!"); return; } var name = $("input[name='Name']").val(); @@ -241,9 +242,9 @@ function btnImage() { } function _create(e) { - var code = $("input[name='Code']").val(); + var code = $("select[name='Code']").val(); if (code === "") { - alert("Hãy nhập mã đối tượng!"); + alert("Hãy chọn đối tượng!"); return; } var name = $("input[name='Name']").val(); @@ -460,4 +461,27 @@ function updateFeature() { error: function (jqXHR, textStatus, errorThrown) { } }); +} + +function chooseStaff(e) { + common.modalBlock(true); + $.ajax({ + url: $(e).attr("data-href"), + type: 'POST', + data: { + code: $(e).val() + }, + success: function (data) { + common.modalBlock(false); + $("input[name='Name']").val(data.name); + $("select[name='Gender']").val(data.gender); + $("input[name='Birthday']").val(data.birthday); + $("input[name='Telephone']").val(data.telephone); + $("input[name='Address']").val(data.department); + }, + error: function (jqXHR, textStatus, errorThrown) { + common.modalBlock(false); + common.ajaxError(); + } + }); } \ No newline at end of file