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 | 142 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 113 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index fe9dc27..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 // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
};
// 蹂��닔
@@ -100,6 +102,10 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂� 媛깆떊
$scope.$on("getIssueTableConfigs", function () {
$scope.fn.startExecute();
+ });
+
+ $scope.$on("changedIssueListMenu", function (event, args) {
+ $scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -169,10 +175,11 @@
// �쁽�옱 �긽�꽭�솕硫댁쑝濡� 蹂대젮怨좏븯�뒗 �씠�뒋 id瑜� 湲곗뼲�븳�떎.
$rootScope.currentDetailIssueId = id;
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
- $rootScope.$broadcast("getIssueDetail", {
- id : id
- });
+ // $scope.$broadcast("getIssueDetail", {
+ // id : id
+ // });
}
+
// 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
function listView() {
@@ -183,6 +190,7 @@
$scope.vm.responseData.data = angular.copy(temp);
// 留덉�留됱쑝濡� 蹂닿퀬�엳�뜕 �씠�뒋 id瑜� 珥덇린�솕�븳�떎.
$rootScope.currentDetailIssueId = null;
+ $scope.$broadcast("getIssueList", {id: $rootScope.currentDetailIssueId});
}
// �씠�뒋 �뀒�씠釉� �꽕�젙
@@ -195,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);
+ }
+ });
}
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
@@ -226,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")
@@ -281,6 +305,14 @@
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDName("modifyDate"));
+ break;
+ case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.countDownIssue")
+ .setDType("renderer")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDRenderer("DOWN_ISSUE_COUNT"));
break;
}
@@ -487,6 +519,7 @@
if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
var find = findProjectSearch($rootScope.workProject.id);
if (!find) {
+ $scope.vm.projects = [];
$scope.vm.projects.push($rootScope.workProject);
}
}
@@ -502,12 +535,46 @@
$scope.vm.issueTypeId = result.data.data[0].issueTypeId;
$scope.vm.projectKey = result.data.data[0].projectKey;
$scope.vm.issueNumber = result.data.data[0].issueNumber;
+ $scope.vm.projectName = result.data.data[0].projectName;
$scope.vm.page.selectedPage = currentPage + 1;
$scope.vm.responseData = result.data;
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;
+ }
+
+ // �씠硫붿씪 �봽濡쒖젥�듃 寃쎈줈濡� �씠�룞 �썑 �긽�꽭 吏꾩엯�떆 議고쉶
+ function getDetailList(projectKey, number) {
+ var conditions = {
+ projectKey : projectKey,
+ combinationIssueNumber : number
+ };
+
+ Issue.find($resourceProvider.getContent(conditions,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ if (result.data.data != null && result.data.data.length > 0) {
+ $scope.vm.projectKey = result.data.data[0].projectKey;
+ $scope.vm.issueNumber = result.data.data[0].issueNumber;
+ $scope.vm.responseData = result.data;
+
+ changeDetailView(result.data.data[0].id);
}
}
else {
@@ -591,6 +658,22 @@
templateUrl : 'views/issue/issueModify.html',
size : "lg",
controller : 'issueModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id,
+ };
+ }
+ }
+ });
+ }
+
+ function addRelationIssueForm(id) {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueAddRelation.html',
+ size : "lg",
+ controller : 'issueAddRelationController',
backdrop : 'static',
resolve : {
parameter : function () {
@@ -885,7 +968,8 @@
// �뙆�씪誘명꽣 �씫湲�
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
- $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
+ // $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
+ getDetailList(params.projectKey, params.issueNumber);
$rootScope.previousGetParams = null;
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
return;
--
Gitblit v1.8.0