diff --git a/views/assign/index.tpl b/views/assign/index.tpl
index 28774f19..5a8348cd 100644
--- a/views/assign/index.tpl
+++ b/views/assign/index.tpl
@@ -21,11 +21,11 @@
#schedule-search-staff{
height: 700px;
background: #cecece;
- overflow-y: scroll;
+ overflow: scroll;
}
- #schedule-search-staff::-webkit-scrollbar {
+ {*#schedule-search-staff::-webkit-scrollbar {
display: none;
- }
+ }*}
#create-schedule-main{
border-left: 1px solid #cecece;
margin-bottom: -10px;
diff --git a/views/staff/form.tpl b/views/staff/form.tpl
index 452d02b8..d410a170 100644
--- a/views/staff/form.tpl
+++ b/views/staff/form.tpl
@@ -96,6 +96,9 @@
{html_options options=$deviceArray}
+
diff --git a/web/js/common.js b/web/js/common.js
index 1b977ef6..faefcc9b 100644
--- a/web/js/common.js
+++ b/web/js/common.js
@@ -222,13 +222,17 @@ common.getUrlParameter = function (sParam) {
}
};
common.error = function (id, text) {
- $("#" + id).addClass("has-error").removeClass("has-success");
+ $("#" + id).addClass("has-error").removeClass("has-success").removeClass("has-warning");
$("#" + id).find(".help-block").html(text).removeClass("hidden");
};
common.success = function (id) {
$("#" + id).addClass("has-success").removeClass("has-error");
$("#" + id).find(".help-block").addClass("hidden");
};
+common.warning = function (id, text) {
+ $("#" + id).addClass("has-warning").removeClass("has-error").removeClass("has-success");
+ $("#" + id).find(".help-block").html(text).removeClass("hidden");
+};
common.form = function (e, obj, bigSize) {
var size = bigSize | false;
common.modalBlock(true);
diff --git a/web/js/staff.js b/web/js/staff.js
index a62bb799..00f83486 100644
--- a/web/js/staff.js
+++ b/web/js/staff.js
@@ -270,7 +270,9 @@ function formGetRTLog(e) {
}
function getRTLog(e) {
- common.modalBlock(true);
+// common.modalBlock(true);
+ common.warning("device-lists", " Chờ tín hiệu thẻ (tối đa 60 giây)");
+ $("#spin-icon").removeClass("hidden");
$.ajax({
url: $(e).attr('data-href'),
type: 'POST',
@@ -278,18 +280,23 @@ function getRTLog(e) {
device: $("select[name='Device']").val()
},
success: function (data) {
- common.modalBlock(false);
+// common.modalBlock(false);
if (data.ErrorCode === "1") {
$("input[name='CardNumber']").val(data.CardNumber);
$("#device-lists").addClass("hidden");
$("#btn-get-rtlog").attr("data-stt", true);
+ $("#device-lists").removeClass("has-error").removeClass("has-warning");
+ $("#device-lists").find(".help-block").addClass("hidden");
+ $("#spin-icon").addClass("hidden");
} else {
- alert("Không có tín hiệu thẻ");
+ common.error("device-lists", " Không nhận được tín hiệu thẻ hoặc không có kết nối tới service");
+ $("#spin-icon").addClass("hidden");
}
},
error: function (jqXHR, textStatus, errorThrown) {
- common.modalBlock(false);
- alert("Không có tín hiệu thẻ");
+// common.modalBlock(false);
+ common.error("device-lists", " Không nhận được tín hiệu thẻ hoặc không có kết nối tới service");
+ $("#spin-icon").addClass("hidden");
}
});
}