Index: arms/html/analysisTime/content-container.html =================================================================== diff -u -r1ebdc14dcbb29248e50abf73161c96407d61cacc -rca153e19ba6310ea7c85bf644481cff6402f0efc --- arms/html/analysisTime/content-container.html (.../content-container.html) (revision 1ebdc14dcbb29248e50abf73161c96407d61cacc) +++ arms/html/analysisTime/content-container.html (.../content-container.html) (revision ca153e19ba6310ea7c85bf644481cff6402f0efc) @@ -74,7 +74,10 @@
- 1. Productservice 를 선택해 주세요 + +
+ 1. Productservice를 선택해 주세요 +
@@ -302,9 +305,9 @@
-
-
-
+
+
+

--> -
+

@@ -477,7 +480,7 @@
-
+

@@ -509,8 +512,8 @@

-
-
+
+

제품(서비스) 버전별 @@ -648,7 +651,7 @@
-
+

이슈 상태 현황

@@ -718,7 +721,7 @@
-
+

@@ -750,7 +753,7 @@

-
+

@@ -823,8 +826,8 @@
-
-
+
+

@@ -894,8 +897,8 @@
-
-
+
+

@@ -953,6 +956,11 @@ color: white; } + .ms-drop ul > li.hide-radio:focus, .ms-drop ul > li.hide-radio:hover { + background-color: #007bff; + color: white; + } + // 패널 내부 패딩 값왜 적용 안되지 /* @media (min-width: 1200px) { .col-md-4 { Index: arms/js/analysisTime.js =================================================================== diff -u -r1ebdc14dcbb29248e50abf73161c96407d61cacc -rca153e19ba6310ea7c85bf644481cff6402f0efc --- arms/js/analysisTime.js (.../analysisTime.js) (revision 1ebdc14dcbb29248e50abf73161c96407d61cacc) +++ arms/js/analysisTime.js (.../analysisTime.js) (revision ca153e19ba6310ea7c85bf644481cff6402f0efc) @@ -3,6 +3,7 @@ /////////////////// var dashboardColor; var selectedVersionId; +var tot_ver_count, active_ver_count, req_count, subtask_count, resource_count; // 필요시 작성 //////////////////////////////////////////////////////////////////////////////////////// @@ -108,8 +109,8 @@ //버전 멀티 셀렉트 박스 이니시에이터 makeVersionMultiSelectBox(); - heatMapReady(); + // sevenTimeline(); dashboardColor = dashboardPalette.dashboardPalette01; @@ -238,9 +239,7 @@ //statisticsLoad($("#selected_pdService").val(), null); console.log("선택된 제품(서비스) c_id = " + $("#selected_pdService").val()); - statisticsMonitor($("#selected_pdService").val()); //ES모으는중 by YHS - //타임라인 // $("#notifyNoVersion2").hide(); @@ -249,6 +248,7 @@ }); } // end makePdServiceSelectBox() + //////////////////// //버전 멀티 셀렉트 박스 //////////////////// @@ -262,10 +262,13 @@ var checked = $("#checkbox1").is(":checked"); var endPointUrl = ""; var versionTag = $(".multiple-select").val(); + console.log(versionTag); selectedVersionId = versionTag.join(','); + statisticsMonitor($("#selected_pdService").val(), selectedVersionId); //ES모으는중 by YHS donutChart($("#selected_pdService").val(), selectedVersionId); combinationChart($("#selected_pdService").val(), selectedVersionId); + heatMapReady($("#selected_pdService").val(), selectedVersionId); if (checked) { endPointUrl = @@ -280,6 +283,85 @@ }); } +function statisticsMonitor(pdservice_id, pdservice_version_id) { + console.log("선택된 서비스 ===> " + pdservice_id); + console.log("선택된 버전 리스트 ===> " + pdservice_version_id); + tot_ver_count = 0; + active_ver_count = 0; + req_count = 0; + subtask_count = 0; + resource_count = 0; + + //1. 좌상 게이지 차트 및 타임라인 + //2. Time ( 작업일정 ) - 버전 개수 삽입 + d3.json("/auth-user/api/arms/pdService/getNodeWithVersionOrderByCidDesc.do?c_id=" + pdservice_id,function(json) { + + let versionData = json.pdServiceVersionEntities; + + let version_count = versionData.length; + tot_ver_count = version_count; + + console.log("등록된 버전 개수 = " + version_count); + if(version_count !== undefined) { + $('#version_count').text(version_count); + + if (version_count >= 0) { + let today = new Date(); // console.log(today); + let plusDate = new Date(); + + $("#notifyNoVersion").slideUp(); + $("#project-start").show(); + $("#project-end").show(); + + $("#versionGaugeChart").html(""); //게이지 차트 초기화 + var versionGauge = []; + var versionTimeline = []; + versionData.forEach(function (versionElement, idx) { + //console.log(idx); console.log(versionElement); + if (pdservice_version_id.includes(versionElement.c_id)) { + var gaugeElement = { + "current_date": today.toString(), + "version_name": versionElement.c_title, + "version_id": versionElement.c_id, + "start_date": (versionElement.c_pds_version_start_date == "start" ? today : versionElement.c_pds_version_start_date), + "end_date": (versionElement.c_pds_version_end_date == "end" ? today : versionElement.c_pds_version_end_date) + //"end_date": (versionElement.c_pds_version_end_date == "end" ? plusDate.setMonth(plusDate.getMonth()+1) : versionElement.c_pds_version_end_date) + } + versionGauge.push(gaugeElement); + } + + var timelineElement = { + "title" : "버전: "+versionElement.c_title, + "startDate" : (versionElement.c_pds_version_start_date == "start" ? today : versionElement.c_pds_version_start_date), + "endDate" : (versionElement.c_pds_version_end_date == "end" ? today : versionElement.c_pds_version_end_date) + //"endDate" : (versionElement.c_pds_version_end_date == "end" ? plusDate : versionElement.c_pds_version_end_date) + }; + versionTimeline.push(timelineElement); + }); + + drawVersionProgress(versionGauge); // 버전 게이지 + + $("#version-timeline-bar").show(); + Timeline.init($("#version-timeline-bar"), versionTimeline); + + } + } + }); + + // 제품서비스 - status + getReqCount(pdservice_id, ""); + // 제품서비스별 담당자 통계 + getAssigneeInfo(pdservice_id, ""); + + setTimeout(function () { + //Scope - (2) 요구사항에 연결된 이슈 총 개수 + getLinkedIssueCount(pdservice_id, ""); // 연결된 이슈 총 개수, 평균 값 대입 + + $('#inactive_version_count').text( tot_ver_count - active_ver_count ); + },1000); + +} + function bind_VersionData_By_PdService() { $(".multiple-select option").remove(); $.ajax({ @@ -290,13 +372,15 @@ statusCode: { 200: function (data) { ////////////////////////////////////////////////////////// + console.log(data.response); + for (var k in data.response) { var obj = data.response[k]; var $opt = $("