src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html
@@ -62,7 +62,8 @@ <tbody> <tr ng-repeat="member in vm.memberProgressWidget.members"> <td class="text-center"> <div class="os-dropdown-trigger os-dropdown-position-left user-with-avatar" <!--<div class="os-dropdown-trigger os-dropdown-position-left user-with-avatar"--> <div owl-profile-over> <span class="avatar"> {{member.departmentName}} src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -244,7 +244,6 @@ // 연관 이슈 컬럼 switch(Rel_issueTableConfig.key) { // 연관 이슈 구분 case "RELATION_ISSUE_TYPE" : $scope.vm.relTableConfigs.push($tableProvider.config() @@ -896,6 +895,9 @@ issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name; $scope.vm.form.issues.push(issueRelationVo.issueRelation); }); result.data.data.issueRelationVos.sort(function (a, b) { //최근변경일 내림차순 return a.modifyDate > b.modifyDate ? -1 : a.modifyDate < b.modifyDate ? 1 : 0; }); } // 하위 이슈 반목문 @@ -904,6 +906,9 @@ //$scope.vm.form.issuesDown.push(issueDownVo.issueDown); $scope.vm.form.issuesDown.push(issueDownVo); $scope.vm.form.issuesDownStatus.push(issueDownVo.issueStatusVo.issueStatusType); }); result.data.data.issueDownVos.sort(function (a, b) { //최근변경일 내림차순 return a.modifyDate > b.modifyDate ? -1 : a.modifyDate < b.modifyDate ? 1 : 0; }); } $scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos; @@ -995,12 +1000,12 @@ // 활동 이력 만들기 function makeActiveHistory() { $scope.vm.viewer.activeParentHistory = ""; $scope.vm.viewer.activeHistory = ""; if ($scope.vm.viewer.issueDownVos != null && $scope.vm.viewer.issueDownVos.length > 0) { $scope.vm.viewer.activeHistory = ""; $scope.vm.viewer.activeParentHistory = ""; $scope.vm.viewer.activeDownHistory = ""; $scope.vm.viewer.activeDownAllHistory = ""; $scope.vm.viewer.downComment = ""; $scope.vm.viewer.activeDownHistory = ""; //하위이슈 히스토리만 $scope.vm.viewer.downComment = ""; //하위이슈 댓글만 $scope.vm.viewer.activeDownAllHistory = ""; //하위이슈 히스토리+댓글 var downTitle = ""; var oriDownHistory = []; var oriDownCommentHistory = []; src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -187,8 +187,12 @@ var deferred = $q.defer(); if ($rootScope.isDefined(page) && page > 0) { $rootScope.spinner = true; } Issue.find($resourceProvider.getContent( conditions)).then(function (result) { conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) { if (result.data.message.status === "success") { if ($rootScope.isDefined(callBack)) { callBack(result); @@ -198,6 +202,7 @@ else { SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "워크플로우 목록 조회 실패" } $rootScope.spinner = false; }); return deferred.promise; } @@ -227,8 +232,12 @@ }; var deferred = $q.defer(); if ($rootScope.isDefined(page) && page > 0) { $rootScope.spinner = true; } Issue.find($resourceProvider.getContent( // 페이징 업데이트가 필요한 컴포넌트 일경우, page 업데이트가 있을 경우 기본 10개씩 가져오고 아닐경우 25개씩 가져온다. conditions)).then(function (result) { conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) { if (result.data.message.status === "success") { if ($rootScope.isDefined(callBack)) { callBack(result); @@ -238,6 +247,7 @@ else { SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "워크플로우 목록 조회 실패" } $rootScope.spinner = false; }); return deferred.promise; }
