From 08d9a03d389bd341d690aeae41f802c32ea08831 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 19 11월 2021 18:29:32 +0900
Subject: [PATCH] 이슈 상세 수정 - 부서 [프론트]
---
src/main/webapp/views/issue/issueModifyDepartment.html | 2
src/main/webapp/scripts/app/project/projectModify.controller.js | 16 +++++++
src/main/webapp/views/project/projectAdd.html | 16 ++++----
src/main/webapp/views/project/projectModify.html | 15 +++----
src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js | 4 +-
src/main/webapp/views/issue/issueDetail.html | 40 ++++++++-----------
src/main/webapp/scripts/app/project/projectAdd.controller.js | 12 ++++-
7 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js b/src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js
index 55fcf76..85a1aa0 100644
--- a/src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModifyDepartment.controller.js
@@ -17,7 +17,7 @@
cancel: cancel, // �뙘�뾽 李� �떕湲�
formSubmit: formSubmit, // �뤌 �쟾�넚
formCheck: formCheck, // �뤌 泥댄겕
- removeManager : removeManager, // �떞�떦�옄 �궘�젣
+ removeDepartment : removeDepartment, // �떞�떦遺��꽌 �궘�젣
load : load, // �쁽�옱 �떞�떦�옄 媛��졇�삤湲�
startExecute : startExecute // �떆�옉�떆 �떎�뻾
};
@@ -40,7 +40,7 @@
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
// �떞�떦遺��꽌 �궘�젣
- function removeManager(index) {
+ function removeDepartment(index) {
$scope.vm.form.departments.splice(index, 1);
}
diff --git a/src/main/webapp/scripts/app/project/projectAdd.controller.js b/src/main/webapp/scripts/app/project/projectAdd.controller.js
index 05d486b..aed7636 100644
--- a/src/main/webapp/scripts/app/project/projectAdd.controller.js
+++ b/src/main/webapp/scripts/app/project/projectAdd.controller.js
@@ -16,6 +16,7 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
removeUsr : removeUsr, // �씪諛� �궗�슜�옄 �젣嫄�
+ removeDepartment : removeDepartment // 遺��꽌 �젣嫄�
};
$scope.vm = {
@@ -63,6 +64,11 @@
$scope.vm.form.users.splice(index, 1);
}
+ // �떞�떦遺��꽌 �궘�젣
+ function removeDepartment(index) {
+ $scope.vm.form.departments.splice(index, 1);
+ }
+
function formCheck(formInvalid) {
if (formInvalid) {
return true;
@@ -94,11 +100,11 @@
});
return managerIds;
})(),
- //遺��꽌id 異붽� �븘�슂
+ // 遺��꽌 id 異붽� �븘�슂
departmentIds : (function () {
var departmentIds = [];
- angular.forEach($scope.vm.form.users, function (user) {
- departmentIds.push(user.id);
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
});
return departmentIds;
})()
diff --git a/src/main/webapp/scripts/app/project/projectModify.controller.js b/src/main/webapp/scripts/app/project/projectModify.controller.js
index d0f6edf..3b22844 100644
--- a/src/main/webapp/scripts/app/project/projectModify.controller.js
+++ b/src/main/webapp/scripts/app/project/projectModify.controller.js
@@ -18,6 +18,7 @@
detail : detail, // �긽�꽭 �젙蹂� 議고쉶
removeUsr : removeUsr, // �씪諛� �궗�슜�옄 �젣嫄�
removeManager : removeManager, // 愿�由ъ옄 �젣嫄�
+ removeDepartment : removeDepartment, // 遺��꽌 �젣嫄�
getManagerListCallBack : getManagerListCallBack, // 愿�由ъ옄 auto complete callback function
getProjectListCallBack : getProjectListCallBack // �봽濡쒖젥�듃 auto complete callback function
};
@@ -72,6 +73,11 @@
// ���썝 �궘�젣
function removeUsr(index) {
$scope.vm.form.users.splice(index, 1);
+ }
+
+ // �떞�떦遺��꽌 �궘�젣
+ function removeDepartment(index) {
+ $scope.vm.form.departments.splice(index, 1);
}
// 愿�由ъ옄 �궘�젣
@@ -131,7 +137,14 @@
userIds.push(user.id);
});
return userIds;
- })()
+ })(),
+ departmentIds : (function () {
+ var departmentIds = [];
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
+ });
+ return departmentIds;
+ })(),
};
var startEndDateRange = $scope.vm.form.startEndDateRange.split("~");
@@ -174,6 +187,7 @@
$scope.vm.form.description = result.data.data.description;
$scope.vm.form.managers = result.data.data.projectManagerVos;
$scope.vm.form.users = result.data.data.projectUserVos;
+ $scope.vm.form.departments = result.data.data.projectDepartmentVos;
if (result.data.data.parentProjectVo != null) {
$scope.vm.form.parentProjects = [];
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 6366d1f..ee7485b 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -86,35 +86,30 @@
<!-- �긽�꽭 �솕硫� -->
<div class="support-ticket-content-w" ng-controller="issueDetailController">
<div class="support-ticket-content">
- <div class="support-ticket-content-header issue-detail-word-break" style="height: 8vh">
+ <span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }">
+ <span ng-if="vm.viewer.parentIssueId != '' || vm.viewer.parentIssueId != 'null' ">�긽�쐞 �씪媛�:{{vm.viewer.parentIssueID}}</span>
+ <i class="os-icon-airplay">OWL Trial</i>
+ </span>
+ <label class="issue-detail-label offset-1"><span translate="issue.issueType">�씠�뒋 �쑀�삎</span> </label>
+ <span class="status-pill smaller"
+ ng-style="{'background-color': vm.viewer.issueTypeVo.color }"></span><span>{{vm.viewer.issueTypeVo.name}}</span>
+ <span class="offset-1"> {{vm.viewer.registerDate}}</span>
+ <label class="issue-detail-label offset-1"><span translate="common.register">�벑濡앹옄</span></label>
+ <span class="select3-selection__choice">
+ <span class="avatar-w"><img ng-src="{{vm.viewer.registerVo.profile}}"></span>
+ <span>{{vm.viewer.registerVo.byName}}</span>
+ </span>
+ <div class="">
+ <span class="h3-div">{{vm.viewer.title}}</span>
+ </div>
+ <div class="support-ticket-content-header issue-detail-word-break">
<span class="ticket-header">
<div class="tasks-header-w">
<span class="tags">
<span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>
</span>
</div>
- <span class="h3-div">{{vm.viewer.title}}</span>
</span>
- <div class="col-sm-2">
- <div class="form-group ml-4">
- <label class="issue-detail-label"><span translate="issue.issueType">�씠�뒋 �쑀�삎</span> </label>
- <span class="status-pill smaller"
- ng-style="{'background-color': vm.viewer.issueTypeVo.color }"></span><span>{{vm.viewer.issueTypeVo.name}}</span>
- </div>
- </div>
- <div class="col-sm-2">
- <div class="form-group">
- {{vm.viewer.registerDate}}
- </div>
- </div>
-
- <div class="form-group">
- <label class="issue-detail-label"><span translate="common.register">�벑濡앹옄</span></label>
- <span class="select3-selection__choice">
- <span class="avatar-w"><img ng-src="{{vm.viewer.registerVo.profile}}"></span>
- <span>{{vm.viewer.registerVo.byName}}</span>
- </span>
- </div>
<a class="show-ticket-info cursor">
<i class="os-icon os-icon-email-forward mr-20" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)" data-toggle="tooltip" data-placement="right" title="�떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 蹂대궡湲�"></i>
@@ -212,7 +207,6 @@
<div class="col-sm-2">
<div class="form-group">
<h6 class="info_font" translate="companyField.info">�뾽泥댁젙蹂�</h6>
- <button style="display: inline">1111</button>
</div>
</div>
</div>
diff --git a/src/main/webapp/views/issue/issueModifyDepartment.html b/src/main/webapp/views/issue/issueModifyDepartment.html
index 166f3e4..8c4506e 100644
--- a/src/main/webapp/views/issue/issueModifyDepartment.html
+++ b/src/main/webapp/views/issue/issueModifyDepartment.html
@@ -25,7 +25,7 @@
<div class="select3-selection__choicediv mt-10">
<span class="select3-selection__choice" ng-repeat="department in vm.form.departments">
<span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
- <span class="select3-selection__choice__remove" ng-click="fn.removeDepartments($index)">횞</span>
+ <span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
</span>
</div>
</div>
diff --git a/src/main/webapp/views/project/projectAdd.html b/src/main/webapp/views/project/projectAdd.html
index 9b39cbd..4b51bed 100644
--- a/src/main/webapp/views/project/projectAdd.html
+++ b/src/main/webapp/views/project/projectAdd.html
@@ -133,19 +133,19 @@
<div class="form-group">
<label><span translate="project.projectDepartment">�봽濡쒖젥�듃 �떞�떦遺��꽌</span> </label>
- <js-autocomplete-multi data-input-name="users"
- selected-model="vm.form.users"
- search="vm.userName"
- source="fn.getUserList(vm.userName, vm.form.users.concat(vm.form.managers))"
+ <js-autocomplete-multi data-input-name="departments"
+ selected-model="vm.form.departments"
+ search="vm.departmentName"
+ source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
- extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : true, imagePathProp : 'profile', type : 'user', maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+
<div class="select3-selection__choicediv mt-10">
<span class="select3-selection__choice" ng-repeat="user in vm.form.users">
- <span class="avatar-w"><img ng-src="{{user.profile}}"></span>
- <span>{{user.name}}({{user.account}})</span>
- <span class="select3-selection__choice__remove" ng-click="fn.removeUsr($index)">횞</span>
+ <span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
+ <span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
</span>
</div>
</div>
diff --git a/src/main/webapp/views/project/projectModify.html b/src/main/webapp/views/project/projectModify.html
index 7ae0c04..e7842a5 100644
--- a/src/main/webapp/views/project/projectModify.html
+++ b/src/main/webapp/views/project/projectModify.html
@@ -108,18 +108,17 @@
<div class="form-group">
<label><span translate="project.projectDepartment">�봽濡쒖젥�듃 遺��꽌</span> </label>
<js-autocomplete-multi data-input-name="departments"
- selected-model="vm.form.users"
- search="vm.userName"
- source="fn.getUserList(vm.userName, vm.form.users.concat(vm.form.managers))"
+ selected-model="vm.form.departments"
+ search="vm.departmentName"
+ source="fn.getUserDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
- extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : true, imagePathProp : 'profile', type : 'user', maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
<div class="select3-selection__choicediv mt-10">
- <span class="select3-selection__choice" ng-repeat="user in vm.form.users">
- <span class="avatar-w"><img ng-src="{{user.profile}}"></span>
- <span>{{user.name}}({{user.account}})</span>
- <span class="select3-selection__choice__remove" ng-click="fn.removeUsr($index)">횞</span>
+ <span class="select3-selection__choice" ng-repeat="user in vm.form.departments">
+ <span>{{department.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
+ <span class="select3-selection__choice__remove" ng-click="fn.removeDepartment($index)">횞</span>
</span>
</div>
</div>
--
Gitblit v1.8.0