Index: arms/html/analysisResource/content-container.html =================================================================== diff -u -rf88f5ac0d4928dc9ae4fc01646abe67c875c7ad0 -rc3c648a8ad8c8db6ed660d7d72d99380aa71cc43 --- arms/html/analysisResource/content-container.html (.../content-container.html) (revision f88f5ac0d4928dc9ae4fc01646abe67c875c7ad0) +++ arms/html/analysisResource/content-container.html (.../content-container.html) (revision c3c648a8ad8c8db6ed660d7d72d99380aa71cc43) @@ -700,15 +700,13 @@ class="font13" style="margin-top: 5px"> 요구사항 관여도 트리맵 -
-
+

+
+

+ + + + 작업자별 업무 처리 현황 + +

+
+
+ + + +
+
+
+
+
+
+ +
+
+
+
+
+ Chart View +
+
+ +
+
+
+
+
+
+ +
+
+
List View (Excel)
+
+ + + + + + + + + +
+
+
+
+ +
+
+
+
+ +
+

+ + + \ No newline at end of file Index: arms/js/analysis/api/resourceApi.js =================================================================== diff -u -rc25623a7da21280591b0f67cfebd9879a3822ea2 -rc3c648a8ad8c8db6ed660d7d72d99380aa71cc43 --- arms/js/analysis/api/resourceApi.js (.../resourceApi.js) (revision c25623a7da21280591b0f67cfebd9879a3822ea2) +++ arms/js/analysis/api/resourceApi.js (.../resourceApi.js) (revision c3c648a8ad8c8db6ed660d7d72d99380aa71cc43) @@ -3,6 +3,7 @@ var selectedPdServiceversions = []; var fetchedResourceData = []; + var fetchedAssigneeInfo; var setPdServiceId = function (pdServiceId) { selectedPdserviceId = pdServiceId; } var getPdServiceId = function () { return selectedPdserviceId; } @@ -28,15 +29,12 @@ 200: function (data) { //console.log("=== === === 작업자 상태 집계 시작=== === ===") console.log("[resourceApi :: fetchResourceData] 작업자 상태 집계 "); - console.log(data); - let search_name = data["검색결과"]["group_by_assignee.assignee_displayName.keyword"]; let search_mail = data["검색결과"]["group_by_assignee.assignee_emailAddress.keyword"]; - console.log("=== === === 작업자 상태 집계 종료=== === ===") fetchedResourceData = search_mail; deferred.resolve(fetchedResourceData); }, error: function (e) { - jError("Resource Status 조회에 실패했습니다. 나중에 다시 시도 바랍니다."); + jError("Resource WorkerStatus 조회에 실패했습니다. 나중에 다시 시도 바랍니다."); } } }); @@ -46,10 +44,40 @@ return fetchedResourceData; } + var fetchAssigneeInfoMap = function (pdservice_id, pdServiceVersionLinks) { + var deferred = $.Deferred(); + let $url = "/auth-admin/api/arms/analysis/resource/pdServiceId/"+pdservice_id+"/assigneeInfo.do"; + $.ajax({ + url: $url, + type: "GET", + data: { "pdServiceVersionLinks" : pdServiceVersionLinks }, + contentType: "application/json;charset=UTF-8", + dataType: "json", + progress: true, + async: false, + statusCode: { + 200: function (data) { + fetchedAssigneeInfo = data; + deferred.resolve(fetchedAssigneeInfo); + }, + error: function (e) { + jError("Resource AssigneeInfoMap 조회에 실패했습니다. 나중에 다시 시도 바랍니다."); + } + } + }); + + return deferred.promise(); + }; + + var getFetchedAssigneeInfoMap = function() { + return fetchedAssigneeInfo; + } + return { setPdServiceId, getPdServiceId, setPdServiceVersionLinks, getPdServiceVersions, - fetchResourceData, getFetchedResourceData + fetchResourceData, getFetchedResourceData, + fetchAssigneeInfoMap, getFetchedAssigneeInfoMap } })(); \ No newline at end of file Index: arms/js/common/jspreadsheet/modalTabFunction.js =================================================================== diff -u -ra361bc70f06ddac57114b42a827d3b0816a7e4e3 -rc3c648a8ad8c8db6ed660d7d72d99380aa71cc43 --- arms/js/common/jspreadsheet/modalTabFunction.js (.../modalTabFunction.js) (revision a361bc70f06ddac57114b42a827d3b0816a7e4e3) +++ arms/js/common/jspreadsheet/modalTabFunction.js (.../modalTabFunction.js) (revision c3c648a8ad8c8db6ed660d7d72d99380aa71cc43) @@ -17,7 +17,7 @@ $tabFunction_data = data; } var getExcelData = function () { - return $tabFunction_data + return $tabFunction_data; } var setColumns = function(columns) { $tabFunction_columns = columns; @@ -135,7 +135,7 @@ data: getExcelData() }, getOptions())); - jexcel_content_height = chart_height - 40 -30 -35 - 34; + jexcel_content_height = chart_height -40-30-35-34; // 도구모음(34), row번호(50) console.log("chart_height=> " + chart_height); console.log("jexcel_content_height=> "+ jexcel_content_height); $("#modal_excel .jexcel_content").css("max-height",jexcel_content_height);