From 30ddd2cf095d2857ba1134fb3deaf51392ef1030 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 07 12월 2021 21:31:45 +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 | 95 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 69 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 07504f4..4724d5f 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -22,6 +22,7 @@
setTableColumn : setTableColumn, // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
add : add, // �씠�뒋 �깮�꽦
modify : modify, // �씠�뒋 �닔�젙
+ addRelationIssueForm : addRelationIssueForm, // �뿰愿� �씠�뒋 異붽�
modifyMultiIssueStatus : modifyMultiIssueStatus, // �씠�뒋 �떎以� �긽�깭 蹂�寃�
removes : removes, // �씠�뒋 �궘�젣
addIssueTableConfig : addIssueTableConfig, // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
@@ -37,7 +38,8 @@
getVmSearchObject : getVmSearchObject, // ���옣�븳 寃��깋 議곌굔�쓣 媛��졇���꽌 vm �뿉 �뀑�똿�븳�떎.
makeSearchConditions : makeSearchConditions, // 寃��깋 議곌굔�쓣 留뚮뱺�떎.
getIssueTableConfigs : getIssueTableConfigs, // �궗�슜�옄 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
- startExecute : startExecute // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
+ startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
+ getResponseData : getResponseData // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
};
// 蹂��닔
@@ -201,30 +203,37 @@
.setDAlign("text-center"));
// �긽�꽭�삎 �씪�븣�븣
- if ($scope.vm.detailView) {
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("issue.issueTitle")
- .setDName("title")
- .setDType("renderer")
- .setHWidth("width-100 bold")
- .setDRenderer("ISSUE_DETAIL_FLOATING"));
- }
- else {
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("issue.issueTitle")
- .setDName("title")
- .setDType("renderer")
- .setHWidth("bold")
- .setDRenderer("ISSUE_DETAIL_FLOATING"));
-
- angular.forEach($scope.vm.issueTableConfigs, function (issueTableConfig) {
- // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (issueTableConfig.display) {
- // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setTableColumn(issueTableConfig);
- }
- });
- }
+ // if ($scope.vm.detailView) {
+ // $scope.vm.tableConfigs.push($tableProvider.config()
+ // .setHName("issue.issueTitle")
+ // .setDName("title")
+ // .setDType("renderer")
+ // .setHWidth("bold")
+ // .setDRenderer("ISSUE_DETAIL_FLOATING"));
+ // }
+ // else {
+ // $scope.vm.tableConfigs.push($tableProvider.config()
+ // .setHName("issue.issueTitle")
+ // .setDName("title")
+ // .setDType("renderer")
+ // .setHWidth("bold")
+ // .setDRenderer("ISSUE_DETAIL_FLOATING"));
+ //
+ // angular.forEach($scope.vm.issueTableConfigs, function (issueTableConfig) {
+ // // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
+ // if (issueTableConfig.display) {
+ // // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ // $scope.fn.setTableColumn(issueTableConfig);
+ // }
+ // });
+ // }
+ angular.forEach($scope.vm.issueTableConfigs, function (issueTableConfig) {
+ // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
+ if (issueTableConfig.display) {
+ // �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
+ $scope.fn.setTableColumn(issueTableConfig);
+ }
+ });
}
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
@@ -232,6 +241,15 @@
// �씪諛� 而щ읆
switch(issueTableConfig.key) {
+ case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("issue.issueTitle")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("ISSUE_TITLE"));
+ break;
+
case "PRIORITY" : // �슦�꽑�닚�쐞
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.priority")
@@ -291,9 +309,10 @@
case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.countDownIssue")
+ .setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDName("downIssueCount"));
+ .setDRenderer("DOWN_ISSUE_COUNT"));
break;
}
@@ -523,12 +542,20 @@
if (detail) {
changeDetailView(result.data.data[0].id);
}
+ } else {
+ $scope.vm.responseData = result.data;
}
+
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
}
+
});
+ }
+
+ function getResponseData() {
+ return $scope.data;
}
// �씠硫붿씪 �봽濡쒖젥�듃 寃쎈줈濡� �씠�룞 �썑 �긽�꽭 吏꾩엯�떆 議고쉶
@@ -642,6 +669,22 @@
});
}
+ function addRelationIssueForm(id) {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueAddRelation.html',
+ size : "lg",
+ controller : 'issueAddRelationController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id,
+ };
+ }
+ }
+ });
+ }
+
// �씠�뒋 �궘�젣
function removes() {
var removeIds = [];
--
Gitblit v1.8.0