From b69416fc721e8f0eb478536bf0d98ae3f6c4811e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 24 11월 2021 17:57:08 +0900
Subject: [PATCH] 이슈 상세 연관,하위 테이블 표시 설정 - [프론트]
---
src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | 20 +++--
src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js | 19 +++-
src/main/webapp/i18n/ko/global.json | 1
src/main/webapp/custom_components/sweetalert/sweetalert.css | 4
src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | 22 ++++-
src/main/webapp/views/issue/issueDetail.html | 70 ++++++++--------
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 39 ++++++---
src/main/webapp/assets/styles/main.css | 1
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 50 +++++++++---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 2
src/main/webapp/scripts/app/issue/issueModify.controller.js | 5 +
11 files changed, 153 insertions(+), 80 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 05ee9d2..720c85c 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -28433,6 +28433,7 @@
padding: 15px;
text-align: center;
border: 1px solid #ddd;
+
}
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 90d340b..65f4db8 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -160,7 +160,7 @@
// �씠�뒋 紐⑸줉�뿉�꽌 湲곌컙 �몴�떆
case "ISSUE_DUE_DATE" :
if (!$rootScope.isDefined(scope.data.startDate) && !$rootScope.isDefined(scope.data.completeDate)) {
- makeTag += "<span></span>";
+ makeTag += "<span translate='common.noDate'>湲곌컙 �뾾�쓬</span>";
}
else {
makeTag += "<span>" + scope.data.startDate + " ~ " + scope.data.completeDate + "</span>";
@@ -194,22 +194,30 @@
makeTag += '</div>';
break;
- case "ISSUE_DETAIL_MOVE" :
- makeTag += "<a ui-sref='issues.detail({ id : " + scope.data.id + " })'><span>" + scope.data.title + "</span></a>";
- break;
+ /* case "ISSUE_DETAIL_MOVE" :
+ makeTag += "<a class='text-center' ui-sref='issues.detail({ id : " + scope.data.id + " })'><span>" + scope.data.title + "</span></a>";
+ break;*/
-
- // �뿰愿� �씠�뒋 �씠�룞
+ // �뿰愿� �씠�뒋 �씠�룞(�젣紐�)
case "ISSUE_RELATION_MOVE" :
- makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + scope.data.title + "</span></a>";
+ makeTag += "<span class=\"titlename cursor text-center\" ng-click=\"event.changeDetailView(data.issueRelation)\">" + scope.data.title + "</span></a>";
break;
- // �뿰愿� �씠�뒋 �씠�룞
+ // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
+ case "REL_COMMON_PRIORITY" :
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.priorityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.priorityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.priorityVo.name + "'></span>";
+ break;
+ // �뿰愿� �씠�뒋 以묒슂�룄
+ case "REL_COMMON_SEVERITY" :
+ makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityVo.color + "\"," + "\"border-color\"" + " : \"" + scope.data.severityVo.color + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityVo.name + "'></span>";
+ break;
+
+ // �븯�쐞 �씠�뒋 �씠�룞(�젣紐�)
case "ISSUE_DOWN_MOVE" :
makeTag += "<span class=\"titlename cursor\" ng-click=\"event.changeDetailView(data.id)\">" + scope.data.title + "</span></a>";
break;
- // �뿰愿��씠�뒋 援щ텇
+ // �뿰愿��씠�뒋 援щ텇
case "ISSUE_RELATION_TYPE":
makeTag += "<span>" + scope.data.relationIssueTypeName + "</span>";
break;
@@ -263,17 +271,33 @@
makeTag += "<span class='badge' ng-style='{ \"background-color\" : \"" + scope.data.severityColor + "\"," + "\"border-color\"" + " : \"" + scope.data.severityColor + "\", \"color\": \"#FFFFFF\" }' translate='" + scope.data.severityName + "'></span>";
break;
- case "ISSUE_DEPARTMENT" :
- makeTag += "<span>" + scope.data.departmentVos.departmentName + "</span>";
+ case "REL_REGISTER":
+ scope.data.registerVos = [scope.data.issueRelation.registerVo];
+ makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
break;
+
+ case "ISSUE_DEPARTMENT" :
+ makeTag += "<ul class='ul-not-comma'>";
+ makeTag += "<div style='color: #000000'>";
+ angular.forEach(scope.data.departmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ makeTag += "</ul>";
+ break;
+
+ // angular.forEach(scope.data.departmentVos, function (departments) {
+ // makeTag += "<span>" + departments.departmentName + "</span>"
+ // });
+ // break;
case "ISSUE_USER" :
makeTag += '<div owl-profile-over class="" table-user-image="data" target="userVos"></div>';
break;
case "REGISTER" :
- scope.data.registsrVos = [scope.data.registerVo];
- makeTag += '<div owl-profile-over class="" table-user-image="data" target="registsrVos"></div>';
+ scope.data.registerVos = [scope.data.registerVo];
+ makeTag += '<div owl-profile-over class="" table-user-image="data" target="registerVos"></div>';
break;
case "WORKFLOW_NAME":
diff --git a/src/main/webapp/custom_components/sweetalert/sweetalert.css b/src/main/webapp/custom_components/sweetalert/sweetalert.css
index 4469aea..f03717a 100644
--- a/src/main/webapp/custom_components/sweetalert/sweetalert.css
+++ b/src/main/webapp/custom_components/sweetalert/sweetalert.css
@@ -1,7 +1,7 @@
body.stop-scrolling {
height: 100%;
- overflow: hidden; }
-
+ }
+/*overflow: hidden;*/
.sweet-overlay {
background-color: black;
/* IE8 */
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 9746ab3..3565b0c 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -704,6 +704,7 @@
"changeDate": "蹂�寃쎌씪",
"lastChangeDate": "理쒓렐 蹂�寃쎌씪",
"registrationDate": "�벑濡앹씪",
+ "noDate": "湲곌컙 �뾾�쓬",
"fullView": "�쟾泥대낫湲�",
"comments": "�뙎湲�",
"record": "湲곕줉",
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index c08a3e0..155c6f8 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -350,7 +350,7 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
$scope.vm.companyId = result[0].id;
- $scope.vm.companyName = result[0].id;
+ $scope.vm.companyName = result[0].name;
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index e391679..6e0ef2e 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -28,25 +28,25 @@
key : "PRIORITY",
width : "width-80-p",
position : 1,
- display : true
+ display : false
}, {
name : $filter("translate")("common.importance"), // 以묒슂�룄
key : "SEVERITY",
width : "width-80-p",
position : 2,
- display : true
+ display : false
}, {
name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
key : "ISSUE_TYPE",
width : "width-140-p",
position : 3,
- display : true
+ display : false
}, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
key : "ASSIGNEE_TEAM",
width : "width-100-p",
position : 4,
- display : true
+ display : false
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
@@ -136,9 +136,23 @@
var deferred = $q.defer();
var content = {
issueId : $rootScope.currentDetailIssueId,
+ delValue : $scope.vm.issueDownTableConfigs.splice(7,1),
issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
};
+ // angular.forEach($scope.vm.issueDownTableConfigs, function (delVaue) {
+ // if ($scope.vm.issueDownTableConfigs.indexOf(delVaue.name) === "") {
+ // $scope.vm.issueDownTableConfigs.splice(delVaue,1);
+ // }
+ //
+ // })
+
+ // for (var i = 0; i < $scope.vm.issueDownTableConfigs; i++) {
+ // if ($scope.vm.issueDownTableConfigs == "") {
+ // $scope.vm.issueDownTableConfigs.splice(i,1);
+ // i--;
+ // }
+ // }
IssueTableConfig.downDetail($resourceProvider.getContent(content,
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status !== "success") {
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
index bbe519e..a02727a 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -29,43 +29,43 @@
key : "PRIORITY",
width : "width-100-p",
position : 1,
- display : true
+ display : false
}, {
name : $filter("translate")("common.importance"), // 以묒슂�룄
key : "SEVERITY",
width : "width-100-p",
position : 2,
- display : true
+ display : false
}, {
name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
key : "ISSUE_TYPE",
width : "width-100-p",
position : 3,
- display : true
+ display : false
}, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
key : "ASSIGNEE_TEAM",
width : "width-50-p",
position : 4,
- display : true
+ display : false
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
width : "width-50-p",
position : 5,
- display : true
+ display : false
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-100-p",
position : 6,
- display : true
+ display : false
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
key : "MODIFY_DATE",
width : "width-100-p",
position : 7,
- display : true
+ display : false
}, {
}]
};
@@ -131,12 +131,15 @@
return deferred.promise;
}
+
+
// �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
function getRelIssueTableConfigs() {
var deferred = $q.defer();
var content = {
issueId : $rootScope.currentDetailIssueId,
+ delValue : $scope.vm.issueRelTableConfigs.splice(7,1),
issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
};
@@ -154,7 +157,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 9;
+ var count = 8;
angular.forEach(result, function (customField) {
$scope.vm.issueRelTableConfigs.push({
name : customField.name,
@@ -172,6 +175,7 @@
if ($rootScope.isDefined(issueTableConfigs)) {
$rootScope.spinner = true;
+ // var saveTableConfigs = JSON.parse(issueTableConfigs);
var saveTableConfigs = JSON.parse(issueTableConfigs);
angular.forEach(saveTableConfigs, function (saveTableConfig) {
diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index b5c23db..027619d 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -51,19 +51,19 @@
key : "REGISTER",
width : "width-100-p",
position : 5,
- display : true
+ display : false
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-140-p",
position : 6,
- display : true
+ display : false
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
key : "MODIFY_DATE",
width : "width-100-p",
position : 7,
- display : true
+ display : false
}, {
}]
};
@@ -129,16 +129,27 @@
return deferred.promise;
}
+ var content = {
+ delValue : $scope.vm.issueTableConfigs.splice(7,1),
+ issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs)
+ };
// �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
function getIssueAddTableConfigs() {
var deferred = $q.defer();
- IssueTableConfig.detail($resourceProvider.getContent({},
+ IssueTableConfig.detail($resourceProvider.getContent(content,
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status !== "success") {
SweetAlert.error($filter("translate")("issue.failedToIssueTableColumnLookup"), result.data.message.message); // �씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣
}
+ // for (var i = 0; i < result.data.name; i++) {
+ // if (result.data.name === '') {
+ // result.splice(i,1);
+ // i--;
+ // }
+ // }
+
deferred.resolve(result.data.data);
});
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 073e2ca..065b0f6 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -8,8 +8,9 @@
'angular'
],
function (app, angular) {
- app.controller('issueDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$state', '$uibModal', '$q','SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'IssueStatus', 'IssueTableConfig', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, IssueStatus, IssueTableConfig, $filter) {
+ app.controller('issueDetailController', ['$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, $state, $uibModal, $q, $controller, $injector, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, Priority, Severity, IssueStatus, IssueTableConfig, $filter) {
// IssueListController vm, fn 蹂��닔 �긽�냽.
@@ -111,6 +112,8 @@
// $rootScope.$broadcast("makeIssueSearch", issue);
$scope.$parent.tableEvent.changeDetailView(issue.id);
}
+
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
// �븯�쐞 �씠�뒋 �궘�젣
function removeDownIssue(id) {
@@ -222,23 +225,23 @@
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
break;
- case "PRIORITY" : // �슦�꽑�닚�쐞
+ case "PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.priority")
.setDName("priorityName")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("COMMON_PRIORITY"));
+ .setDRenderer("REL_COMMON_PRIORITY"));
break;
- case "SEVERITY" : // 以묒슂�룄
+ case "SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.importance")
.setDName("severityName")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("COMMON_SEVERITY"));
+ .setDRenderer("REL_COMMON_SEVERITY"));
break;
case "ISSUE_TYPE" : // �씠�뒋 ���엯
$scope.vm.relTableConfigs.push($tableProvider.config()
@@ -255,13 +258,14 @@
.setDAlign("text-center")
.setDRenderer("ISSUE_DEPARTMENT"));
break;
+
case "REGISTER" : // �벑濡앹옄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.register")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
- .setDRenderer("REGISTER"));
+ .setDRenderer("REL_REGISTER"));
break;
case "PERIOD" : // 湲곌컙
$scope.vm.relTableConfigs.push($tableProvider.config()
@@ -408,18 +412,21 @@
$scope.vm.relTableConfigs.push($tableProvider.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()
.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()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
+ .setDAlign("text-center")
.setHWidth("width-20-p bold")
.setDRenderer("ISSUE_RELATION_DELETE")
.setHSort(false)
@@ -440,12 +447,14 @@
$scope.vm.downTableConfigs.push($tableProvider.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()
.setHName("issue.relationIssueDelete")
.setDType("renderer")
+ .setDAlign("text-center")
.setHWidth("width-20-p bold")
.setDRenderer("ISSUE_DOWN_DELETE")
.setHSort(false)
@@ -487,12 +496,14 @@
$scope.vm.relTableConfigs.push($tableProvider.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()
.setHName("issue.relationIssueTitle")
.setDType("renderer")
+ .setDAlign("text-center")
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
@@ -547,6 +558,7 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
.setDType("renderer")
+ .setDAlign("text-center")
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_DOWN_MOVE"))
@@ -771,7 +783,7 @@
$scope.fn.getRelTableConfigs();
$scope.fn.getDownTableConfigs();
- Issue.detail($resourceProvider.getContent(
+ Issue.detail($resourceProvider.getContent(
{id : $scope.vm.viewer.id, deep : "02"},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
@@ -810,11 +822,12 @@
$scope.vm.form.issuesDown.push(issueDownVo.issue);
});
- // wyu
- angular.forEach(result.data.data.issueRelationVos, function (issueRelationColum){
- issueRelationColum.issueRelation = $scope.vm.issueRelation;
- $scope.vm.form.issues.push(issueRelationColum.issueRelation);
- });
+
+ // // wyu
+ // angular.forEach(result.data.data.issueRelationVos, function (issueRelationColum){
+ // issueRelationColum.issueRelation = $scope.vm.issueRelation;
+ // $scope.vm.form.issues.push(issueRelationColum.issueRelation);
+ // });
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index e454587..8700bf4 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -386,6 +386,11 @@
id : parameter.id,
title : $rootScope.preventXss($scope.vm.form.title), // �젣紐�
description : $rootScope.preventXss($scope.vm.form.description), // �궡�슜
+ companyName : $scope.vm.companyName,
+ companyManager : $scope.vm.companyManager,
+ companyTel : $scope.vm.companyTel,
+ companyEmail :$scope.vm.companyEmail,
+ companyMemo : $scope.vm.companyMemo,
ispName : $scope.vm.ispName,
ispCode : $scope.vm.ispCode,
ispManager : $scope.vm.ispManager,
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index a4d4937..5b82040 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -189,18 +189,45 @@
<div class="col-md-4">
<div class="form-group">
<h6 class="info_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
- <div class="">
- <label class="issue-detail-label"><span translate="common.diffuserURL">�쑀�룷�옄URL</span> </label>
- <label class="issue-detail-label offset-2"><span translate="common.country">援�媛�</span></label>
- <div class="">
- <span>200.11.13.123</span>
- <span class="country">US</span>
- </div>
-<!-- <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span>-->
+ </div>
+ </div>
+ </div>
+ <!-- �궗�슜�옄 �젙�쓽 �븘�뱶 -->
+ <div class="row">
+ <div class="col-md-2" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">
+ <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label>
+
+ <div ng-switch on="issueCustomField.customFieldVo.customFieldType">
+ <!-- 湲곕낯 �엯�젰 -->
+ <div ng-switch-when="INPUT">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <!-- �떒�씪 ���젆�듃 -->
+ <div ng-switch-when="SINGLE_SELECT">
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <!-- 硫��떚 ���젆�듃 -->
+ <div ng-switch-when="MULTI_SELECT">
+ <span class="issue-detail-word-break"
+ ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
</div>
</div>
</div>
+
+ <!-- <div class="">
+ <label class="issue-detail-label"><span>{{vm.viewer.issueCustomFieldValueVos[0].useValue}}</span> </label>
+ <div class="">
+ <span>{{vm.viewer.issueCustomFieldValueVos[0].customFieldVo.name}}</span>
+ </div>
+ <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span>
+ </div>-->
<hr>
<!-- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>-->
<div class="row">
@@ -376,34 +403,7 @@
</div>
</div>
- <!-- �궗�슜�옄 �젙�쓽 �븘�뱶 -->
-<!-- <div class="row">-->
-<!-- <div class="col-md-4" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">-->
-<!-- <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label>-->
-<!-- <div ng-switch on="issueCustomField.customFieldVo.customFieldType">-->
-<!-- <!– 湲곕낯 �엯�젰 –>-->
-<!-- <div ng-switch-when="INPUT" class="form-group">-->
-<!-- <!– �씫湲� 紐⑤뱶 –>-->
-<!-- <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>-->
-<!-- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
-<!-- </div>-->
-
-<!-- <!– �떒�씪 ���젆�듃 –>-->
-<!-- <div ng-switch-when="SINGLE_SELECT" class="form-group">-->
-<!-- <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>-->
-<!-- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
-<!-- </div>-->
-
-<!-- <!– 硫��떚 ���젆�듃 –>-->
-<!-- <div ng-switch-when="MULTI_SELECT" class="form-group">-->
-<!-- <span class="issue-detail-word-break"-->
-<!-- ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>-->
-<!-- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
<div class="row mt-30">
<div class="col-md-10">
--
Gitblit v1.8.0