Index: arms/js/analysis/resource/chart/basicRadar.js =================================================================== diff -u -ra1a2392c0bd811971cdeda48acb29145c2c56abc -r0a152b1adb2072c682e2b1f4cfe9be5eb55f27db --- arms/js/analysis/resource/chart/basicRadar.js (.../basicRadar.js) (revision a1a2392c0bd811971cdeda48acb29145c2c56abc) +++ arms/js/analysis/resource/chart/basicRadar.js (.../basicRadar.js) (revision 0a152b1adb2072c682e2b1f4cfe9be5eb55f27db) @@ -65,8 +65,9 @@ let titleText = ""; let titleColor = "white"; let progress = ""; + if(objectiveArr.length !== 0) { - if (objectiveArr[1] !== "" || objectiveArr[1] !== 0) { + if (objectiveArr[1] !== "" && objectiveArr[1] !== 0) { progress = (currentProgressArr[1]*100/objectiveArr[1]).toFixed(1); titleText+= "진행률: " + progress + "%, "; } Index: arms/js/analysisResource.js =================================================================== diff -u -r4c5eaa7f9c57262ade8864110dec5e86fe3587fc -r0a152b1adb2072c682e2b1f4cfe9be5eb55f27db --- arms/js/analysisResource.js (.../analysisResource.js) (revision 4c5eaa7f9c57262ade8864110dec5e86fe3587fc) +++ arms/js/analysisResource.js (.../analysisResource.js) (revision 0a152b1adb2072c682e2b1f4cfe9be5eb55f27db) @@ -302,7 +302,7 @@ // --- select2 ( 제품(서비스) 검색 및 선택 ) 이벤트 --- // $("#selected_pdService").on("select2:select", function (e) { selectedPdServiceId = $("#selected_pdService").val(); - refreshDetailChart(); 변수값_초기화(); + refreshDetailChart(); 수치_초기화(); // 제품( 서비스 ) 선택했으니까 자동으로 버전을 선택할 수 있게 유도 // 디폴트는 base version 을 선택하게 하고 ( select all ) //~> 이벤트 연계 함수 :: Version 표시 jsTree 빌드 @@ -328,7 +328,7 @@ var versionTag = $(".multiple-select").val(); selectedVersionId = versionTag.join(','); - refreshDetailChart(); 변수값_초기화(); + refreshDetailChart(); 수치_초기화(); // 요구사항 및 연결이슈 통계 getReqAndLinkedIssueData(selectedPdServiceId, selectedVersionId); @@ -359,7 +359,7 @@ var newOption = new Option(obj.c_title, obj.c_id, true, false); $(".multiple-select").append(newOption); } - refreshDetailChart(); 변수값_초기화(); + refreshDetailChart(); 수치_초기화(); selectedVersionId = pdServiceVersionIds.join(','); // 요구사항 및 연결이슈 통계 getReqAndLinkedIssueData(selectedPdServiceId, selectedVersionId); @@ -434,6 +434,7 @@ console.log(data); if (data["전체합계"] === 0) { alert("작업자 업무 처리현황 데이터가 없습니다."); + 수치_초기화(); } else { let isReqGrpArr = data["검색결과"]["group_by_isReq"]; isReqGrpArr.forEach((elementArr,index) => { @@ -832,44 +833,39 @@ if(선택한_버전_세트.size !== 0) { $.ajax({ - url: "/auth-user/api/arms/pdService/getNodeWithVersionOrderByCidDesc.do", - data: { - c_id: pdservice_id, - pdServiceVersionEntities: 선택한_버전_세트 - }, + url: "/auth-user/api/arms/pdServiceVersion/getVersionListBy.do", + data: { c_ids: pdServiceVersionLinks}, type: "GET", contentType: "application/json;charset=UTF-8", dataType: "json", progress: true, statusCode: { 200: function (json) { - let 버전_세트 = json.pdServiceVersionEntities; - let earliestStartDate; let lastEndDate; - let versionArray= []; - 버전_세트.forEach(e => versionArray.push(e)); - if(versionArray !== 0) { - for (let i=0; i lastEndDate) { - lastEndDate = versionArray[i]["c_pds_version_end_date"]; + if(버전목록[i]["c_pds_version_end_date"] > 가장늦은종료날짜) { + 가장늦은종료날짜 = 버전목록[i]["c_pds_version_end_date"]; } } } } - if(earliestStartDate ==="start") { earliestStartDate = new Date(); } - if(lastEndDate ==="end") {lastEndDate = new Date(); } - let objectiveDateDiff = getDateDiff(earliestStartDate, lastEndDate); - let currentDateDiff = getDateDiff(earliestStartDate, new Date()); - console.log(objectiveDateDiff); - console.log(currentDateDiff); + if(가장이른시작날짜 ==="start") { 가장이른시작날짜 = new Date(); } + if(가장늦은종료날짜 ==="end") {가장늦은종료날짜 = new Date(); } + let objectiveDateDiff = getDateDiff(가장이른시작날짜, 가장늦은종료날짜); + let currentDateDiff = getDateDiff(가장이른시작날짜, new Date()); + let 목표데이터_배열 = [resource_count, req_count, objectiveDateDiff]; let 현재진행데이터_배열 = [resource_count, req_in_action, currentDateDiff]; let dateDiff = Math.abs(objectiveDateDiff - currentDateDiff).toFixed(0); @@ -900,7 +896,7 @@ } -function 변수값_초기화() { +function 수치_초기화() { req_count =0 linkedIssue_subtask_count =0 resource_count =0; Index: arms/js/analysisScope.js =================================================================== diff -u -rcf3bc3be60ad8e62d918be08a464de209fe5e645 -r0a152b1adb2072c682e2b1f4cfe9be5eb55f27db --- arms/js/analysisScope.js (.../analysisScope.js) (revision cf3bc3be60ad8e62d918be08a464de209fe5e645) +++ arms/js/analysisScope.js (.../analysisScope.js) (revision 0a152b1adb2072c682e2b1f4cfe9be5eb55f27db) @@ -161,9 +161,9 @@ alert("버전이 선택되지 않았습니다."); return; } + //분석메뉴 상단 수치 초기화 + 수치_초기화(); - // 변수값_초기화 함수 넣기 refreshDetailChart(); 변수값_초기화(); - // 요구사항 및 연결이슈 통계 getReqAndLinkedIssueData(selectedPdServiceId, selectedVersionId); } @@ -189,7 +189,7 @@ var newOption = new Option(obj.c_title, obj.c_id, true, false); $(".multiple-select").append(newOption); } - 변수값_초기화(); + 수치_초기화(); selectedVersionId = pdServiceVersionIds.join(','); // 요구사항 및 연결이슈 통계 getReqAndLinkedIssueData(selectedPdServiceId, selectedVersionId); @@ -820,6 +820,7 @@ if (data["전체합계"] === 0) { alert("작업자 업무 처리현황 데이터가 없습니다."); + 수치_초기화(); } else { let isReqGrpArr = data["검색결과"]["group_by_isReq"]; isReqGrpArr.forEach((elementArr,index) => { @@ -958,42 +959,38 @@ if(선택한_버전_세트.size !== 0) { $.ajax({ - url: "/auth-user/api/arms/pdService/getNodeWithVersionOrderByCidDesc.do", - data: { - c_id: pdservice_id, - pdServiceVersionEntities: 선택한_버전_세트 - }, + url: "/auth-user/api/arms/pdServiceVersion/getVersionListBy.do", + data: { c_ids: pdServiceVersionLinks}, type: "GET", contentType: "application/json;charset=UTF-8", dataType: "json", progress: true, statusCode: { 200: function (json) { - let 버전_세트 = json.pdServiceVersionEntities; - let earliestStartDate; let lastEndDate; - let versionArray= []; - 버전_세트.forEach(e => versionArray.push(e)); - if(versionArray !== 0) { - for (let i=0; i lastEndDate) { - lastEndDate = versionArray[i]["c_pds_version_end_date"]; + if(버전목록[i]["c_pds_version_end_date"] > 가장늦은종료날짜) { + 가장늦은종료날짜 = 버전목록[i]["c_pds_version_end_date"]; } } } } - if(earliestStartDate ==="start") { earliestStartDate = new Date(); } - if(lastEndDate ==="end") {lastEndDate = new Date(); } - let objectiveDateDiff = getDateDiff(earliestStartDate, lastEndDate); - let currentDateDiff = getDateDiff(earliestStartDate, new Date()); + if(가장이른시작날짜 ==="start") { 가장이른시작날짜 = new Date(); } + if(가장늦은종료날짜 ==="end") {가장늦은종료날짜 = new Date(); } + let objectiveDateDiff = getDateDiff(가장이른시작날짜, 가장늦은종료날짜); + let currentDateDiff = getDateDiff(가장이른시작날짜, new Date()); let 목표데이터_배열 = [resource_count, req_count, objectiveDateDiff]; let 현재진행데이터_배열 = [resource_count, req_in_action, currentDateDiff]; @@ -1025,7 +1022,7 @@ } -function 변수값_초기화() { +function 수치_초기화() { req_count =0 linkedIssue_subtask_count =0 resource_count =0;