From dbd041f0d099e863c044197b2755e9e8ef3c3da1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 14:00:43 +0900
Subject: [PATCH] 하위 이슈상태 전체변경
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 138 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 110 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 955bfbb..da36afb 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -28,13 +28,20 @@
$scope.fn.updateActiveHistory = updateActiveHistory; // �솢�룞 �궡�뿭�뿉�꽌 �쟾泥� 蹂닿린 �꺆�쓣 �닃���쓣 �븣 �뙎湲�, 湲곕줉 �젙蹂대�� �뾽�뜲�씠�듃 �븳�떎.
$scope.fn.getChangeIssueStatusList = getChangeIssueStatusList; // �씠�뒋�쓽 �쁽�옱 �긽�깭�뿉�꽌 蹂�寃� 媛��뒫�븳 �씠�뒋 �깄�깭 紐⑸줉 媛��졇�삤湲�
$scope.fn.modifyIssueStatus = modifyIssueStatus; // �씠�뒋 �긽�깭 蹂�寃�
+ $scope.fn.modifyDownIssueStatus = modifyDownIssueStatus; //�븯�쐞 �씠�뒋 �긽�깭 蹂�寃�
$scope.fn.modifyIssueUser = modifyIssueUser; // �씠�뒋 �떞�떦�옄 蹂�寃�
$scope.fn.modifyIssueDepartment = modifyIssueDepartment; // �씠�뒋 �떞�떦遺��꽌 蹂�寃�
$scope.fn.initReload = initReload; // 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
- $scope.fn.sendMail = sendMail; // �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 硫붿씪濡� 諛쒖넚
+ $scope.fn.sendMail = sendMail;
+ $scope.fn.sendMailAll = sendMailAll;
+ $scope.fn.sendMailVo = sendMailVo;
+ $scope.fn.getParameters = getParameters;
+ $scope.fn.getParametersAll = getParametersAll;
+ // �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 硫붿씪濡� 諛쒖넚
$scope.fn.versionView = versionView; // 踰꾩쟾 �젙蹂대�� �몴�떆�븳�떎.
$scope.fn.reservation = reservation; // �삁�빟 �젙蹂대�� �솗�씤 諛� 蹂�寃� �븳�떎.
$scope.fn.getIssueListCallBack = getIssueListCallBack;
+ $scope.fn.getDownIssueListCallBack = getDownIssueListCallBack;
$scope.fn.addRelationIssue = addRelationIssue; // �뿰愿� �씠�뒋 異붽�
$scope.fn.addDownIssue = addDownIssue; // �븯�쐞 �씠�뒋 異붽�
$scope.fn.addRelationIssueTableConfig = addRelationIssueTableConfig; // �뿰愿� �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
@@ -43,7 +50,6 @@
$scope.fn.getDownTableConfigs = getDownTableConfigs;
$scope.fn.containsPartner = containsPartner;
$scope.fn.onActivate = onActivate;
- $scope.fn.makePartnersEmail = makePartnersEmail;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -126,6 +132,13 @@
}
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+
+ // �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
+ $scope.$on("getIssueList", function () {
+ $scope.fn.getIssueDetail();
+ });
+
+
// �븯�쐞 �씠�뒋 �궘�젣
function removeDownIssue(id) {
@@ -213,6 +226,10 @@
// �봽濡쒖젥�듃 autocomplete page �뾽�뜲�씠�듃
function getIssueListCallBack(result) {
+ $scope.vm.autoCompletePage.issue.totalPage = result.data.page.totalPage;
+ }
+
+ function getDownIssueListCallBack(result) {
$scope.vm.autoCompletePage.issue.totalPage = result.data.page.totalPage;
}
@@ -328,6 +345,16 @@
.setDAlign("text-center")
.setDRenderer("ISSUE_DOWN_MOVE"));
break;
+
+ case "ISSUE_DOWN_STATUS_TYPE" : // �씠�뒋 �긽�깭
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("issue.issueStatus")
+ .setDType("renderer")
+ .setHWidth("bold " + Down_issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("ISSUE_DOWN_STATUS_TYPE"));
+ break;
+
case "PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.priority")
@@ -640,10 +667,15 @@
}
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
- // $rootScope.$on("getIssueDetail", function (event, args) {
- // $scope.vm.viewer.id = args["id"];
- // $scope.fn.getIssueDetail();
- // });
+ // $rootScope.$on("getIssueDetail", function (event, args) {
+ // $scope.vm.viewer.id = args["id"];
+ // $scope.fn.getIssueDetail();
+ // });
+
+ // �씠硫붿씪 蹂대궦�썑 �긽�꽭�솕硫� 媛깆떊
+ $rootScope.$on("getIssueDetail", function (event, args) {
+ $scope.fn.getIssueDetail();
+ });
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
// $scope.$on("getIssueDetail", function (event, args) {
@@ -682,6 +714,25 @@
parameter : function () {
return {
issueIds : [$scope.vm.viewer.id],
+ projectId : $scope.vm.viewer.projectVo.id
+ };
+ }
+ }
+ });
+ }
+
+ function modifyDownIssueStatus() {
+ $uibModal.open({
+ templateUrl : 'views/issue/downIssueModifyStatus.html',
+ size : "md",
+ controller : 'downIssueModifyStatusController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ issueTypeId : $scope.vm.viewer.issueTypeVo.id,
+ issueIds : [$scope.vm.viewer.id],
+ downIssues : $scope.vm.viewer.issueDownVos,
projectId : $scope.vm.viewer.projectVo.id
};
}
@@ -746,6 +797,7 @@
}
});
}
+
// �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
function addDownIssueTableConfig() {
@@ -854,13 +906,20 @@
// �븯�쐞 �씠�뒋 諛섎ぉ臾�
if (result.data.data.issueDownVos !== null){
angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
- $scope.vm.form.issuesDown.push(issueDownVo.issue);
+ //$scope.vm.form.issuesDown.push(issueDownVo.issueDown);
+ $scope.vm.form.issuesDown.push(issueDownVo);
+ // 媛꾪뿉�쟻�씤 �븯�쐞 �씠�뒋 媛깆떊 �삤瑜� 諛⑹�
+ $rootScope.$on("getIssueDetail", function (event, args) {
+ $scope.fn.getIssueDetail();
+ });
+
});
}
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
- if ($rootScope.workProject.id > -1) {
+
+ if ($rootScope.workProject.id > -1 && result.data.data.projectVo !== null) {
$rootScope.changeLastProject(result.data.data.projectVo.id);
}
}
@@ -870,8 +929,6 @@
}
});
}
-
- // ===================================================================================
// �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲�
function makePreviewImages(attachedFileVos) {
@@ -1055,36 +1112,61 @@
});
}
- // �뾽泥�/ISP/�샇�뒪�똿 諛곗뿴媛믪쓣 �븯�굹濡� �빀爾먯꽌 硫붿씪 �겢由��떆 �쟾�떖
- function makePartnersEmail() {
- $scope.vm.form.partnersEmail = $scope.vm.viewer.issueCompanyVos.concat($scope.vm.viewer.issueIspVos, $scope.vm.viewer.issueHostingVos)
- return $scope.vm.form.partnersEmail;
+ function sendMailVo(partnerVos) {
+ $scope.fn.sendMail($scope.fn.getParametersAll(), $scope.fn.getParameters(null, partnerVos));
+ }
+
+ function sendMailAll() {
+ var param = $scope.fn.getParametersAll();
+ $scope.fn.sendMail(param, param);
}
// �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋瑜� 硫붿씪濡� 諛쒖넚
- function sendMail(issueId, projectId) {
- makePartnersEmail();
+ function sendMail(partnersAll, partners) {
$uibModal.open({
- templateUrl : 'views/issue/issueSendMail.html',
+ templateUrl : 'views/issue/issueSendMailPartners.html',
size : "md",
- controller : 'issueSendMailController',
+ controller : 'issueSendMailPartnersController',
backdrop : 'static',
resolve : {
- parameter : function () {
- return {
- departmentVos : [$scope.vm.form.issues[0].departmentVos],
- partners : $scope.vm.form.partnersEmail,
- issueId : issueId,
- projectId : projectId
- // issueCompanyFields : [$scope.vm.viewer.issueCompanyVos[0]],
- // issueIspFields : [$scope.vm.viewer.issueIspVos[0]],
- // issueHostingFields : [$scope.vm.viewer.issueHostingVos[0]],
- };
+ parameter : {
+ partnersAll : partnersAll,
+ partners : partners,
+ issueId : $scope.vm.viewer.id,
+ projectId : $scope.vm.viewer.projectVo.id,
}
}
});
}
+ function getParametersAll() {
+ var params = $scope.fn.getParameters(null, $scope.vm.viewer.issueCompanyVos);
+ params = $scope.fn.getParameters(params, $scope.vm.viewer.issueIspVos);
+ params = $scope.fn.getParameters(params, $scope.vm.viewer.issueHostingVos);
+
+ if (params != null && params.length > 0) {
+ for (let i = 0; i < params.length; i++) {
+ params[i].id = i;
+ }
+ }
+ return params;
+ }
+
+ function getParameters(sourceArr, partnerVos) {
+ var excludeVos = sourceArr != null ? sourceArr.slice() : [];
+
+ angular.forEach(partnerVos, function (vo) {
+ var account = {
+ account : vo.email
+ }
+ Object.assign(vo, account)
+
+ excludeVos.push(vo);
+ });
+
+ return excludeVos;
+ }
+
// 蹂�寃� �젙蹂대�� �솗�씤�븳�떎.
function versionView(issueId) {
$uibModal.open({
--
Gitblit v1.8.0