From d31323b4a8a314f010c54d8d9b502126a079eb67 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 17:11:59 +0900
Subject: [PATCH] 대시보드 - 멤버별 진행률 하위 프로젝트와 합쳐서 보여주는 함수 생성 및 파트너리스트 사이드바 수정
---
src/main/webapp/scripts/app/widget/widgetDashBoard.controller.js | 80 +++++++++++++++++++++-------------------
1 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/scripts/app/widget/widgetDashBoard.controller.js b/src/main/webapp/scripts/app/widget/widgetDashBoard.controller.js
index d4702ad..58a6941 100644
--- a/src/main/webapp/scripts/app/widget/widgetDashBoard.controller.js
+++ b/src/main/webapp/scripts/app/widget/widgetDashBoard.controller.js
@@ -12,7 +12,8 @@
// �븿�닔 紐⑥쓬
$scope.fn = {
- findAllWidget : findAllWidget // ���떆蹂대뱶 �쐞�젽 �쟾泥� 議고쉶
+ findAllWidget : findAllWidget, // ���떆蹂대뱶 �쐞�젽 �쟾泥� 議고쉶
+ filterMembers : filterMembers // 硫ㅻ쾭蹂� 吏꾪뻾瑜� - 硫붿씤 �봽濡쒖젥�듃 + �븯�쐞 �봽濡쒖젥�듃 �빀爾먯꽌 蹂댁뿬二쇨린
};
// 蹂��닔 紐⑥쓬
@@ -31,6 +32,45 @@
issueTypeWidget : null, // �씠�뒋 �쑀�삎蹂� �씠�뒋 �쁽�솴
severityIssueWidget: null, // 以묒슂�룄 蹂� �씠�뒋 �쁽�솴
};
+
+ function filterMembers(result) {
+ const members = result.data.memberProgressWidget.members;
+ var filterMembers = members.filter(function(item, idx){
+ return members.findIndex(function(item2, idx2){
+ return item.departmentName === item2.departmentName
+ }) == idx;
+ });
+
+ var departmentNames = [];
+ angular.forEach(filterMembers, function (member) {
+ departmentNames.push(member.departmentName);
+ });
+ var completeCounts = [];
+ var delayCounts = [];
+ var remainCounts = [];
+
+ for(var j=0; j<departmentNames.length; j++){ //諛곗뿴 珥덇린媛� �꽑�뼵
+ completeCounts[j] = 0;
+ delayCounts[j] = 0;
+ remainCounts[j] = 0;
+ }
+
+ for(var i=0; i<members.length; i++){
+ for(var j=0; j<departmentNames.length; j++){
+ if(members[i].departmentName === departmentNames[j]){
+ completeCounts[j] += members[i].completeCount;
+ delayCounts[j] += members[i].delayCount;
+ remainCounts[j] += members[i].remainCount;
+ }
+ }
+ }
+ for(var i=0; i<filterMembers.length; i++){
+ filterMembers[i].completeCount = completeCounts[i]
+ filterMembers[i].delayCount = delayCounts[i]
+ filterMembers[i].remainCount = remainCounts[i]
+ }
+ result.data.memberProgressWidget.members = filterMembers;
+ }
// ���떆蹂대뱶 �쐞�젽 �쟾泥� 議고쉶
function findAllWidget() {
@@ -52,44 +92,8 @@
// �굹�쓽 �씠�뒋 �쁽�솴 �젙蹂대�� ���옣�븳�떎.
$scope.vm.myIssueWidget = result.data.myIssueWidget;
- const members = result.data.memberProgressWidget.members;
- var filterMembers = members.filter(function(item, idx){
- return members.findIndex(function(item2, idx2){
- return item.departmentName === item2.departmentName
- }) == idx;
- });
-
- var departmentNames = [];
- angular.forEach(filterMembers, function (member) {
- departmentNames.push(member.departmentName);
- });
- var completeCounts = [];
- var delayCounts = [];
- var remainCounts = [];
-
- for(var j=0; j<departmentNames.length; j++){ //諛곗뿴 珥덇린媛� �꽑�뼵
- completeCounts[j] = 0;
- delayCounts[j] = 0;
- remainCounts[j] = 0;
- }
-
- for(var i=0; i<members.length; i++){
- for(var j=0; j<departmentNames.length; j++){
- if(members[i].departmentName === departmentNames[j]){
- completeCounts[j] += members[i].completeCount;
- delayCounts[j] += members[i].delayCount;
- remainCounts[j] += members[i].remainCount;
- }
- }
- }
- for(var i=0; i<filterMembers.length; i++){
- filterMembers[i].completeCount = completeCounts[i]
- filterMembers[i].delayCount = delayCounts[i]
- filterMembers[i].remainCount = remainCounts[i]
- }
- result.data.memberProgressWidget.members = filterMembers;
-
// 硫ㅻ쾭蹂� 吏꾪뻾瑜좎쓣 ���옣�븳�떎.
+ $scope.fn.filterMembers(result);// �븯�쐞�봽濡쒖젥�듃媛� �엳�쓣 寃쎌슦 �빀爾먯꽌 蹂댁뿬二쇨린
$scope.vm.memberProgressWidget = result.data.memberProgressWidget;
// �쟾泥� �씠�뒋 泥섎━ �쁽�솴 �젙蹂대�� ���옣�븳�떎.
$scope.vm.issueCompleteWidget = result.data.issueCompleteWidget;
--
Gitblit v1.8.0