Index: arms/html/reqStatus/content-container.html =================================================================== diff -u -re8e154f1f92c0e6d1b634ea5b0582df390f0abcf -r0af68bb2c5249979a1da80154dc2e4e14cff9afa --- arms/html/reqStatus/content-container.html (.../content-container.html) (revision e8e154f1f92c0e6d1b634ea5b0582df390f0abcf) +++ arms/html/reqStatus/content-container.html (.../content-container.html) (revision 0af68bb2c5249979a1da80154dc2e4e14cff9afa) @@ -126,12 +126,12 @@
- Index: arms/js/reqStatus.js =================================================================== diff -u -rd28c6821ea97621949a2252ccd84bc7d0d6c0efc -r0af68bb2c5249979a1da80154dc2e4e14cff9afa --- arms/js/reqStatus.js (.../reqStatus.js) (revision d28c6821ea97621949a2252ccd84bc7d0d6c0efc) +++ arms/js/reqStatus.js (.../reqStatus.js) (revision 0af68bb2c5249979a1da80154dc2e4e14cff9afa) @@ -97,46 +97,54 @@ type: "GET", contentType: "application/json;charset=UTF-8", dataType: "json", - progress: true - }) - .done(function (data) { - for (var k in data) { - var obj = data[k]; - if ( isEmpty(obj)){ - console.log("obj is null"); - }else{ + progress: true, + statusCode: { + 200: function (data) { + ////////////////////////////////////////////////////////// + for (var k in data.response) { + var obj = data.response[k]; var newOption = new Option(obj.c_title, obj.c_id, false, false); - $("#country").append(newOption).trigger("change"); + $("#selected_pdService").append(newOption).trigger("change"); } + ////////////////////////////////////////////////////////// } - }) - .fail(function (e) {}) - .always(function () {}); -} // end makePdServiceSelectBox() + }, + beforeSend: function () { + //$("#regist_pdservice").hide(); 버튼 감추기 + }, + complete: function () { + //$("#regist_pdservice").show(); 버튼 보이기 + }, + error: function (e) { + jError("제품(서비스) 조회 중 에러가 발생했습니다."); + } + }); -$("#country").on("select2:open", function () { - //슬림스크롤 - makeSlimScroll(".select2-results__options"); -}); -// --- select2 ( 제품(서비스) 검색 및 선택 ) 이벤트 --- // -$("#country").on("select2:select", function (e) { - // 제품( 서비스 ) 선택했으니까 자동으로 버전을 선택할 수 있게 유도 - // 디폴트는 base version 을 선택하게 하고 ( select all ) - //~> 이벤트 연계 함수 :: Version 표시 jsTree 빌드 - bind_VersionData_By_PdService(); + $("#selected_pdService").on("select2:open", function () { + //슬림스크롤 + makeSlimScroll(".select2-results__options"); + }); - var checked = $("#checkbox1").is(":checked"); - var endPointUrl = ""; + // --- select2 ( 제품(서비스) 검색 및 선택 ) 이벤트 --- // + $("#selected_pdService").on("select2:select", function (e) { + // 제품( 서비스 ) 선택했으니까 자동으로 버전을 선택할 수 있게 유도 + // 디폴트는 base version 을 선택하게 하고 ( select all ) + //~> 이벤트 연계 함수 :: Version 표시 jsTree 빌드 + bind_VersionData_By_PdService(); - if (checked) { - endPointUrl = "/T_ARMS_REQSTATUS_" + $("#country").val() + "/getStatusMonitor.do?disable=true"; - } else { - endPointUrl = "/T_ARMS_REQSTATUS_" + $("#country").val() + "/getStatusMonitor.do?disable=false"; - } - common_dataTableLoad($("#country").val(), endPointUrl); -}); + var checked = $("#checkbox1").is(":checked"); + var endPointUrl = ""; + // if (checked) { + // endPointUrl = "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/getStatusMonitor.do?disable=true"; + // } else { + // endPointUrl = "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/getStatusMonitor.do?disable=false"; + // } + // common_dataTableLoad($("#selected_pdService").val(), endPointUrl); + }); +} // end makePdServiceSelectBox() + //////////////////////////////////////////////////////////////////////////////////////// //버전 멀티 셀렉트 박스 //////////////////////////////////////////////////////////////////////////////////////// @@ -151,39 +159,35 @@ var endPointUrl = ""; var versionTag = $(".multiple-select").val(); - if (checked) { - endPointUrl = - "/T_ARMS_REQSTATUS_" + $("#country").val() + "/getStatusMonitor.do?disable=true&versionTag=" + versionTag; - common_dataTableLoad($("#country").val(), endPointUrl); - } else { - endPointUrl = - "/T_ARMS_REQSTATUS_" + $("#country").val() + "/getStatusMonitor.do?disable=false&versionTag=" + versionTag; - common_dataTableLoad($("#country").val(), endPointUrl); - } + // if (checked) { + // endPointUrl = + // "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/getStatusMonitor.do?disable=true&versionTag=" + versionTag; + // common_dataTableLoad($("#selected_pdService").val(), endPointUrl); + // } else { + // endPointUrl = + // "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/getStatusMonitor.do?disable=false&versionTag=" + versionTag; + // common_dataTableLoad($("#selected_pdService").val(), endPointUrl); + // } } }); } function bind_VersionData_By_PdService() { $(".multiple-select option").remove(); $.ajax({ - url: "/auth-user/api/arms/pdServiceVersion/getVersionList.do?c_id=" + $("#country").val(), + url: "/auth-user/api/arms/pdService/getVersionList.do?c_id=" + $("#selected_pdService").val(), type: "GET", - contentType: "application/json;charset=UTF-8", dataType: "json", progress: true, statusCode: { 200: function (data) { ////////////////////////////////////////////////////////// - for (var k in data) { - var obj = data[k]; + for (var k in data.response) { + var obj = data.response[k]; var $opt = $("