diff --git a/Views/rep_summary_a01View/rep_summary_a01_report.cshtml b/Views/rep_summary_a01View/rep_summary_a01_report.cshtml
index 5a0bf24..0ff1cf6 100644
--- a/Views/rep_summary_a01View/rep_summary_a01_report.cshtml
+++ b/Views/rep_summary_a01View/rep_summary_a01_report.cshtml
@@ -45,7 +45,7 @@
-
+
diff --git a/wwwroot/js/rep_eva01/rep_eva01_report.js b/wwwroot/js/rep_eva01/rep_eva01_report.js
deleted file mode 100644
index 7f351e2..0000000
--- a/wwwroot/js/rep_eva01/rep_eva01_report.js
+++ /dev/null
@@ -1,94 +0,0 @@
-var rep_eva01_API = "/api/rep_eva01/";
-
-function array_to_string_comma(a) {
- var x = "";
- $.each(a, function (index, value) {
- if (x !== "") x += ",";
- x += value;
- });
- return x;
-}
-
-//================= Search Customizaiton =========================================
-
-function rep_eva01_GetSearchParameter(fileType) {
- var rep_eva01SearchObject = new Object();
- rep_eva01SearchObject.org_id = $("#s_rep_eva01_org_id").val();
- rep_eva01SearchObject.round_id = $("#s_rep_eva01_round_id").val();
- rep_eva01SearchObject.round_text = $("#s_rep_eva01_round_id option:selected").text();
-
- rep_eva01SearchObject.fileType = fileType;
-
- console.log(rep_eva01SearchObject);
-
- return rep_eva01SearchObject;
-}
-
-function rep_eva01_FeedDataToSearchForm(data) {
- DropDownClearFormAndFeedWithDataOrg($("#s_rep_eva01_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
- DropDownClearFormAndFeedWithData($("#s_rep_eva01_round_id"), data, "id", "external_name", "item_round_id", data.id_guid);
-}
-
-function DropDownClearFormAndFeedWithDataOrg(d, result, x, y, z, i) {
- $(d).html('');
- $(d).append($("")
- .attr("value", "")
- .text("กรุณาเลือก"));
- $(d).append($("")
- .attr("value", "-1")
- .text("เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์"));
- if (z !== "") {
- $.each(result[z], function (key, value) {
- $(d).append($("")
- .attr("value", value[x])
- .text(value[y]));
- });
- } else {
- $.each(result, function (key, value) {
- $(d).append($("")
- .attr("value", value[x])
- .text(value[y]));
- });
- }
- $(d).val(i);
-}
-
-//================= Form Data Customizaiton =========================================
-
-function rep_eva01_InitialForm(s) {
- var successFunc = function (result) {
- rep_eva01_FeedDataToSearchForm(result);
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + rep_eva01_API + "GetBlankItem", successFunc, AlertDanger);
-}
-
-//================= Data Table =========================================
-
-var s_rep_eva01_customValidation = function (group) {
- return "";
-};
-
-
-function rep_eva01_DoSearch(fileType) {
- if (!ValidateForm('s_rep_eva01', s_rep_eva01_customValidation)) {
- return;
- }
-
- var p = $.param(rep_eva01_GetSearchParameter(fileType));
-
- var report_url = apisite + "/api/rep_eva01/rep_eva01_report?" + p;
-
- console.log(report_url);
-
- if (fileType === "pdf") {
- $("#report_result").attr("src", report_url);
- $("#report_result").show();
- //window.open(report_url);
- } else {
- $("#report_result").hide();
- window.open(report_url);
- }
-}
-
diff --git a/wwwroot/js/rep_summary_a01/rep_summary_a01.js b/wwwroot/js/rep_summary_a01/rep_summary_a01.js
deleted file mode 100644
index 931fc2d..0000000
--- a/wwwroot/js/rep_summary_a01/rep_summary_a01.js
+++ /dev/null
@@ -1,228 +0,0 @@
-var rep_summary_a01_editMode = "CREATE";
-var rep_summary_a01_API = "/api/rep_summary_a01/";
-
-//================= Search Customizaiton =========================================
-
-function rep_summary_a01_GetSearchParameter() {
- var rep_summary_a01SearchObject = new Object();
-rep_summary_a01SearchObject.org_id = $("#s_rep_summary_a01_org_id").val();
-rep_summary_a01SearchObject.round_id = $("#s_rep_summary_a01_round_id").val();
-rep_summary_a01SearchObject.employee_id = $("#s_rep_summary_a01_employee_id").val();
-
- return rep_summary_a01SearchObject;
-}
-
-function rep_summary_a01_FeedDataToSearchForm(data) {
-DropDownClearFormAndFeedWithData($("#s_rep_summary_a01_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
-DropDownClearFormAndFeedWithData($("#s_rep_summary_a01_round_id"), data, "id", "external_name", "item_round_id", data.round_id);
-DropDownClearFormAndFeedWithData($("#s_rep_summary_a01_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
-
-}
-
-//================= Form Data Customizaiton =========================================
-
-function rep_summary_a01_FeedDataToForm(data) {
-$("#rep_summary_a01_id").val(data.id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_round_id"), data, "id", "external_name", "item_round_id", data.round_id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
-
-}
-
-function rep_summary_a01_GetFromForm() {
- var rep_summary_a01Object = new Object();
-rep_summary_a01Object.id = $("#rep_summary_a01_id").val();
-rep_summary_a01Object.org_id = $("#rep_summary_a01_org_id").val();
-rep_summary_a01Object.round_id = $("#rep_summary_a01_round_id").val();
-rep_summary_a01Object.employee_id = $("#rep_summary_a01_employee_id").val();
-
-
- return rep_summary_a01Object;
-}
-
-function rep_summary_a01_InitialForm(s) {
- var successFunc = function (result) {
- rep_summary_a01_FeedDataToForm(result);
- rep_summary_a01_FeedDataToSearchForm(result);
- if (s) {
- // Incase model popup
- $("#rep_summary_a01Model").modal("show");
- }
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + rep_summary_a01_API + "GetBlankItem", successFunc, AlertDanger);
-}
-
-//================= Form Mode Setup and Flow =========================================
-
-function rep_summary_a01_GoCreate() {
- // Incase model popup
- rep_summary_a01_SetCreateForm(true);
-
- // Incase open new page
- //window_open(appsite + "/rep_summary_a01View/rep_summary_a01_d");
-}
-
-function rep_summary_a01_GoEdit(a) {
- // Incase model popup
- rep_summary_a01_SetEditForm(a);
-
- // Incase open new page
- //window_open(appsite + "/rep_summary_a01View/rep_summary_a01_d?id=" + a);
-}
-
-function rep_summary_a01_SetEditForm(a) {
- var successFunc = function (result) {
- rep_summary_a01_editMode = "UPDATE";
- rep_summary_a01_FeedDataToForm(result);
- $("#rep_summary_a01Model").modal("show");
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + rep_summary_a01_API + a, successFunc, AlertDanger);
-}
-
-function rep_summary_a01_SetCreateForm(s) {
- rep_summary_a01_editMode = "CREATE";
- rep_summary_a01_InitialForm(s);
-}
-
-function rep_summary_a01_RefreshTable() {
- // Incase model popup
- rep_summary_a01_DoSearch();
-
- // Incase open new page
- //window.parent.rep_summary_a01_DoSearch();
-}
-
-//================= Update and Delete =========================================
-
-var rep_summary_a01_customValidation = function (group) {
- return "";
-};
-
-function rep_summary_a01_PutUpdate() {
- if (!ValidateForm('rep_summary_a01', rep_summary_a01_customValidation))
- {
- return;
- }
-
- var data = rep_summary_a01_GetFromForm();
-
- //Update Mode
- if (rep_summary_a01_editMode === "UPDATE") {
- var successFunc1 = function (result) {
- $("#rep_summary_a01Model").modal("hide");
- AlertSuccess(result.code+" "+result.message);
- rep_summary_a01_RefreshTable();
- endLoad();
- };
- startLoad();
- AjaxPutRequest(apisite + rep_summary_a01_API + data.id, data, successFunc1, AlertDanger);
- }
- // Create mode
- else {
- var successFunc2 = function (result) {
- $("#rep_summary_a01Model").modal("hide");
- AlertSuccess(result.code+" "+result.message);
- rep_summary_a01_RefreshTable();
- endLoad();
- };
- startLoad();
- AjaxPostRequest(apisite + rep_summary_a01_API, data, successFunc2, AlertDanger);
- }
-}
-
-function rep_summary_a01_GoDelete(a) {
- if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
- var successFunc = function (result) {
- $("#rep_summary_a01Model").modal("hide");
- AlertSuccess(result.code+" "+result.message);
- rep_summary_a01_RefreshTable();
- endLoad();
- };
- startLoad();
- AjaxDeleteRequest(apisite + rep_summary_a01_API + a, null, successFunc, AlertDanger);
- }
-}
-
-//================= Data Table =========================================
-
-var rep_summary_a01TableV;
-
-var rep_summary_a01_setupTable = function (result) {
- tmp = '"';
- rep_summary_a01TableV = $('#rep_summary_a01Table').DataTable({
- "processing": true,
- "serverSide": false,
- "data": result,
- //"select": {
- // "style": 'multi'
- //},
- "columns": [
- //{ "data": "" },
- { "data": "id" },
- { "data": "id" },
- { "data": "org_id_external_linkage_external_name" },
- { "data": "round_id_external_linkage_external_name" },
- { "data": "employee_id_external_linkage_external_name" },
- ],
- "columnDefs": [
- {
- "targets": 0, //1,
- "data": "id",
- "render": function (data, type, row, meta) {
- return " ";
- }
- },
- //{
- // targets: 0,
- // data: "",
- // defaultContent: '',
- // orderable: false,
- // className: 'select-checkbox'
- //}
- ],
- "language": {
- "url": appsite + "/DataTables-1.10.16/thai.json"
- },
- "paging": true,
- "searching": false
- });
- endLoad();
-};
-
-function rep_summary_a01_InitiateDataTable() {
- startLoad();
- var p = $.param(rep_summary_a01_GetSearchParameter());
- AjaxGetRequest(apisite + "/api/rep_summary_a01/GetListBySearch?"+p, rep_summary_a01_setupTable, AlertDanger);
-}
-
-function rep_summary_a01_DoSearch() {
- var p = $.param(rep_summary_a01_GetSearchParameter());
- var rep_summary_a01_reload = function (result) {
- rep_summary_a01TableV.destroy();
- rep_summary_a01_setupTable(result);
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + "/api/rep_summary_a01/GetListBySearch?"+p, rep_summary_a01_reload, AlertDanger);
-}
-
-function rep_summary_a01_GetSelect(f) {
- var rep_summary_a01_selectitem = [];
- $.each(rep_summary_a01TableV.rows('.selected').data(), function (key, value) {
- rep_summary_a01_selectitem.push(value[f]);
- });
- alert(rep_summary_a01_selectitem);
-}
-
-//================= File Upload =========================================
-
-
-
-//================= Multi-Selection Function =========================================
-
-
-
diff --git a/wwwroot/js/rep_summary_a01/rep_summary_a01_d.js b/wwwroot/js/rep_summary_a01/rep_summary_a01_d.js
deleted file mode 100644
index 284cb34..0000000
--- a/wwwroot/js/rep_summary_a01/rep_summary_a01_d.js
+++ /dev/null
@@ -1,102 +0,0 @@
-var rep_summary_a01_editMode = "CREATE";
-var rep_summary_a01_API = "/api/rep_summary_a01/";
-
-//================= Form Data Customizaiton =========================================
-
-function rep_summary_a01_FeedDataToForm(data) {
-$("#rep_summary_a01_id").val(data.id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_round_id"), data, "id", "external_name", "item_round_id", data.round_id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
-
-}
-
-function rep_summary_a01_GetFromForm() {
- var rep_summary_a01Object = new Object();
-rep_summary_a01Object.id = $("#rep_summary_a01_id").val();
-rep_summary_a01Object.org_id = $("#rep_summary_a01_org_id").val();
-rep_summary_a01Object.round_id = $("#rep_summary_a01_round_id").val();
-rep_summary_a01Object.employee_id = $("#rep_summary_a01_employee_id").val();
-
-
- return rep_summary_a01Object;
-}
-
-function rep_summary_a01_InitialForm() {
- var successFunc = function (result) {
- rep_summary_a01_FeedDataToForm(result);
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + rep_summary_a01_API + "GetBlankItem", successFunc, AlertDanger);
-}
-
-//================= Form Mode Setup and Flow =========================================
-
-function rep_summary_a01_SetEditForm(a) {
- var successFunc = function (result) {
- rep_summary_a01_editMode = "UPDATE";
- rep_summary_a01_FeedDataToForm(result);
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + rep_summary_a01_API + a, successFunc, AlertDanger);
-}
-
-function rep_summary_a01_SetCreateForm() {
- rep_summary_a01_editMode = "CREATE";
- rep_summary_a01_InitialForm();
-}
-
-//================= Update and Delete =========================================
-
-var rep_summary_a01_customValidation = function (group) {
- return "";
-};
-
-function rep_summary_a01_PutUpdate() {
- if (!ValidateForm('rep_summary_a01', rep_summary_a01_customValidation))
- {
- return;
- }
- var data = rep_summary_a01_GetFromForm();
-
- //Update Mode
- if (rep_summary_a01_editMode === "UPDATE") {
- var successFunc1 = function (result) {
- AlertSuccess(result.code+" "+result.message);
- endLoad();
- };
- startLoad();
- AjaxPutRequest(apisite + rep_summary_a01_API + data.id, data, successFunc1, AlertDanger);
- }
- // Create mode
- else {
- var successFunc2 = function (result) {
- AlertSuccess(result.code+" "+result.message);
- endLoad();
- };
- startLoad();
- AjaxPostRequest(apisite + rep_summary_a01_API, data, successFunc2, AlertDanger);
- }
-}
-
-function rep_summary_a01_GoDelete(a) {
- if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) {
- var successFunc = function (result) {
- AlertSuccess(result.code+" "+result.message);
- rep_summary_a01_RefreshTable();
- endLoad();
- };
- startLoad();
- AjaxDeleteRequest(apisite + rep_summary_a01_API + a, null, successFunc, AlertDanger);
- }
-}
-
-//================= File Upload =========================================
-
-
-
-//================= Multi-Selection Function =========================================
-
-
diff --git a/wwwroot/js/rep_summary_a01/rep_summary_a01_inline.js b/wwwroot/js/rep_summary_a01/rep_summary_a01_inline.js
deleted file mode 100644
index 605b1b8..0000000
--- a/wwwroot/js/rep_summary_a01/rep_summary_a01_inline.js
+++ /dev/null
@@ -1,140 +0,0 @@
-function rep_summary_a01_ClearForm(i, blankItem) {
- var data = blankItem;
-$("#rep_summary_a01_id_" + i).val("");
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_round_id_" + i), blankItem, "id", "external_name", "item_round_id", data.round_id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_employee_id_" + i), blankItem, "id", "external_name", "item_employee_id", data.employee_id);
-
-}
-
-function rep_summary_a01_FeedDataToForm(data, i, blankItem) {
-$("#rep_summary_a01_id_" + i).val(data.id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_round_id_" + i), blankItem, "id", "external_name", "item_round_id", data.round_id);
-DropDownClearFormAndFeedWithData($("#rep_summary_a01_employee_id_" + i), blankItem, "id", "external_name", "item_employee_id", data.employee_id);
-
-}
-
-function rep_summary_a01_GetFromForm(obj, i) {
- var rep_summary_a01Object = new Object();
-rep_summary_a01Object.id = obj.find("#rep_summary_a01_id_" + i).val();
-rep_summary_a01Object.org_id = obj.find("#rep_summary_a01_org_id_" + i).val();
-rep_summary_a01Object.round_id = obj.find("#rep_summary_a01_round_id_" + i).val();
-rep_summary_a01Object.employee_id = obj.find("#rep_summary_a01_employee_id_" + i).val();
-
- rep_summary_a01Object.active_mode = obj.find("#isActive_" + i + "_rep_summary_a01").val();
- return rep_summary_a01Object;
-}
-
-function rep_summary_a01_GetAllData() {
- //Insert rep_summary_a01 List
- var rep_summary_a01 = [];
- $('#rep_summary_a01Body tr').each(function () {
- var i = $(this).find("#rowCount").text();
- var eachrep_summary_a01 = rep_summary_a01_GetFromForm($(this), i);
- rep_summary_a01.push(eachrep_summary_a01);
- });
- return rep_summary_a01;
-}
-
-function rep_summary_a01_Save(id) {
- //Insert rep_summary_a01 List
- var rep_summary_a01 = rep_summary_a01_GetAllData();
-
- var successFunc = function (result) {
- AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
- endLoad();
- };
- startLoad();
- AjaxPutRequest(apisite + '/api/rep_summary_a01/UpdateMultiple', rep_summary_a01, successFunc, AlertDanger);
-}
-
-function rep_summary_a01_Get(id, blankItem) {
-
- $('#rep_summary_a01Body').empty();
-
- var successFunc = function (response) {
- //console.log(response);
- $.each(response, function (i, data) {
- var tag = '';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
-
- tag += ' | ';
- tag += '
';
- $('#rep_summary_a01Body').append($(tag));
- rep_summary_a01_FeedDataToForm(data, (i + 1), blankItem);
- });
- rep_summary_a01_Summary();
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + "/api/rep_summary_a01", successFunc, AlertDanger);
- //AjaxGetRequest(apisite + '/api/rep_summary_a01/GetListByorg_id/' + a, successFunc, AlertDanger);
- //AjaxGetRequest(apisite + '/api/rep_summary_a01/GetListByround_id/' + a, successFunc, AlertDanger);
- //AjaxGetRequest(apisite + '/api/rep_summary_a01/GetListByemployee_id/' + a, successFunc, AlertDanger);
-
-}
-
-function rep_summary_a01_Add() {
- var successFunc = function (result) {
- var i = $("#rep_summary_a01Body tr").length;
- var tag = '';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
-
- tag += ' | ';
- tag += '
';
-
- $('#rep_summary_a01Body').append($(tag));
- rep_summary_a01_ClearForm(i + 1, result);
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + "/api/rep_summary_a01/" + "GetBlankItem", successFunc, AlertDanger);
-}
-
-function rep_summary_a01_Removerep_summary_a01(e) {
- if (confirm('กรุณากดตกลง เพื่อยืนยันการลบ?')) {
- $(e).closest('tr').find("input,select,textarea").attr('disabled', true);
- $(e).closest('tr').find("input,select,textarea").css({ opacity: '0.5' });
- $(e).hide();
- $(e).closest('tr').find("#restoreBtn").show();
- $(e).closest('tr').find("input").first().val("0");
- console.log($(e).closest('tr').find("input").first().val());
- rep_summary_a01_Summary();
- }
-}
-
-function rep_summary_a01_Restorerep_summary_a01(e) {
- if (confirm('กรุณากดตกลง เพื่อยืนยันการกู้คืน?')) {
- $(e).closest('tr').find("input,select,textarea").attr('disabled', false);
- $(e).closest('tr').find("input,select,textarea").css({ opacity: '1' });
- $(e).hide();
- $(e).closest('tr').find("#removeBtn").show();
- $(e).closest('tr').find("input").first().val("1");
- console.log($(e).closest('tr').find("input").first().val());
- rep_summary_a01_Summary();
- }
-}
-
-function rep_summary_a01_Summary() {
- var sum = 0;
- $(".input_score").each(function () {
- sum += +$(this).val();
- });
- $("#score_label").text("ผลรวม: " + sum);
-}
-
-function rep_summary_a01_InitialForm(id) {
- var successFunc = function (result) {
- rep_summary_a01_Get(id, result);
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + "/api/rep_summary_a01/" + "GetBlankItem", successFunc, AlertDanger);
-}
diff --git a/wwwroot/js/rep_summary_a01/rep_summary_a01_report.js b/wwwroot/js/rep_summary_a01/rep_summary_a01_report.js
index 1db6e5d..03aa998 100644
--- a/wwwroot/js/rep_summary_a01/rep_summary_a01_report.js
+++ b/wwwroot/js/rep_summary_a01/rep_summary_a01_report.js
@@ -17,12 +17,46 @@ function rep_summary_a01_GetSearchParameter(fileType) {
}
function rep_summary_a01_FeedDataToSearchForm(data) {
- DropDownClearFormAndFeedWithData($("#s_rep_summary_a01_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
+ DropDownClearFormAndFeedWithDataOrg($("#s_rep_summary_a01_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
DropDownClearFormAndFeedWithData($("#s_rep_summary_a01_round_id"), data, "id", "external_name", "item_round_id", data.round_id);
DropDownClearFormAndFeedWithData($("#s_rep_summary_a01_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id);
}
+function DropDownClearFormAndFeedWithDataOrg(d, result, x, y, z, i) {
+ $(d).html('');
+ $(d).append($("")
+ .attr("value", "")
+ .text("กรุณาเลือก"));
+ $(d).append($("")
+ .attr("value", "-1")
+ .text("เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์"));
+ if (z !== "") {
+ $.each(result[z], function (key, value) {
+ $(d).append($("")
+ .attr("value", value[x])
+ .text(value[y]));
+ });
+ } else {
+ $.each(result, function (key, value) {
+ $(d).append($("")
+ .attr("value", value[x])
+ .text(value[y]));
+ });
+ }
+ $(d).val(i);
+}
+
+function resetsearch() {
+ $("#s_rep_summary_a01_org_id").val('');
+ $("#s_rep_summary_a01_round_id").val('');
+ $("#s_rep_summary_a01_employee_id").val('');
+
+ $("#s_rep_summary_a01_org_id").trigger('change');
+ $("#s_rep_summary_a01_round_id").trigger('change');
+ $("#s_rep_summary_a01_employee_id").trigger('change');
+}
+
//================= Form Data Customizaiton =========================================
function rep_summary_a01_InitialForm(s) {