From d3961cf04008a831c65161ed6b5905753d6b083e Mon Sep 17 00:00:00 2001
From: dongpd <dongpd@beetinnovators.com>
Date: Wed, 4 Nov 2020 10:59:07 +0700
Subject: [PATCH] =?UTF-8?q?Th=C3=AAm=20d=E1=BA=A5u=20xu=E1=BB=91ng=20d?=
 =?UTF-8?q?=C3=B2ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helpers/StaffGrid.php | 4 ++--
 web/js/assign.js      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/helpers/StaffGrid.php b/helpers/StaffGrid.php
index 3ed153b0..3fdd25f1 100644
--- a/helpers/StaffGrid.php
+++ b/helpers/StaffGrid.php
@@ -96,8 +96,8 @@ class StaffGrid extends CommonGrid {
                 if (count($ls) <= 2) {
                     $alert = "<div id='short-{$model->id}'>" . implode("<br>", $doors) . "</div>";
                 } else {
-                    $alert = "<div id='short-{$model->id}'>" . $doors[0] . "<br>" . $doors[1] . "<a href='#' onclick='openDoorList(this, true);return false;' data='{$model->id}'><i class='fa fa-chevron-down'></i> Xem thêm</a></div>";
-                    $hidden = "<div id='full-{$model->id}' class='hidden'>" . implode("<br>", $doors) . "<a href='#' onclick='openDoorList(this, false);return false;' data='{$model->id}'><i class='fa fa-chevron-up'></i> Thu gọn</a></div>";
+                    $alert = "<div id='short-{$model->id}'>" . $doors[0] . "<br>" . $doors[1] . "<br><a href='#' onclick='openDoorList(this, true);return false;' data='{$model->id}'><i class='fa fa-chevron-down'></i> Xem thêm</a></div>";
+                    $hidden = "<div id='full-{$model->id}' class='hidden'>" . implode("<br>", $doors) . "<br><a href='#' onclick='openDoorList(this, false);return false;' data='{$model->id}'><i class='fa fa-chevron-up'></i> Thu gọn</a></div>";
                 }
                 return $alert . $hidden;
             }
diff --git a/web/js/assign.js b/web/js/assign.js
index cf799098..912cdd20 100644
--- a/web/js/assign.js
+++ b/web/js/assign.js
@@ -99,8 +99,8 @@ schedule.setSchedule = function (e) {
                     if (data.doors.length <= 2) {
                         alert = "<div id='short-{$model->id}'>" + data.doors.join("<br>") + "</div>";
                     } else {
-                        alert = "<div id='short-" + id + "'>" + data.doors[0] + "<br>" + data.doors[1] + "<a href='#' onclick='openDoorList(this, true);return false;' data='" + id + "'><i class='fa fa-chevron-down'></i> Xem thêm</a></div>";
-                        hidden = "<div id='full-" + id + "' class='hidden'>" + data.doors.join("<br>") + "<a href='#' onclick='openDoorList(this, false);return false;' data='" + id + "'><i class='fa fa-chevron-up'></i> Thu gọn</a></div>";
+                        alert = "<div id='short-" + id + "'>" + data.doors[0] + "<br>" + data.doors[1] + "<br><a href='#' onclick='openDoorList(this, true);return false;' data='" + id + "'><i class='fa fa-chevron-down'></i> Xem thêm</a></div>";
+                        hidden = "<div id='full-" + id + "' class='hidden'>" + data.doors.join("<br>") + "<br><a href='#' onclick='openDoorList(this, false);return false;' data='" + id + "'><i class='fa fa-chevron-up'></i> Thu gọn</a></div>";
                     }
                     $("#schedule-door-results-" + id).html(alert + hidden);
                 }