From d29653318475ea0da32823591d7ee8d9e8249f51 Mon Sep 17 00:00:00 2001 From: dongpd Date: Tue, 29 Dec 2020 15:35:04 +0700 Subject: [PATCH] them filters trong form dong bo --- controllers/ListManagementController.php | 13 ++++++++++- views/list-management/index.tpl | 7 ++++-- views/list-management/list-server.tpl | 26 ++++++++++++++++++---- views/list-management/list-to-server.tpl | 24 +++++++++++++++++--- web/js/list-management.js | 28 ++++++++++++++++++++++++ 5 files changed, 88 insertions(+), 10 deletions(-) diff --git a/controllers/ListManagementController.php b/controllers/ListManagementController.php index e4e04d37..57664930 100644 --- a/controllers/ListManagementController.php +++ b/controllers/ListManagementController.php @@ -401,11 +401,16 @@ class ListManagementController extends Controller { ]) ] ])), true); + $filters = []; + foreach ($datas['data'] as $key => $value) { + $filters[$value['code']] = $value['code'] . " - " . $value['name'] . " - " . $value['department']; + } Yii::$app->response->format = "json"; return [ "title" => " Đồng bộ từ máy chủ", "form" => $this->renderPartial("list-server", [ "datas" => $datas['data'], + "filters" => $filters, "allID" => ListManagement::getAllID() ]) ]; @@ -633,10 +638,16 @@ class ListManagementController extends Controller { public function actionSyncToServer() { if (Yii::$app->request->isAjax) { Yii::$app->response->format = "json"; + $datas = ListManagement::find()->orderBy(["code" => SORT_ASC])->all(); + $filters = []; + foreach ($datas as $key => $value) { + $filters[$value->code] = $value->code . " - " . $value->name . " - " . $value->address; + } return [ "title" => " Đồng bộ lên máy chủ", "form" => $this->renderPartial("list-to-server", [ - "datas" => ListManagement::find()->orderBy(["code" => SORT_ASC])->all() + "datas" => $datas, + "filters" => $filters ]) ]; } diff --git a/views/list-management/index.tpl b/views/list-management/index.tpl index 8cd4f2e8..56e48e5d 100644 --- a/views/list-management/index.tpl +++ b/views/list-management/index.tpl @@ -28,9 +28,12 @@ .select2-container { width: 100% !important; } - .select2-container--default .select2-selection--single, .select2-selection .select2-selection--single{ + #form-add-staff .select2-container--default .select2-selection--single, .select2-selection .select2-selection--single{ border-color: green; } + .select2-container--default .select2-selection--single, .select2-selection .select2-selection--single{ + height: 34px !important; + } @@ -227,7 +230,7 @@ +
@@ -12,7 +30,7 @@ {foreach from=$datas item=arr} - +
{$arr.idStaff} @@ -52,13 +70,13 @@
- - - +
+ + + +
@@ -13,7 +31,7 @@ {foreach from=$datas item=arr} - + @@ -49,10 +67,10 @@
- -
{$arr->code} {$arr->name} {$arr->gender}