From 6211b73ad7750a62652bacf5bcf05002c62fb907 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 15:57:16 +0900
Subject: [PATCH] - 이슈 상세페이지 연관,하위 이슈 페이징 처리 완료
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 275 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 176 insertions(+), 99 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 47d6dad..34c14fa 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -8,9 +8,9 @@
'angular'
],
function (app, angular) {
- app.controller('issueDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$state', '$uibModal', '$q',
+ app.controller('issueDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$relProvider', '$downProvider', '$state', '$uibModal', '$q',
'$controller', '$injector', 'SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'Priority', 'Severity','IssueStatus', 'IssueTableConfig', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, Priority, Severity, IssueStatus, IssueTableConfig, $filter) {
+ function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $relProvider, $downProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, Priority, Severity, IssueStatus, IssueTableConfig, $filter) {
// IssueListController vm, fn 蹂��닔 �긽�냽.
@@ -53,7 +53,9 @@
$scope.fn.issueBack = issueBack;
$scope.fn.removeRelationIssue = removeRelationIssue;
$scope.fn.removeDownIssue = removeDownIssue;
+ $scope.fn.changeDetailPageRowCount = changeDetailPageRowCount; // �럹�씠吏� 蹂�寃�
$scope.fn.sendCommonMail = sendCommonMail;
+ $scope.fn.getSubPageContent = getSubPageContent;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {}; // �쁽�옱 �씠�뒋
@@ -90,6 +92,16 @@
issueHostingVos : []
};
+ $scope.vm.responseData = {
+ data : []
+ };
+
+ $scope.vm.subPage = {
+ selectedRelPage : 0,
+ selectedRelPageRowCount : String(10),
+ selectedDownPage : 0,
+ selectedDownPageRowCount : String(10)
+ };
$scope.vm.issueNameDown = ""; // �꽑�깮�맂 �븯�쐞 �씪媛� �씠由�
$scope.vm.autoCompletePageDown = {
@@ -143,16 +155,21 @@
}
}
+ // �럹�씠吏� 蹂�寃�
+ function changeDetailPageRowCount() {
+ $scope.fn.getIssueDetail(0,0);
+ }
+
function onActivate() {
window.scroll(0,240);
}
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
- // �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
- $scope.$on("getIssueList", function () {
- $scope.fn.getIssueDetail();
- });
+ // �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
+ /*$scope.$on("getIssueList", function () {
+ $scope.fn.getIssueDetail(0,0);
+ });*/
// �븯�쐞 �씠�뒋 �궘�젣
function removeDownIssue() {
@@ -214,7 +231,7 @@
$resourceProvider.getPageContent(0, 10))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.fn.getIssueDetail();
+ $scope.fn.getIssueDetail(0,0);
}
else {
SweetAlert.error($filter("translate")("issue.failedToIssueDeleteIssueDown"), result.data.message.message); // "�뿰愿��씪媛� �궘�젣 �떎�뙣"
@@ -287,7 +304,7 @@
$resourceProvider.getPageContent(0, 10))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.fn.getIssueDetail();
+ $scope.fn.getIssueDetail(0,0);
}
else {
SweetAlert.error($filter("translate")("issue.failedToIssueDeleteIssueRelation"), result.data.message.message); // "�뿰愿��씪媛� �궘�젣 �떎�뙣"
@@ -310,90 +327,98 @@
}
// �뀒�씠釉붿쓽 �뿰愿� �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
- function setRelTableColumn(Rel_issueTableConfig) {
+ function setRelTableColumn(issueTableConfig) {
// �뿰愿� �씠�뒋 而щ읆
- switch(Rel_issueTableConfig.key) {
+ switch(issueTableConfig.key) {
case "RELATION_ISSUE_TYPE" : // �뿰愿� �씠�뒋 援щ텇
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("issue.relationIssueType")
+ .setDName("relationIssueType")
.setDType("renderer")
.setDAlign("text-center")
- .setHWidth("bold " + Rel_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDRenderer("ISSUE_RELATION_TYPE"))
/*.setHWidth("width-30 bold")*/
/*.setHSort(false)*/
break;
case "RELATION_ISSUE_TITLE" : // �뿰愿� �씠�뒋 �젣紐�
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("issue.relationIssueTitle")
+ .setDName("title")
.setDType("renderer")
.setDAlign("text-center")
- .setHWidth("bold " + Rel_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDRenderer("ISSUE_RELATION_MOVE"))
/*.setHWidth("width-60 bold")*/
/*.setHSort(true)*/
break;
case "RELATION_PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("common.priority")
+ .setDName("priorityVo.id")
.setDType("renderer")
- .setHWidth("bold " + Rel_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_COMMON_PRIORITY"));
break;
case "RELATION_SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("common.importance")
+ .setDName("severityVo.id")
.setDType("renderer")
- .setHWidth("bold " + Rel_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_COMMON_SEVERITY"));
break;
case "RELATION_ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("common.assigneeTeam")
+ .setDName("departmentVos.departmentName")
.setDType("renderer")
- .setHWidth("bold " + Rel_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_ISSUE_DEPARTMENT"));
break;
- case "RELATION_REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ case "RELATION_REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("common.register")
+ .setDName("registerVo.id")
.setDType("renderer")
- .setHWidth("bold " + Rel_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_REGISTER"));
break;
case "RELATION_PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("common.period")
.setDType("renderer")
- .setHWidth("bold " + Rel_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("REL_ISSUE_DUE_DATE"));
break;
- case "RELATION_MODIFY_DATE" : // �뿰愿� �씠�뒋 理쒓렐 蹂�寃쎌씪
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ case "RELATION_MODIFY_DATE" : // �뿰愿� �씠�뒋 理쒓렐 蹂�寃쎌씪
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("common.lastChangeDate")
- .setHWidth("bold " + Rel_issueTableConfig.width)
- .setDAlign("text-center"));
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDName("modifyDate"));
break;
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
- if (Rel_issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
+ if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
// 留뚯빟 �씠�뒋 �뀒�씠釉� 而щ읆紐낆씠 �몴�떆�릺吏� �븡�쑝硫� �씠履쎌씠 臾몄젣
for (var count in $scope.vm.customFields) {
var customField = $scope.vm.customFields[count];
- if (customField.id === Number(Rel_issueTableConfig.key.substring(13))) {
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ if (customField.id === Number(issueTableConfig.key.substring(13))) {
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName(customField.name)
+ .setDName("relCustomFieldName" + [count])
.setDType("renderer")
- .setHWidth("bold " + Rel_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
.setDRenderer("REL_ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
@@ -405,88 +430,96 @@
// �뀒�씠釉붿쓽 �븯�쐞 �씠�뒋 而щ읆�쓣 留뚮뱾�뼱以��떎.
- function setDownTableColumn(Down_issueTableConfig) {
+ function setDownTableColumn(issueTableConfig) {
// if (issueTableConfig == null) return;
// �븯�쐞 �씠�뒋 而щ읆
- switch(Down_issueTableConfig.key) {
+ switch(issueTableConfig.key) {
case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐�
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("issue.downIssueTitle")
+ .setDName("title")
.setDType("renderer")
- .setHWidth("bold " + Down_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("ISSUE_DOWN_MOVE"));
break;
- case "ISSUE_DOWN_STATUS_TYPE" : // �씠�뒋 �긽�깭
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ case "ISSUE_DOWN_STATUS_TYPE" : // �븯�쐞 �씠�뒋 �긽�깭
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("issue.issueStatus")
+ .setDName("issueStatusVo.id")
.setDType("renderer")
- .setHWidth("bold " + Down_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("ISSUE_DOWN_STATUS_TYPE"));
break;
case "DOWN_PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("common.priority")
+ .setDName("priorityVo.id")
.setDType("renderer")
- .setHWidth("bold " + Down_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_COMMON_PRIORITY"));
break;
- case "DOWN_SEVERITY" : // 以묒슂�룄
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ case "DOWN_SEVERITY" : // �븯�쐞 �씠�뒋 以묒슂�룄
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("common.importance")
+ .setDName("severityVo.id")
.setDType("renderer")
- .setHWidth("bold " + Down_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_COMMON_SEVERITY"));
break;
- case "DOWN_ASSIGNEE_TEAM" : // �떞�떦遺��꽌
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ case "DOWN_ASSIGNEE_TEAM" : // �븯�쐞 �씠�뒋 �떞�떦遺��꽌
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("common.assigneeTeam")
+ .setDName("departmentVos.departmentName")
.setDType("renderer")
- .setHWidth("bold " + Down_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DEPARTMENT"));
break;
- case "DOWN_REGISTER" : // �벑濡앹옄
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ case "DOWN_REGISTER" : // �븯�쐞 �씠�뒋 �벑濡앹옄
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("common.register")
+ .setDName("registerVo.id")
.setDType("renderer")
- .setHWidth("bold " + Down_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_REGISTER"));
break;
- case "DOWN_PERIOD" : // 湲곌컙
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ case "DOWN_PERIOD" : // �븯�쐞 �씠�뒋 湲곌컙
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("common.period")
.setDType("renderer")
- .setHWidth("bold " + Down_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDRenderer("DOWN_ISSUE_DUE_DATE"));
break;
- case "DOWN_MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ case "DOWN_MODIFY_DATE" : // �븯�쐞 �씠�뒋 理쒓렐 蹂�寃쎌씪
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("common.lastChangeDate")
- .setHWidth("bold " + Down_issueTableConfig.width)
- .setDAlign("text-center"));
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDName("modifyDate"));
break;
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
- if (Down_issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
+ if (issueTableConfig.key.indexOf("CUSTOM_FIELD_") !== -1) {
// 留뚯빟 �씠�뒋 �뀒�씠釉� 而щ읆紐낆씠 �몴�떆�릺吏� �븡�쑝硫� �씠履쎌씠 臾몄젣
for (var count in $scope.vm.customFields) {
var customField = $scope.vm.customFields[count];
- if (customField.id === Number(Down_issueTableConfig.key.substring(13))) {
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ if (customField.id === Number(issueTableConfig.key.substring(13))) {
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName(customField.name)
+ .setDName("downCustomFieldName" + [count])
.setDType("renderer")
- .setHWidth("bold " + Down_issueTableConfig.width)
+ .setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
.setDRenderer("DOWN_ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
@@ -500,18 +533,18 @@
// �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙
function makeRelTableConfigs() {
$scope.vm.relTableConfigs = [];
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setDType("checkbox")
.setHWidth("width-20-p")
.setDAlign("text-center"))
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("issue.relationIssueType")
.setDType("renderer")
.setDAlign("text-center")
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_TYPE"))
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("issue.relationIssueTitle")
.setDType("renderer")
.setDAlign("text-center")
@@ -519,7 +552,7 @@
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
/*if($scope.vm.viewer.modifyPermissionCheck) {
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
.setDAlign("text-center")
@@ -528,11 +561,11 @@
.setHSort(false)
.setDAlign("text-center"))
}*/
- angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) {
+ angular.forEach($scope.vm.relTableConfigs, function (issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (Rel_issueTableConfig.display) {
+ if (issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setRelTableColumn(Rel_issueTableConfig);
+ $scope.fn.setRelTableColumn(issueTableConfig);
}
});
}
@@ -540,11 +573,11 @@
// �븯�쐞 �씠�뒋 �뀒�씠釉� �꽕�젙
function makeDownTableConfigs() {
$scope.vm.downTableConfigs = [];
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setDType("checkbox")
.setHWidth("width-20-p")
.setDAlign("text-center"))
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("issue.downIssueTitle")
.setDType("renderer")
.setDAlign("text-center")
@@ -552,7 +585,7 @@
.setHSort(false)
.setDRenderer("ISSUE_DOWN_MOVE"))
/*if($scope.vm.viewer.modifyPermissionCheck){
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
.setDAlign("text-center")
@@ -562,11 +595,11 @@
.setDAlign("text-center"))
}*/
- angular.forEach($scope.vm.downTableConfigs, function (Down_issueTableConfig) {
+ angular.forEach($scope.vm.downTableConfigs, function (issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (Down_issueTableConfig.display) {
+ if (issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setDownTableColumn(Down_issueTableConfig);
+ $scope.fn.setDownTableColumn(issueTableConfig);
}
});
}
@@ -579,7 +612,7 @@
}
var issueTableConfigs = issueTableConfigVo.issueTableConfigs;
- // �뿰愿� �뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
+ // �뿰愿� �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
if ($rootScope.isDefined(issueTableConfigs)) {
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂대�� ���옣 �븳�떎.
@@ -590,34 +623,34 @@
});
$scope.vm.relTableConfigs = [];
- /* $scope.vm.relTableConfigs.push($tableProvider.config()
+ /* $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("issue.relationIssueType")
.setDType("renderer")
.setDAlign("text-center")
.setHWidth("width-30-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_TYPE"))
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("issue.relationIssueTitle")
.setDType("renderer")
.setDAlign("text-center")
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))*/
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setDType("checkbox")
.setHWidth("width-20-p")
.setDAlign("text-center"))
- angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) {
+ angular.forEach($scope.vm.issueRelTableConfigs, function (issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (Rel_issueTableConfig.display) {
+ if (issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setRelTableColumn(Rel_issueTableConfig);
+ $scope.fn.setRelTableColumn(issueTableConfig);
}
});
/*if($scope.vm.viewer.modifyPermissionCheck) {
- $scope.vm.relTableConfigs.push($tableProvider.config()
+ $scope.vm.relTableConfigs.push($relProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
.setHWidth("width-40-p bold")
@@ -636,7 +669,7 @@
if (issueTableConfigVo == null) return;
var issueTableConfigs = issueTableConfigVo.issueTableConfigs;
- // �뿰愿� �뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
+ // �뿰愿� �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
if ($rootScope.isDefined(issueTableConfigs)) {
// �씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂대�� ���옣 �븳�떎.
$scope.vm.issueDownTableConfigs = [];
@@ -645,26 +678,26 @@
return a.position < b.position ? -1 : a.position > b.position ? 1 : 0;
});
$scope.vm.downTableConfigs = [];
-/* $scope.vm.downTableConfigs.push($tableProvider.config()
+/* $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("issue.downIssueTitle")
.setDType("renderer")
.setDAlign("text-center")
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_DOWN_MOVE"))*/
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setDType("checkbox")
.setHWidth("width-20-p")
.setDAlign("text-center"))
- angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) {
+ angular.forEach($scope.vm.issueDownTableConfigs, function (issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
- if (Down_issueTableConfig.display) {
+ if (issueTableConfig.display) {
// �뀒�씠釉붿쓽 而щ읆�쓣 留뚮뱾�뼱以��떎.
- $scope.fn.setDownTableColumn(Down_issueTableConfig);
+ $scope.fn.setDownTableColumn(issueTableConfig);
}
});
/*if($scope.vm.viewer.modifyPermissionCheck) {
- $scope.vm.downTableConfigs.push($tableProvider.config()
+ $scope.vm.downTableConfigs.push($downProvider.config()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
.setHWidth("width-40-p bold")
@@ -697,7 +730,7 @@
$resourceProvider.getPageContent(0, 10))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.fn.getIssueDetail();
+ $scope.fn.getIssueDetail(0,0);
}
else {
SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueRelation"), result.data.message.message); // "�뿰愿��씪媛� �깮�꽦 �떎�뙣"
@@ -729,7 +762,7 @@
$resourceProvider.getPageContent(0, 10))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.fn.getIssueDetail();
+ $scope.fn.getIssueDetail(0,0);
}
else {
SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�뿰愿��씪媛� �깮�꽦 �떎�뙣"
@@ -748,14 +781,14 @@
// $scope.vm.viewer.id = args["id"];
// $scope.fn.getIssueDetail();
// });
-
+
// �씠硫붿씪 蹂대궦�썑 �긽�꽭�솕硫� 媛깆떊
// $rootScope.$on("getIssueDetail", function (event, args) {
// $scope.fn.getIssueDetail();
// });
$scope.$on("getIssueDetail", function (event, args) {
- $scope.fn.getIssueDetail();
+ $scope.fn.getIssueDetail(0,0);
});
$scope.$watch(function() {
@@ -763,7 +796,7 @@
}, function() {
if ($rootScope.currentDetailIssueId != null) {
$scope.vm.viewer.id = $rootScope.currentDetailIssueId;
- $scope.fn.getIssueDetail();
+ $scope.fn.getIssueDetail(0,0);
}
}, true);
@@ -951,20 +984,62 @@
return result;
}
+ function getSubPageContent(relPage, relPageSize, downPage, downPageSize) {
+ return {
+ relPage: relPage,
+ relPageSize: relPageSize,
+ downPage: downPage,
+ downPageSize: downPageSize
+ };
+ }
// �씠�뒋 �긽�꽭 �젙蹂� 議고쉶
- function getIssueDetail() {
+ function getIssueDetail(selectedRelPage, selectedDownPage) {
$rootScope.spinner = true;
+ if (selectedRelPage < 0) {
+ selectedRelPage = 0;
+ }
+ if (selectedDownPage < 0) {
+ selectedDownPage = 0;
+ }
+ // �쁽�옱 �럹�씠吏� �젙蹂�
+ var currentRelPage = 0;
+ var currentDownPage = 0;
+
+ // 荑좏궎�뿉 �꽑�깮�븳 �럹�씠吏� �젙蹂닿� �뾾�쑝硫� 湲곕낯 �럹�씠吏� �젙蹂� 0 �쓣 ���옣
+ if (angular.isUndefined(selectedRelPage) || selectedRelPage === "") {
+ currentRelPage = $scope.vm.page.selectedRelPage;
+ }
+ else {
+ currentRelPage = selectedRelPage;
+ }
+
+ if (angular.isUndefined(selectedDownPage) || selectedDownPage === "") {
+ currentDownPage = $scope.vm.page.selectedDownPage;
+ }
+ else {
+ currentDownPage = selectedDownPage;
+ }
+
// 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
$scope.fn.initReload();
// $scope.fn.getRelTableConfigs();
// $scope.fn.getDownTableConfigs();
- Issue.detail($resourceProvider.getContent(
- {id : $scope.vm.viewer.id, deep : "02"},
- $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ var pageContent = $scope.fn.getSubPageContent(currentRelPage, $scope.vm.subPage.selectedRelPageRowCount
+ , currentDownPage, $scope.vm.subPage.selectedDownPageRowCount);
+
+ var content = $resourceProvider.getContent(
+ {id : $scope.vm.viewer.id, deep : "02", pageContent}, null);
+
+ Issue.detail(content).then(function (result) {
if (result.data.message.status === "success") {
if (angular.isDefined(result.data.data)) {
+
+ $scope.vm.subPage.selectedRelPage = currentRelPage + 1;
+ $scope.vm.subPage.selectedDownPage = currentDownPage + 1;
+ $scope.vm.responseData = result.data.data;
$scope.vm.viewer = angular.copy(result.data.data);
// �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲�
@@ -975,6 +1050,8 @@
$scope.vm.viewer.startDate = result.data.data.startDate == null ? "common.unspecified" : result.data.data.startDate; // 誘몄��젙
$scope.vm.viewer.completeDate = result.data.data.completeDate == null ? "common.unspecified" : result.data.data.completeDate; // 誘몄��젙
+ $scope.vm.rangeDate = result.data.data.startDate + "~" + result.data.data.completeDate
+
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 �젙蹂대�� �엯�젰 �뤌�뿉�꽌 �궗�슜�븷 �닔 �엳寃� 媛�怨듯븳�떎.
$scope.fn.setFormByIssueTypeCustomFields(result.data.data.issueTypeCustomFieldVos);
// �씠�뒋�뿉�꽌 �궗�슜�옄媛� �꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪쓣 �엯�젰 �뤌�뿉 �뀑�똿�븳�떎.
--
Gitblit v1.8.0