From 4af75fe18d97960fabea0fadb28a69c01a038bc4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 25 1월 2022 17:01:37 +0900
Subject: [PATCH] - 파트너명 특수문자 입력 가능하도록 수정 - 이슈 import/export 시 파트너 정보 추가 - 이슈상세 - 메일 기록 추가
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 3d12685..756ae3c 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -1248,19 +1248,46 @@
function makeActiveHistory() {
$scope.vm.viewer.activeParentHistory = "";
$scope.vm.viewer.activeHistory = "";
+ $scope.vm.viewer.activeParentMailHistory = "";
+ var oriMailHistory = [];
+
+ if ($scope.vm.viewer.issueHistoryVos != null && $scope.vm.viewer.issueHistoryVos.length > 0) {
+ for (var i=0; i<$scope.vm.viewer.issueHistoryVos.length; i++) {
+ if ($scope.vm.viewer.issueHistoryVos[i].issueHistoryType === "SEND") {
+ oriMailHistory.push($scope.vm.viewer.issueHistoryVos[i]);
+ }
+ }
+ $scope.vm.viewer.activeParentMailHistory = angular.copy(oriMailHistory);
+ }
+
if ($scope.vm.viewer.issueDownVos != null && $scope.vm.viewer.issueDownVos.length > 0) {
$scope.vm.viewer.activeDownHistory = ""; //�븯�쐞�씠�뒋 �엳�뒪�넗由щ쭔
$scope.vm.viewer.downComment = ""; //�븯�쐞�씠�뒋 �뙎湲�留�
+ $scope.vm.viewer.activeDownMailHistory = ""; //�븯�쐞�씠�뒋 硫붿씪留�
$scope.vm.viewer.activeDownAllHistory = ""; //�븯�쐞�씠�뒋 �엳�뒪�넗由�+�뙎湲�
var downTitle = "";
var oriDownHistory = [];
var oriDownCommentHistory = [];
+ var oriDownMailHistory = [];
// �븯�쐞�씠�뒋 �엳�뒪�넗由�
for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++){
oriDownHistory.push($scope.vm.viewer.issueDownVos[i].issueHistoryVos);
oriDownCommentHistory.push($scope.vm.viewer.issueDownVos[i].issueCommentVos);
+
+ // �븯�쐞�씠�뒋 硫붿씪 湲곕줉
+ for (var j=0; j<$scope.vm.viewer.issueDownVos[i].issueHistoryVos.length; j++) {
+ if($scope.vm.viewer.issueDownVos[i].issueHistoryVos[j].issueHistoryType === "SEND") {
+ oriDownMailHistory.push($scope.vm.viewer.issueDownVos[i].issueHistoryVos[j]);
+ }
+ }
}
+ // �븯�쐞�씠�뒋 硫붿씪留� ���옣
+ $scope.vm.viewer.activeDownMailHistory = angular.copy(oriDownMailHistory);
+ $scope.vm.viewer.activeDownMailHistory.sort(function (a, b) { //�궡由쇱감�닚
+ return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
+ });
+
for (var i=0; i<oriDownHistory.length; i++){
if ($scope.vm.viewer.activeDownHistory === "") {
$scope.vm.viewer.activeDownHistory = oriDownHistory[i];
--
Gitblit v1.8.0