From 0e9a2d3cdad67b0c16d18bf349c14528f617aef0 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 20 12월 2021 18:30:07 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 14 ++++++++++++--
src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html | 3 ++-
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 17 +++++++++++------
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html b/src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html
index 8ea0dd9..d2981db 100644
--- a/src/main/webapp/custom_components/widget/member-progress-widget/member-progress-widget.html
+++ b/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}}
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 37fadd0..9d13d75 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/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 = [];
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 3712643..d0b6c23 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/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;
}
--
Gitblit v1.8.0