From 66e88eea0cc46c26e609168572902457c24d98d8 Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Sun, 11 Oct 2020 14:30:26 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B9=81=E0=B8=A5=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=81=20=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rpt_payroll_summary_report.cshtml         |  6 ++---
 .../rpt_payroll_summary_report.js             | 23 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/Views/rpt_payroll_summaryView/rpt_payroll_summary_report.cshtml b/Views/rpt_payroll_summaryView/rpt_payroll_summary_report.cshtml
index 448f01b..4cc3582 100644
--- a/Views/rpt_payroll_summaryView/rpt_payroll_summary_report.cshtml
+++ b/Views/rpt_payroll_summaryView/rpt_payroll_summary_report.cshtml
@@ -14,13 +14,13 @@
         <ol class="breadcrumb" style="">
             <li class="breadcrumb-item "><a href="javascript:window_open_from_root('@Configuration["SiteInformation:mainsite"]');">หน้าแรก</a></li>
             <li class="breadcrumb-item "><a href="javascript:window_open_from_root('@Configuration["SiteInformation:modulesite"]');">@Configuration["SiteInformation:modulename"]</a></li>
-            <li class="breadcrumb-item active">รายงานเงินเดือน</li>
+            <li class="breadcrumb-item active">รายงานสรุปยอดเงินรับของพนักงาน</li>
         </ol>
     </div>
 </div>
 
 <section class="wrapper">
-    <div class="title"><div class="line"></div>รายงานเงินเดือน</div>
+    <div class="title"><div class="line"></div>รายงานสรุปยอดเงินรับของพนักงาน</div>
     <div class="tools">
         <div class="row">
             <div class="col-md-12">
@@ -38,7 +38,7 @@
 
                         <div class="form-group col-md-6">
                             <label id='lab_s_rpt_payroll_summary_department_id' for='s_rpt_payroll_summary_department_id'>หน่วยงาน</label>
-                            <select class="form-control" id="s_rpt_payroll_summary_department_id" iLabel="หน่วยงาน" iRequire="true" iGroup="s_rpt_payroll_summary" title='หน่วยงาน' placeholder='หน่วยงาน'></select>
+                            <select class="form-control" id="s_rpt_payroll_summary_department_id" iLabel="หน่วยงาน" iRequire="false" iGroup="s_rpt_payroll_summary" title='หน่วยงาน' placeholder='หน่วยงาน'></select>
                         </div>
                 
 				</div>
diff --git a/wwwroot/js/rpt_payroll_summary/rpt_payroll_summary_report.js b/wwwroot/js/rpt_payroll_summary/rpt_payroll_summary_report.js
index c6424d3..3c2f474 100644
--- a/wwwroot/js/rpt_payroll_summary/rpt_payroll_summary_report.js
+++ b/wwwroot/js/rpt_payroll_summary/rpt_payroll_summary_report.js
@@ -19,10 +19,31 @@ rpt_payroll_summarySearchObject.department_id = $("#s_rpt_payroll_summary_depart
 function rpt_payroll_summary_FeedDataToSearchForm(data) {
 DropDownClearFormAndFeedWithData($("#s_rpt_payroll_summary_rpt_year"), data, "id", "external_name", "item_rpt_year", data.rpt_year);
 DropDownClearFormAndFeedWithData($("#s_rpt_payroll_summary_rpt_month"), data, "id", "external_name", "item_rpt_month", data.rpt_month);
-DropDownClearFormAndFeedWithData($("#s_rpt_payroll_summary_department_id"), data, "id", "external_name", "item_department_id", data.department_id);
+DropDownClearFormAndFeedWithDataOrg($("#s_rpt_payroll_summary_department_id"), data, "id", "external_name", "item_department_id", data.department_id);
 
 }
 
+function DropDownClearFormAndFeedWithDataOrg(d, result, x, y, z, i) {
+    $(d).html('');
+    $(d).append($("<option></option>")
+        .attr("value", "")
+        .text("เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์"));
+    if (z !== "") {
+        $.each(result[z], function (key, value) {
+            $(d).append($("<option></option>")
+                .attr("value", value[x])
+                .text(value[y]));
+        });
+    } else {
+        $.each(result, function (key, value) {
+            $(d).append($("<option></option>")
+                .attr("value", value[x])
+                .text(value[y]));
+        });
+    }
+    $(d).val(i);
+}
+
 //================= Form Data Customizaiton =========================================
 
 function rpt_payroll_summary_InitialForm(s) {