Index: arms/html/dashboard/content-container.html =================================================================== diff -u -r5ebe47e8299be48b8a268b2f9b1ce2eda4116c58 -rf6737d3fe7330eeb0b36ef69be00e13626f4dd3f --- arms/html/dashboard/content-container.html (.../content-container.html) (revision 5ebe47e8299be48b8a268b2f9b1ce2eda4116c58) +++ arms/html/dashboard/content-container.html (.../content-container.html) (revision f6737d3fe7330eeb0b36ef69be00e13626f4dd3f) @@ -46,36 +46,41 @@
-
- 1. Product(Service)를 선택해주십시오. -
- -
-
-
+
+
+ 1. Productservice 를 선택해 주세요 +
-
- +
+
+ 2. Productservice의 버전을 선택해 주세요 +
+
+
+ +
+
Index: arms/js/dashboard.js =================================================================== diff -u -r64aefe71455ea2c690f4fac121919ba0fe1d963b -rf6737d3fe7330eeb0b36ef69be00e13626f4dd3f --- arms/js/dashboard.js (.../dashboard.js) (revision 64aefe71455ea2c690f4fac121919ba0fe1d963b) +++ arms/js/dashboard.js (.../dashboard.js) (revision f6737d3fe7330eeb0b36ef69be00e13626f4dd3f) @@ -2,7 +2,12 @@ //Document Ready //////////////////////////////////////////////////////////////////////////////////////// var selectedPdServiceId; // 제품(서비스) 아이디 +var reqStatusDataTable; +var dataTableRef; +var selectedIssue; //선택한 이슈 +var selectedIssueKey; //선택한 이슈 키 + function execDocReady() { var pluginGroups = [ @@ -60,12 +65,16 @@ $('.widget').widgster(); setSideMenu("sidebar_menu_dashboard_home"); + //제품(서비스) 셀렉트 박스 이니시에이터 makePdServiceSelectBox(); + //버전 멀티 셀렉트 박스 이니시에이터 + makeVersionMultiSelectBox(); }) .catch(function () { console.error('플러그인 로드 중 오류 발생'); }); } + //////////////////////////////////////////////////////////////////////////////////////// //제품 서비스 셀렉트 박스 //////////////////////////////////////////////////////////////////////////////////////// @@ -117,7 +126,13 @@ endPointUrl = "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/getStatusMonitor.do?disable=false"; } + // //이슈리스트 데이터테이블 + // dataTableLoad($("#selected_pdService").val(), endPointUrl); + // //통계로드 + // statisticsLoad($("#selected_pdService").val(), null); + // //진행상태 가져오기 // progressLoad($("#selected_pdService").val(), null); + }); } // end makePdServiceSelectBox() @@ -135,20 +150,43 @@ statusCode: { 200: function (data) { + console.log("==== 장지윤 progress data"); + console.log(data); + + } + } + }); +} + +function statisticsLoad(pdservice_id, pdservice_version_id){ + + //제품 서비스 셀렉트 박스 데이터 바인딩 + $.ajax({ + url: "/auth-user/api/arms/reqStatus/T_ARMS_REQSTATUS_" + pdservice_id + "/getStatistics.do?version=" + pdservice_version_id, + type: "GET", + contentType: "application/json;charset=UTF-8", + dataType: "json", + progress: true, + statusCode: { + 200: function (data) { + + console.log("==== 장지윤 static data"); + console.log(data); + for (var key in data) { var value = data[key]; console.log(key + "=" + value); - - var html_piece = "
\n" + - "✡ " + key + " : " + value + " 개\n" + - "
"; - $('#progress_status').append(html_piece); } + $('#version_count').text(data["version"]); + $('#req_count').text(data["req"]); + $('#alm_server_count').text(data["jiraServer"]); + $('#alm_project_count').text(data["jiraProject"]); + $('#alm_issue_count').text(data["issue"]); } } }); + } //////////////////////////////////////////////////////////////////////////////////////// @@ -158,22 +196,14 @@ //버전 선택 셀렉트 박스 이니시에이터 $(".multiple-select").multipleSelect({ filter: true, + bubbles: true, + cancelable: true, onClose: function () { console.log("onOpen event fire!\n"); - - var checked = $("#checkbox1").is(":checked"); - var endPointUrl = ""; var versionTag = $(".multiple-select").val(); + }, + onChange: function () { - if (checked) { - endPointUrl = - "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/getStatusMonitor.do?disable=true&versionTag=" + versionTag; - // dataTableLoad($("#selected_pdService").val(), endPointUrl); - } else { - endPointUrl = - "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/getStatusMonitor.do?disable=false&versionTag=" + versionTag; - // dataTableLoad($("#selected_pdService").val(), endPointUrl); - } } }); } @@ -190,21 +220,18 @@ ////////////////////////////////////////////////////////// for (var k in data.response) { var obj = data.response[k]; - var $opt = $("