diff --git a/controllers/AssignController.php b/controllers/AssignController.php
index cfd61551..03f938f7 100644
--- a/controllers/AssignController.php
+++ b/controllers/AssignController.php
@@ -109,7 +109,7 @@ class AssignController extends Controller {
Yii::$app->response->format = "json";
return [
"schedule" => Schedule::findOne($post['schedule'])->name,
- "doors" => implode("
", $doors)
+ "doors" => $doors
];
}
}
diff --git a/helpers/StaffGrid.php b/helpers/StaffGrid.php
index 5ababf11..3ed153b0 100644
--- a/helpers/StaffGrid.php
+++ b/helpers/StaffGrid.php
@@ -86,14 +86,22 @@ class StaffGrid extends CommonGrid {
public static function doors($array) {
return function($model) use ($array) {
$doors = [];
+ $alert = $hidden = "";
if ($model->door_access) {
$ls = json_decode($model->door_access, true);
foreach ($ls as $key => $value) {
if (isset($array[$value]))
$doors[] = $array[$value];
}
+ if (count($ls) <= 2) {
+ $alert = "
" . implode("
", $doors) . "
";
+ } else {
+ $alert = "" . $doors[0] . "
" . $doors[1] . "
Xem thêm ";
+ $hidden = "" . implode("
", $doors) . "
Thu gọn ";
+ }
+ return $alert . $hidden;
}
- return implode("
", $doors);
+ return "";
};
}
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index 0928d03a..cd90a725 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -3,9 +3,8 @@
- file:/C:/xampp/htdocs/Server_AccessControl/views/device/doors.tpl
- file:/C:/xampp/htdocs/Server_AccessControl/web/js/device.js
- file:/C:/xampp/htdocs/Server_AccessControl/controllers/DeviceController.php
+ file:/C:/xampp/htdocs/Server_AccessControl/helpers/StaffGrid.php
+ file:/C:/xampp/htdocs/Server_AccessControl/views/assign/staff.tpl
diff --git a/web/js/assign.js b/web/js/assign.js
index 9754e4c9..cf799098 100644
--- a/web/js/assign.js
+++ b/web/js/assign.js
@@ -92,8 +92,17 @@ schedule.setSchedule = function (e) {
notification.success("Đã lưu thông tin", 1000);
$.each($("input[name='checkbox-staff-schedule']:checked"), function () {
if ($(this).val() !== "0") {
- $("#schedule-staff-results-" + $(this).val()).html(data.schedule);
- $("#schedule-door-results-" + $(this).val()).html(data.doors);
+ var id = $(this).val();
+ $("#schedule-staff-results-" + id).html(data.schedule);
+ var alert = "";
+ var hidden = "";
+ if (data.doors.length <= 2) {
+ alert = "" + data.doors.join("
") + "
";
+ } else {
+ alert = "" + data.doors[0] + "
" + data.doors[1] + "
Xem thêm ";
+ hidden = "" + data.doors.join("
") + "
Thu gọn ";
+ }
+ $("#schedule-door-results-" + id).html(alert + hidden);
}
});
@@ -103,4 +112,15 @@ schedule.setSchedule = function (e) {
common.ajaxError();
}
});
-};
\ No newline at end of file
+};
+
+function openDoorList(e, stt) {
+ var id = $(e).attr("data");
+ if (stt) {
+ $("#short-" + id).addClass("hidden");
+ $("#full-" + id).removeClass("hidden");
+ } else {
+ $("#short-" + id).removeClass("hidden");
+ $("#full-" + id).addClass("hidden");
+ }
+}
\ No newline at end of file