diff --git a/inspection/neakeun_work_confirm.asp b/inspection/neakeun_work_confirm.asp
index 5e24b52..4426e7a 100644
--- a/inspection/neakeun_work_confirm.asp
+++ b/inspection/neakeun_work_confirm.asp
@@ -42,7 +42,7 @@
%>
checked <% end if %>> 전체보기
@@ -115,7 +115,14 @@
sql = sql & " LEFT JOIN t_neakeun_pay TMP with(nolock) ON CONVERT(varchar(10), NW.id) = TMP.attribute01 AND s_gubun NOT LIKE '추가%' " & VbCrlf
sql = sql & " LEFT JOIN Document D with(nolock) on TMP.attribute05 = D.d_no AND D.d_delok = 'N' " & VbCrlf
sql = sql & " LEFT JOIN man MA with(nolock) ON MA.m_name = NW.neakeun_name AND LEFT(MA.m_jumin, 6) = LEFT(NW.neakeun_jumin, 6) " & VbCrlf
- sql = sql & " WHERE NW.[date] BETWEEN '"& split(p_field_date_week,"@")(0) &"' and '"& split(p_field_date_week,"@")(1) &"' " & VbCrlf
+ 'sql = sql & " WHERE NW.[date] BETWEEN '"& split(p_field_date_week,"@")(0) &"' and '"& split(p_field_date_week,"@")(1) &"' " & VbCrlf
+ If p_field_date_week = "ALL" Then
+ sql = sql & " WHERE NW.[date] >= DATEFROMPARTS(LEFT('" & p_field_date_month & "',4), RIGHT('" & p_field_date_month & "',2), 1) "
+ sql = sql & " AND NW.[date] < DATEADD(MONTH,1, DATEFROMPARTS(LEFT('" & p_field_date_month & "',4), RIGHT('" & p_field_date_month & "',2), 1)) "
+ sql = sql & vbCrLf
+ Else
+ sql = sql & " WHERE NW.[date] BETWEEN '"& split(p_field_date_week,"@")(0) &"' and '"& split(p_field_date_week,"@")(1) &"' " & VbCrlf
+ End If
sql = sql & " AND NW.in_time + NW.out_time <> '00000000' " & VbCrlf
'실사 부서장일 경우 sv 관계 없이 다 보여줌
if command <> "all_view" then
@@ -290,7 +297,12 @@
function week_load(week) {
$("select[name=p_field_date_week] option").remove();
$("select[name=p_field_date_week]").html(ajaxResponse);
- $("select[name=p_field_date_week]").val(week).prop("selected", "selected");
+ if (!week) {
+ $("select[name=p_field_date_week]").val("ALL");
+ } else {
+ $("select[name=p_field_date_week]").val(week);
+ }
+ //$("select[name=p_field_date_week]").val(week).prop("selected", "selected");
}
diff --git a/inspection/neakeun_work_week_ajax.asp b/inspection/neakeun_work_week_ajax.asp
index 3640bc1..661f705 100644
--- a/inspection/neakeun_work_week_ajax.asp
+++ b/inspection/neakeun_work_week_ajax.asp
@@ -7,7 +7,7 @@
Response.AddHeader "cache-control", "no-staff"
Response.Expires = -1
- Response.Write ""
+ Response.Write ""
tmp_date = p_field_date_month + "-01"
tmp_last_day = DateAdd("d", -1, DateAdd("m", 1, tmp_date))