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/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 69 -----------------
src/main/webapp/scripts/app/widget/widgetDashBoard.controller.js | 80 ++++++++++---------
src/main/java/kr/wisestone/owl/web/controller/IssueController.java | 51 ------------
src/main/webapp/views/common/sidebar.html | 2
4 files changed, 43 insertions(+), 159 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 49a32b4..62f2b00 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -2829,73 +2829,4 @@
resJsonData.put(Constants.RES_KEY_CONTENTS, usePartnerVos);
}
}
-
- /*@Override
- @Transactional
- public void findMailTargetAll(Map<String, Object> resJsonData, IssueCondition condition, Pageable pageable) {
- IssueVo issueVo = new IssueVo();
- //Long issueId = MapUtil.getLong(params, "issueId");
- Long issueId = condition.getId();
-
- List<String> emailList = Lists.newArrayList();
-
- if(issueId != null){
- Issue issue = this.getIssue(issueId);
- issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
- this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
- this.setIssueIspField(issue, issueVo); //ISP �젙蹂� �꽭�똿
- this.setIssueHostingField(issue, issueVo); //HOSTING �젙蹂� �꽭�똿
- for(IssueCompanyVo issueCompanyVo : issueVo.getIssueCompanyVos()) {
- emailList.add(issueCompanyVo.getEmail());
- }
- for(IssueIspVo issueIspVo : issueVo.getIssueIspVos()) {
- emailList.add(issueIspVo.getEmail());
- }
- for(IssueHostingVo issueHostingVo : issueVo.getIssueHostingVos()) {
- emailList.add(issueHostingVo.getEmail());
- }
-
- }
-
- Long totalCount = this.issueMapper.count(condition);
- int totalPage = (int) Math.ceil((totalCount - 1) / pageable.getPageSize()) + 1;
-
- condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
- condition.setPageSize(pageable.getPageSize());
- //resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
- resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
- resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
- totalPage, totalCount));
- }*/
-
- /*@Override
- @Transactional
- public void findMailTargetCompany(Map<String, Object> resJsonData, Map<String, Object> params) {
- IssueVo issueVo = new IssueVo();
- Long issueId = MapUtil.getLong(params, "issueId");
-
- List<String> emailList = Lists.newArrayList();
-
- if(issueId != null){
- Issue issue = this.getIssue(issueId);
- issueVo = ConvertUtil.copyProperties(issue, IssueVo.class);
- this.setIssueCompanyField(issue, issueVo); //�뾽泥� �젙蹂� �꽭�똿
- for(IssueCompanyVo issueCompanyVo : issueVo.getIssueCompanyVos()) {
- emailList.add(issueCompanyVo.getEmail());
- }
- }
- resJsonData.put(Constants.RES_KEY_CONTENTS, emailList);
- }
-
- @Override
- @Transactional
- public void findMailTargetIsp(Map<String, Object> resJsonData, Map<String, Object> params) {
-
- }
-
- @Override
- @Transactional
- public void findMailTargetHosting(Map<String, Object> resJsonData, Map<String, Object> params) {
-
- }*/
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
index 2e224eb..e7015d6 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -164,55 +164,4 @@
return this.setSuccessMessage(resJsonData);
}
- // 硫붿씪 諛쒖넚 ���긽�옄 紐⑸줉 議고쉶
- /*@RequestMapping(value = "/issue/findMailTargetAll", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
- public
- @ResponseBody
- Map<String, Object> findMailTargetAll(@RequestBody Map<String, Map<String, Object>> params) {
- Map<String, Object> resJsonData = new HashMap<>();
- Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
-
-// this.issueService.findMailTargetAll(resJsonData, IssueCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
-
- return this.setSuccessMessage(resJsonData);
- }*/
-
-
- /*// �뾽泥� �떞�떦�옄 硫붿씪 紐⑸줉 議고쉶
- @RequestMapping(value = "/issue/findMailTargetCompany", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
- public
- @ResponseBody
- Map<String, Object> findMailTargetCompany(@RequestBody Map<String, Map<String, Object>> params) {
- Map<String, Object> resJsonData = new HashMap<>();
-
- this.issueService.findMailTargetCompany(resJsonData, params.get(Constants.REQ_KEY_CONTENT));
-
- return this.setSuccessMessage(resJsonData);
- }
-
- // ISP �떞�떦�옄 硫붿씪 紐⑸줉 議고쉶
- @RequestMapping(value = "/issue/findMailTargetIsp", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
- public
- @ResponseBody
- Map<String, Object> findMailTargetIsp(@RequestBody Map<String, Map<String, Object>> params) {
- Map<String, Object> resJsonData = new HashMap<>();
-
- this.issueService.findMailTargetIsp(resJsonData, params.get(Constants.REQ_KEY_CONTENT));
-
- return this.setSuccessMessage(resJsonData);
- }
-
- // �샇�뒪�똿 �떞�떦�옄 硫붿씪 紐⑸줉 議고쉶
- @RequestMapping(value = "/issue/findMailTargetHosting", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
- public
- @ResponseBody
- Map<String, Object> findMailTargetHosting(@RequestBody Map<String, Map<String, Object>> params) {
- Map<String, Object> resJsonData = new HashMap<>();
-
- this.issueService.findMailTargetHosting(resJsonData, params.get(Constants.REQ_KEY_CONTENT));
-
- return this.setSuccessMessage(resJsonData);
- }*/
-
-
}
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;
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index dc2ede4..35ae2eb 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -326,7 +326,7 @@
</li>
<li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
- <span>LIST MANAGEMENT</span>
+ <span>PARTNER LIST</span>
</li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<a ui-sref="companyField.list" tabindex="-1">
--
Gitblit v1.8.0