From 6adb341db180240e0af34ace40100912d4ed5257 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:02:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index f62d60f..5915af6 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -183,9 +183,10 @@
}
});
}
+ $scope.vm.issueIds = [];
// �긽�꽭 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
- function changeDetailView(id) {
+ function changeDetailView(id, isBack = false) {
$scope.vm.tableConfigs = [];
$scope.vm.detailView = true;
@@ -196,6 +197,10 @@
// �뀒�씠釉붿쓣 �떎�떆 洹몃┫�닔 �엳寃� �뜲�씠�꽣 諛붿씤�뵫�쓣 �떎�떆�븳�떎.
var temp = angular.copy($scope.vm.responseData.data);
$scope.vm.responseData.data = angular.copy(temp);
+
+ if (!isBack) {
+ $scope.vm.issueIds.push(id);
+ }
// �쁽�옱 �긽�꽭�솕硫댁쑝濡� 蹂대젮怨좏븯�뒗 �씠�뒋 id瑜� 湲곗뼲�븳�떎.
$rootScope.currentDetailIssueId = id;
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
@@ -207,6 +212,7 @@
// 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
function listView() {
+ $scope.vm.issueIds = [];
$scope.vm.detailView = false;
// �씠�뒋 �뀒�씠釉� �꽕�젙
$scope.fn.makeTableConfigs();
@@ -330,7 +336,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
- .setDName("issueNumber") /* todo �씠嫄� ���씠��濡� 蹂�寃쏀빐�빞�븯�뒗�뜲*/
+ .setDName("issueTitle")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -367,7 +373,7 @@
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
- .setDName("departmentName") /* todo 泥댄겕*/
+ .setDName("departmentName")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -385,7 +391,6 @@
case "PERIOD" : // 湲곌컙
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.period")
- .setDName("startDate")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -407,6 +412,33 @@
.setDAlign("text-center")
.setColumnTooltip("誘몄셿猷� �븯�쐞�씠�뒋/�쟾泥� �븯�쐞�씠�뒋")
.setDRenderer("DOWN_ISSUE_COUNT"));
+ break;
+ case "COMPANY" : // �뾽泥�
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.company")
+ .setDName("companyName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_COMPANY"));
+ break;
+ case "ISP" : // ISP
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.isp")
+ .setDName("ispName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_ISP"));
+ break;
+ case "HOSTING" : // HOSTING
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.hosting")
+ .setDName("hostingName")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("USE_HOSTING"));
break;
}
@@ -582,6 +614,7 @@
}
return conditions;
+
}
function getTreeList() {
@@ -684,7 +717,9 @@
changeDetailView(result.data.data[0].id);
}
} else {
- $scope.vm.responseData = result.data;
+ // 媛믪씠 �뾾�쓣�븣 媛믪쓣 �꽔�뼱二쇰젮怨� �븯�뒗 �쓽�룄
+ // $scope.vm.responseData = result.data;
+ result.data = $scope.vm.responseData;
}
}
else {
@@ -1079,13 +1114,16 @@
var deferred = $q.defer();
$scope.vm.partners = [];
- Issue.findPartners($resourceProvider.getContent({},
+ Issue.findPartners($resourceProvider.getContent({issueTypeId : $rootScope.getCurrentIssueTypeId()},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.vm.partnerVos = result.data.content;
+ angular.forEach(result.data.data, function (partner) {
+ $scope.vm.partners.push(partner);
+ });
+ //$scope.vm.partnerVos = result.data.data;
}
else {
- SweetAlert.swal($filter("translate")("issue.failedToPriorityListLookup"), result.data.message.message, "error"); // �슦�꽑�닚�쐞 紐⑸줉 議고쉶 �떎�뙣
+ SweetAlert.swal($filter("translate")("issue.failedToPartnerListLookup"), result.data.message.message, "error"); // �뙆�듃�꼫 紐⑸줉 議고쉶 �떎�뙣
}
deferred.resolve(result.data.data);
@@ -1171,7 +1209,6 @@
break;
}
-
$scope.vm.customFields.push(customField);
});
}
@@ -1192,8 +1229,8 @@
if ($rootScope.issueTypeMenu != null){
var content = {
- issueTypeId : $rootScope.issueTypeMenu.id
- }
+ issueTypeId : $rootScope.getCurrentIssueTypeId()
+ }
IssueTableConfig.detail($resourceProvider.getContent(content,
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
@@ -1258,6 +1295,8 @@
// 理쒖큹 �떎�뻾
function startExecute() {
+ // �씠�뒋 �긽�꽭�솕硫� �씠�뒋 �씠�룞 �궡�뿭 ���옣
+ $scope.vm.issueIds = [];
// 荑좏궎 �씫湲�
var paramKeyWord = null;
@@ -1285,7 +1324,7 @@
getPriorities : $scope.fn.getPriorities(),
getSeverities : $scope.fn.getSeverities(),
getIssueStatuses : $scope.fn.getIssueStatuses(),
- getCustomFields : $scope.fn.getCustomFields()
+ getCustomFields : $scope.fn.getCustomFields(),
};
$q.all(promises).then(function (results){
--
Gitblit v1.8.0