Index: arms/js/analysisScope.js =================================================================== diff -u -r06ba7246c2019f001c6ddf3398b200f3f1585dcb -r9bbd82603636e98940eb3727a0ddba3c28fc1389 --- arms/js/analysisScope.js (.../analysisScope.js) (revision 06ba7246c2019f001c6ddf3398b200f3f1585dcb) +++ arms/js/analysisScope.js (.../analysisScope.js) (revision 9bbd82603636e98940eb3727a0ddba3c28fc1389) @@ -223,6 +223,8 @@ 수치_초기화(); console.log(pdServiceVersionIds); selectedVersionId = pdServiceVersionIds.join(","); + console.log("bind_VersionData_By_PdService :: selectedVersionId"); + console.log(selectedVersionId); // 요구사항 및 연결이슈 통계 getReqAndLinkedIssueData(selectedPdServiceId, selectedVersionId); // Circular Packing with D3 차트 @@ -531,8 +533,7 @@ // 버전 선택 시 데이터 파싱 setTimeout(function () { - console.log("[ analysisScope :: getRelationJiraIssueByPdServiceAndVersions ] 네트워크차트 - 가져온 데이터") - console.log(data); + console.log("[ analysisScope :: getRelationJiraIssueByPdServiceAndVersions ] 네트워크차트 그리기") networkChart(pdServiceVersions, data); }, 1500); } @@ -556,7 +557,6 @@ var 선택한버전 = pdServiceVersions.split(",").map(Number); console.log(" networkChart :: 선택한버전 => " + 선택한버전); - console.log(선택한버전); var versionList = pdServiceData.pdServiceVersionEntities; versionList.forEach((item) => { Index: arms/js/reqGantt.js =================================================================== diff -u -r78d4b5d26eaad3e8851e850a40320d6190e975df -r9bbd82603636e98940eb3727a0ddba3c28fc1389 --- arms/js/reqGantt.js (.../reqGantt.js) (revision 78d4b5d26eaad3e8851e850a40320d6190e975df) +++ arms/js/reqGantt.js (.../reqGantt.js) (revision 9bbd82603636e98940eb3727a0ddba3c28fc1389) @@ -20,6 +20,7 @@ var gantt; var ganttTasks; +var versionListData; function execDocReady() { var pluginGroups = [ [ @@ -217,9 +218,9 @@ // getMonitorData($("#selected_pdService").val(), endPointUrl); //통계로드 - statisticsLoad($("#selected_pdService").val(), null); + statisticsLoad($("#selected_pdService").val(), ""); //진행상태 가져오기 - progressLoad($("#selected_pdService").val(), null); + progressLoad($("#selected_pdService").val(), ""); }); } // end makePdServiceSelectBox() @@ -309,6 +310,11 @@ selectedVersionId = versionTag.join(","); // 요구사항 및 연결이슈 통계 getReqAndLinkedIssueData(selectedPdServiceId, selectedVersionId); + + //통계로드 + statisticsLoad($("#selected_pdService").val(), selectedVersionId); + //진행상태 가져오기 + progressLoad($("#selected_pdService").val(), selectedVersionId); } }); } @@ -324,9 +330,11 @@ 200: function (data) { ////////////////////////////////////////////////////////// var pdServiceVersionIds = []; + versionListData = []; for (var k in data.response) { var obj = data.response[k]; pdServiceVersionIds.push(obj.c_id); + versionListData.push(obj); var newOption = new Option(obj.c_title, obj.c_id, true, false); $(".multiple-select").append(newOption); } @@ -339,7 +347,14 @@ selectedVersionId = pdServiceVersionIds.join(","); // 요구사항 및 연결이슈 통계 getReqAndLinkedIssueData(selectedPdServiceId, selectedVersionId); + console.log("bind_VersionData_By_PdService :: selectedVersionId"); + console.log(selectedVersionId); + //통계로드 + statisticsLoad($("#selected_pdService").val(), selectedVersionId); + //진행상태 가져오기 + progressLoad($("#selected_pdService").val(), selectedVersionId); + //$('#multiversion').multipleSelect('refresh'); //$('#edit_multi_version').multipleSelect('refresh'); $(".multiple-select").multipleSelect("refresh"); Index: arms/js/reqStatus.js =================================================================== diff -u -rd827cf72dbfc3d74436de39fb7ad413038f64fe6 -r9bbd82603636e98940eb3727a0ddba3c28fc1389 --- arms/js/reqStatus.js (.../reqStatus.js) (revision d827cf72dbfc3d74436de39fb7ad413038f64fe6) +++ arms/js/reqStatus.js (.../reqStatus.js) (revision 9bbd82603636e98940eb3727a0ddba3c28fc1389) @@ -2,12 +2,16 @@ //Document Ready //////////////////////////////////////////////////////////////////////////////////////// var selectedPdServiceId; // 제품(서비스) 아이디 +var selectedVersionId; // 선택된 버전 아이디 var reqStatusDataTable; var dataTableRef; var selectedIssue; //선택한 이슈 var selectedIssueKey; //선택한 이슈 키 +var pdServiceListData; +var versionListData; + function execDocReady() { @@ -127,12 +131,16 @@ statusCode: { 200: function (data) { ////////////////////////////////////////////////////////// + pdServiceListData = []; for (var k in data.response) { var obj = data.response[k]; + pdServiceListData.push({ "pdServiceId": obj.c_id, "pdServiceName": obj.c_title }); var newOption = new Option(obj.c_title, obj.c_id, false, false); $("#selected_pdService").append(newOption).trigger("change"); } ////////////////////////////////////////////////////////// + console.log("[reqStatus :: makePdServiceSelectBox] :: pdServiceListData => " ); + console.table(pdServiceListData); } } }); @@ -145,6 +153,7 @@ // --- select2 ( 제품(서비스) 검색 및 선택 ) 이벤트 --- // $("#selected_pdService").on("select2:select", function (e) { + selectedPdServiceId = $("#selected_pdService").val(); // 제품( 서비스 ) 선택했으니까 자동으로 버전을 선택할 수 있게 유도 // 디폴트는 base version 을 선택하게 하고 ( select all ) //~> 이벤트 연계 함수 :: Version 표시 jsTree 빌드 @@ -161,12 +170,11 @@ // 이슈리스트 데이터테이블 dataTableLoad($("#selected_pdService").val(), endPointUrl); // 통계로드 - statisticsLoad($("#selected_pdService").val(), null); + //statisticsLoad($("#selected_pdService").val(), ""); // 진행상태 가져오기 - progressLoad($("#selected_pdService").val(), null); + //progressLoad($("#selected_pdService").val(), ""); + //resourceLoad($("#selected_pdService").val(), null); - resourceLoad($("#selected_pdService").val(), null); - }); } // end makePdServiceSelectBox() @@ -273,7 +281,23 @@ var checked = $("#checkbox1").is(":checked"); var endPointUrl = ""; var versionTag = $(".multiple-select").val(); + console.log("[ reqStatus :: makeVersionMultiSelectBox ] :: versionTag"); + console.log(versionTag); + selectedVersionId = versionTag.join(","); + if (versionTag === null || versionTag == "") { + alert("버전이 선택되지 않았습니다."); + return; + } + + // 통계로드 + statisticsLoad($("#selected_pdService").val(), selectedVersionId); + // 진행상태 가져오기 + progressLoad($("#selected_pdService").val(), selectedVersionId); + + resourceLoad($("#selected_pdService").val(), selectedVersionId); + + if (checked) { endPointUrl = "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/requirement-linkedissue.do?disable=true&versionTag=" + versionTag; @@ -297,18 +321,30 @@ statusCode: { 200: function (data) { ////////////////////////////////////////////////////////// + var pdServiceVersionIds = []; + versionListData = []; for (var k in data.response) { var obj = data.response[k]; - var $opt = $("