From a9104b7bc9016b32f43f4fcbe4e3d7b29edef3b3 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 18 11월 2021 13:34:37 +0900
Subject: [PATCH] 이슈 수정 진행[프론트]
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 12
src/main/webapp/views/issue/issueCompanyFieldDetail.html | 6
src/main/webapp/views/issue/issueAdd.html | 14
src/main/webapp/i18n/ko/global.json | 4
src/main/webapp/views/issue/issueModify.html | 14
src/main/webapp/views/issue/issueDetail.html | 160 ++++++++++---------
src/main/webapp/assets/styles/main.css | 4
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 64 +++----
src/main/webapp/scripts/app/issue/issueModify.controller.js | 149 +++++------------
9 files changed, 191 insertions(+), 236 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 198571c..4a4c05a 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -30203,4 +30203,8 @@
color: #282c34;
font-size: 15px;
}
+
+.country {
+ margin-left: 3.25rem;
+}
/* 媛꾪듃李⑦듃 end */
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index c77f156..97f6957 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -782,7 +782,9 @@
"departmentUser": "遺��꽌 ���썝",
"detectingInfo": "�깘吏��젙蹂�",
"detectingData": "�깘吏��씪�떆",
- "import": "媛��졇�삤湲�"
+ "import": "媛��졇�삤湲�",
+ "diffuserURL": "�쑀�룷�옄URL",
+ "country": "援�媛�"
},
"tasks": {
"agileBoardTitle": "移몃컲 蹂대뱶"
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index a004f45..12cfe73 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -19,10 +19,10 @@
formCheck : formCheck, // �뤌 泥댄겕
getUserListCallBack : getUserListCallBack, // �떞�떦�옄 autocomplete �럹�씠吏�
getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏�
- getCompanyFieldListCallBack : getCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏�
+ getIssueCompanyFieldListCallBack : getIssueCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏�
getIssueDepartmentListCallBack : getIssueDepartmentListCallBack, // �떞�떦�옄 -> �떞�떦遺��꽌 autocomplete �럹�씠吏�
- getIspFieldListCallBack : getIspFieldListCallBack, // ISP�젙蹂� autocomplete �럹�씠吏�
- getHostingFieldListCallBack : getHostingFieldListCallBack, // �샇�뒪�똿�젙蹂� autocomplete �럹�씠吏�
+ getIssueIspFieldListCallBack : getIssueIspFieldListCallBack, // ISP�젙蹂� autocomplete �럹�씠吏�
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack, // �샇�뒪�똿�젙蹂� autocomplete �럹�씠吏�
getOptionColor : getOptionColor, // �슦�꽑�닚�쐞, 以묒슂�룄 �깋�긽�쑝濡� Select �깭洹� �쟻�슜
onFileSelect : onFileSelect, // �뙆�씪 泥⑤�
infiniteAddForm : infiniteAddForm, // 怨꾩냽 �깮�꽦
@@ -42,9 +42,9 @@
title : "", // �젣紐�
description : "", // �궡�슜
projects : [], // �봽濡쒖젥�듃
- companyFields : [], // �뾽泥댁젙蹂�
- ispFields : [], // ISP �젙蹂�
- hostingFields : [], // �샇�뒪�똿�젙蹂�
+ issueCompanyFields : [], // �뾽泥댁젙蹂�
+ issueIspFields : [], // ISP �젙蹂�
+ issueHostingFields : [], // �샇�뒪�똿�젙蹂�
issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
@@ -61,7 +61,6 @@
userName : "", // �궗�슜�옄 寃��깋
departmentName : "", // 遺��꽌紐� 寃��깋
companyName : "", // �뾽泥대챸 寃��깋
- companyCode : "", // �뾽泥� 肄붾뱶
companyManager : "", // �뾽泥� �떞�떦�옄
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
@@ -311,7 +310,7 @@
}
// �뾽泥댁젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getCompanyFieldListCallBack(result) {
+ function getIssueCompanyFieldListCallBack(result) {
$scope.vm.autoCompletePage.companyField.totalPage = result.data.page.totalPage;
}
@@ -321,12 +320,12 @@
}
// ISP�젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getIspFieldListCallBack(result) {
+ function getIssueIspFieldListCallBack(result) {
$scope.vm.autoCompletePage.ispField.totalPage = result.data.page.totalPage;
}
// �샇�뒪�똿�젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getHostingFieldListCallBack(result) {
+ function getIssueHostingFieldListCallBack(result) {
$scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
}
@@ -387,26 +386,26 @@
issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
- companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
+ companyId : (function () { // �뾽泥� �븘�씠�뵒
var companyId = "";
- if ($scope.vm.form.companyFields.length > 0) {
- companyId = $scope.vm.form.companyFields[0].id;
+ if ($scope.vm.form.issueCompanyFields.length > 0) {
+ companyId = $scope.vm.form.issueCompanyFields[0].id;
}
return companyId;
})(),
- ispId : (function () {
+ ispId : (function () { // ISP �븘�씠�뵒
var ispId = "";
- if ($scope.vm.form.ispFields.length > 0) {
- ispId = $scope.vm.form.ispFields[0].id;
+ if ($scope.vm.form.issueIspFields.length > 0) {
+ ispId = $scope.vm.form.issueIspFields[0].id;
}
return ispId;
})(),
- hostingId : (function () {
+ hostingId : (function () { // Hosting �븘�씠�뵒
var hostingId = "";
- if ($scope.vm.form.hostingFields.length > 0) {
- hostingId = $scope.vm.form.hostingFields[0].id;
+ if ($scope.vm.form.issueHostingFields.length > 0) {
+ hostingId = $scope.vm.form.issueHostingFields[0].id;
}
return hostingId;
})(),
@@ -447,36 +446,33 @@
detectingDateRange : $scope.vm.form.detectingDateRange,
issueCompanyFields : (function () {
- var companyFields = [];
+ var issueCompanyFields = [];
- var companyField = $scope.vm.form.companyFields[0];
+ var companyField = $scope.vm.form.issueCompanyFields[0];
companyField.companyId = companyField.id;
companyField.id = null;
- companyFields.push(companyField);
+ issueCompanyFields.push(companyField);
- return companyFields;
+ return issueCompanyFields;
})(),
issueIspFields : (function () {
- var ispFields = [];
+ var issueIspFields = [];
- var ispField = $scope.vm.form.ispFields[0];
+ var ispField = $scope.vm.form.issueIspFields[0];
ispField.ispId = ispField.id;
ispField.id = null;
- ispFields.push(ispField);
-
- return ispFields;
+ issueIspFields.push(ispField);
+ return issueIspFields;
})(),
-
issueHostingFields : (function () {
- var hostingFields = [];
+ var issueHostingFields = [];
- var hostingField = $scope.vm.form.hostingFields[0];
+ var hostingField = $scope.vm.form.issueHostingFields[0];
hostingField.hostingId = hostingField.id;
hostingField.id = null;
- hostingFields.push(hostingField);
-
- return hostingFields;
+ issueHostingFields.push(hostingField);
+ return issueHostingFields;
})(),
issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
diff --git a/src/main/webapp/scripts/app/issue/issueModify.controller.js b/src/main/webapp/scripts/app/issue/issueModify.controller.js
index 6023a47..5bc24a4 100644
--- a/src/main/webapp/scripts/app/issue/issueModify.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueModify.controller.js
@@ -19,10 +19,10 @@
formCheck : formCheck, // �뤌 泥댄겕
getUserListCallBack : getUserListCallBack, // �떞�떦�옄 autocomplete �럹�씠吏�
getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏�
- getCompanyFieldListCallBack : getCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏�
+ getIssueCompanyFieldListCallBack : getIssueCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏�
getIssueDepartmentListCallBack : getIssueDepartmentListCallBack, // �떞�떦�옄 -> �떞�떦遺��꽌 autocomplete �럹�씠吏�
- getIspFieldListCallBack : getIspFieldListCallBack, // ISP�젙蹂� autocomplete �럹�씠吏�
- getHostingFieldListCallBack : getHostingFieldListCallBack, // �샇�뒪�똿�젙蹂� autocomplete �럹�씠吏�
+ getIssueIspFieldListCallBack : getIssueIspFieldListCallBack, // ISP�젙蹂� autocomplete �럹�씠吏�
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack, // �샇�뒪�똿�젙蹂� autocomplete �럹�씠吏�
getOptionColor : getOptionColor, // �슦�꽑�닚�쐞, 以묒슂�룄 �깋�긽�쑝濡� Select �깭洹� �쟻�슜
onFileSelect : onFileSelect, // �뙆�씪 泥⑤�
imageUpload : imageUpload, // �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
@@ -49,9 +49,9 @@
title : "", // �젣紐�
description : "", // �궡�슜
projects : [], // �봽濡쒖젥�듃
- companyFields : [], // �뾽泥댁젙蹂�
- ispFields : [], // ISP �젙蹂�
- hostingFields : [], // �샇�뒪�똿�젙蹂�
+ issueCompanyFields : [], // �뾽泥댁젙蹂�
+ issueIspFields : [], // ISP �젙蹂�
+ issueHostingFields : [], // �샇�뒪�똿�젙蹂�
issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
@@ -93,7 +93,7 @@
page : 0,
totalPage : 0
},
- companyField : {
+ issueCompanyField : {
page : 0,
totalPage : 0
},
@@ -311,8 +311,8 @@
}
// �뾽泥댁젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getCompanyFieldListCallBack(result) {
- $scope.vm.autoCompletePage.companyField.totalPage = result.data.page.totalPage;
+ function getIssueCompanyFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.issueCompanyField.totalPage = result.data.page.totalPage;
}
// 遺��꽌�젙蹂� autocomplete page �뾽�뜲�씠�듃
@@ -321,12 +321,12 @@
}
// ISP�젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getIspFieldListCallBack(result) {
+ function getIssueIspFieldListCallBack(result) {
$scope.vm.autoCompletePage.ispField.totalPage = result.data.page.totalPage;
}
// �샇�뒪�똿�젙蹂� autocomplete page �뾽�뜲�씠�듃
- function getHostingFieldListCallBack(result) {
+ function getIssueHostingFieldListCallBack(result) {
$scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
}
@@ -345,6 +345,7 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
+ $scope.vm.issuecompanyId = result[0].id;
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
@@ -387,20 +388,20 @@
return projectId;
})(),
companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
- var companyId = "";
+ var issueCompanyId = "";
- if ($scope.vm.form.companyFields.length > 0) {
- companyId = $scope.vm.form.companyFields[0].id;
+ if ($scope.vm.form.issueCompanyFields.length > 0) {
+ issueCompanyId = $scope.vm.form.issueCompanyFields[0].id;
}
- return companyId;
+ return issueCompanyId;
})(),
ispId : (function () {
var ispId = "";
- if ($scope.vm.form.ispFields.length > 0) {
- ispId = $scope.vm.form.ispFields[0].id;
+ if ($scope.vm.form.issueIspFields.length > 0) {
+ ispId = $scope.vm.form.issueIspFields[0].id;
}
return ispId;
@@ -408,8 +409,8 @@
hostingId : (function () {
var hostingId = "";
- if ($scope.vm.form.hostingFields.length > 0) {
- hostingId = $scope.vm.form.hostingFields[0].id;
+ if ($scope.vm.form.issueHostingFields.length > 0) {
+ hostingId = $scope.vm.form.issueHostingFields[0].id;
}
return hostingId;
@@ -451,76 +452,37 @@
})(),
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
- companyFields : (function () {
- var companyFields = [];
+ issueCompanyFields : (function () {
+ var issueCompanyFields = [];
- angular.forEach($scope.vm.form.companyFields, function (companyField) {
- var useValues = [];
+ var issueCompanyField = $scope.vm.form.issueCompanyFields[0];
+ issueCompanyFields.companyId = issueCompanyField.id;
+ issueCompanyField.id = null;
+ issueCompanyFields.push(issueCompanyField);
- if (angular.isArray(companyField.useValues)) {
- angular.forEach(companyField.useValues, function (useValue) {
- useValues.push(useValue.value);
- });
- }
- else {
- useValues.push(companyField.useValues);
- }
-
- // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
- var temp = angular.copy(companyField);
- temp.useValues = useValues;
- companyFields.push(temp);
- });
-
- return companyFields;
+ return issueCompanyFields;
})(),
- ispFields : (function () {
- var ispFields = [];
+ issueIspFields : (function () {
+ var issueIspFields = [];
- angular.forEach($scope.vm.form.ispFields, function (ispField) {
- var useValues = [];
+ var ispField = $scope.vm.form.issueIspFields[0];
+ issueIspFields.ispId = ispField.id;
+ ispField.id = null;
+ issueIspFields.push(ispField);
- if (angular.isArray(ispField.useValues)) {
- angular.forEach(ispField.useValues, function (useValue) {
- useValues.push(useValue.value);
- });
- }
- else {
- useValues.push(ispField.useValues);
- }
-
- // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
- var temp = angular.copy(ispField);
- temp.useValues = useValues;
- ispFields.push(temp);
- });
-
- return ispFields;
+ return issueIspFields;
})(),
- hostingFields : (function () {
- var hostingFields = [];
+ issueHostingFields : (function () {
+ var issueHostingFields = [];
- angular.forEach($scope.vm.form.hostingFields, function (hostingField) {
- var useValues = [];
+ var hostingField = $scope.vm.form.issueHostingFields[0];
+ issueHostingFields.hostingId = hostingField.id;
+ hostingField.id = null;
+ issueHostingFields.push(hostingField);
- if (angular.isArray(hostingField.useValues)) {
- angular.forEach(hostingField.useValues, function (useValue) {
- useValues.push(useValue.value);
- });
- }
- else {
- useValues.push(hostingField.useValues);
- }
-
- // useValues 瑜� 諛곗뿴濡� 蹂��솚�븳�떎.
- var temp = angular.copy(hostingField);
- temp.useValues = useValues;
- hostingFields.push(temp);
- });
-
- return hostingFields;
+ return issueHostingFields;
})(),
issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
@@ -753,30 +715,13 @@
$scope.vm.form.users = result.data.data.userVos;
$scope.vm.form.departments = result.data.data.departmentVos;
$scope.vm.form.files = result.data.data.attachedFileVos;
+ // issueVo �뿉 get & set �꽕�젙媛� �꽕�젙 ex)issueCompanyVos
+ $scope.vm.form.issueCompanyFields = result.data.data.issueCompanyVos;
//
- $scope.vm.form.companyFields.push(result.data.data.companyFieldVo);
- $scope.vm.companyName = result.data.data.companyFieldVo.name;
- $scope.vm.companyManager = result.data.data.companyFieldVo.manager;
- $scope.vm.companyTel = result.data.data.companyFieldVo.tel;
- $scope.vm.companyEmail = result.data.data.companyFieldVo.email;
- $scope.vm.companyMemo = result.data.data.companyFieldVo.memo;
-
- $scope.vm.form.ispFields.push(result.data.data.ispFieldVo);
- $scope.vm.ispName = result.data.data.ispFieldVo.name;
- $scope.vm.ispCode = result.data.data.ispFieldVo.code;
- $scope.vm.ispManager = result.data.data.ispFieldVo.manager;
- $scope.vm.ispTel = result.data.data.ispFieldVo.tel;
- $scope.vm.ispEmail = result.data.data.ispFieldVo.email;
- $scope.vm.ispMemo = result.data.data.ispFieldVo.memo;
-
- $scope.vm.form.hostingFields.push(result.data.data.hostingFieldVo);
- $scope.vm.hostingName = result.data.data.hostingFieldVo.name;
- $scope.vm.hostingCode = result.data.data.hostingFieldVo.code;
- $scope.vm.hostingManager = result.data.data.hostingFieldVo.manager;
- $scope.vm.hostingTel = result.data.data.hostingFieldVo.tel;
- $scope.vm.hostingEmail = result.data.data.hostingFieldVo.email;
- $scope.vm.hostingMemo = result.data.data.hostingFieldVo.memo;
-
+ $scope.vm.form.issueIspFields = result.data.data.issueIspVos;
+ //
+ $scope.vm.form.issueHostingFields = result.data.data.issueHostingVos;
+ //
if ($rootScope.isDefined(result.data.data.startDate)) {
$scope.vm.form.startCompleteDateRange = result.data.data.startDate + " ~ " + result.data.data.completeDate;
}
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 5a4c131..3a9e11d 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -31,10 +31,10 @@
$scope.fn.getIssueList = getIssueList; // �씪媛� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getWorkflowList = getWorkflowList; // �썙�겕�뵆濡쒖슦 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getUserDepartmentList = getUserDepartmentList; // 遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.getCompanyFieldList = getCompanyFieldList; // �뾽泥� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getIssueCompanyFieldList = getIssueCompanyFieldList; // �뾽泥� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getIssueDepartmentList = getIssueDepartmentList; // �떞�떦�옄 -> �떞�떦遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.getIspFieldList = getIspFieldList; // ISP 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
- $scope.fn.getHostingFieldList = getHostingFieldList; // �샇�뒪�똿 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getIssueIspFieldList = getIssueIspFieldList; // ISP 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getIssueHostingFieldList = getIssueHostingFieldList; // �샇�뒪�똿 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
function getUserList(query, excludeList, page, callBack) {
var conditions = {
@@ -218,7 +218,7 @@
return deferred.promise;
}
- function getCompanyFieldList(query, excludeList, page, callBack) {
+ function getIssueCompanyFieldList(query, excludeList, page, callBack) {
var conditions = {
companyName : query,
excludeIds : (function () {
@@ -289,7 +289,7 @@
return deferred.promise;
}
- function getIspFieldList(query, excludeList, page, callBack) {
+ function getIssueIspFieldList(query, excludeList, page, callBack) {
var conditions = {
ispName : query,
excludeIds : (function () {
@@ -324,7 +324,7 @@
return deferred.promise;
}
- function getHostingFieldList(query, excludeList, page, callBack) {
+ function getIssueHostingFieldList(query, excludeList, page, callBack) {
var conditions = {
hostingName : query,
excludeIds : (function () {
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 5b46cda..1fcfcd2 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -282,10 +282,10 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="companyField.name">�뾽泥댁씠由�</span> </label>
- <js-autocomplete-single data-input-name="companyField"
- selected-model="vm.form.companyFields"
+ <js-autocomplete-single data-input-name="issueCompanyField"
+ selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
- source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page, fn.getCompanyFieldListCallBack)"
+ source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page, fn.getIssueCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
total-page="vm.autoCompletePage.companyField.totalPage"
input-disabled="false"
@@ -375,9 +375,9 @@
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
<js-autocomplete-single data-input-name="ispField"
- selected-model="vm.form.ispFields"
+ selected-model="vm.form.issueIspFields"
search="vm.ispName"
- source="fn.getIspFieldList(vm.ispName, vm.form.ispFields, vm.autoCompletePage.ispField.page, fn.getIspFieldListCallBack)"
+ source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.ispField.page, fn.getIssueIspFieldListCallBack)"
page="vm.autoCompletePage.ispField.page"
total-page="vm.autoCompletePage.ispField.totalPage"
input-disabled="false"
@@ -481,9 +481,9 @@
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
<js-autocomplete-single data-input-name="hostingField"
- selected-model="vm.form.hostingFields"
+ selected-model="vm.form.issueHostingFields"
search="vm.hostingName"
- source="fn.getHostingFieldList(vm.hostingName, vm.form.hostingFields, vm.autoCompletePage.hostingField.page, fn.getHostingFieldListCallBack)"
+ source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
page="vm.autoCompletePage.hostingField.page"
total-page="vm.autoCompletePage.hostingField.totalPage"
input-disabled="false"
diff --git a/src/main/webapp/views/issue/issueCompanyFieldDetail.html b/src/main/webapp/views/issue/issueCompanyFieldDetail.html
index 14b0b96..fc2c747 100644
--- a/src/main/webapp/views/issue/issueCompanyFieldDetail.html
+++ b/src/main/webapp/views/issue/issueCompanyFieldDetail.html
@@ -13,10 +13,10 @@
<div class="form-group">
<label><span translate="companyField.name">�뾽泥� �씠由�</span>
<code class="highlighter-rouge">*</code></label>
- <js-autocomplete-single data-input-name="companyField"
- selected-model="vm.form.companyFields"
+ <js-autocomplete-single data-input-name="issueCompanyField"
+ selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
- source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page,fn.getCompanyFieldListCallBack)"
+ source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page,fn.getIssueCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
total-page="vm.autoCompletePage.companyField.totalPage"
input-disabled="false"
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index fc2bf5d..e1cd779 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -53,7 +53,7 @@
</div>
</div>
-->
- <!-- �뀒�씠釉� -->
+<!-- �뀒�씠釉� -->
<!--
<div class="support-ticket ">
<div class="st-body">
@@ -64,7 +64,7 @@
</div>
</div>
-->
- <!-- �럹�씠吏� -->
+<!-- �럹�씠吏� -->
<!--
<div class="controls-below-table text-center">
<ul uib-pagination
@@ -88,13 +88,34 @@
<div class="support-ticket-content">
<div class="support-ticket-content-header issue-detail-word-break">
<h3 class="ticket-header">
- <div class="tasks-header-w mb-10">
+ <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>
{{vm.viewer.title}}
</h3>
+ <div class="col-sm-2">
+ <div class="form-group">
+ <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>
@@ -113,41 +134,60 @@
<div class="row mt-20">
<div class="col-md-4">
<div class="form-group">
+ <div class="row">
+ <div class="col-xxl-12">
+ <div class="form-group">
+ <label class="issue-detail-label"><span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
+ <div class="">
+ <div class="select3-selection__choicediv">
+ <span class="select3-selection__choice" ng-repeat="user in vm.viewer.userVos">
+ <span class="avatar-w"><img ng-src="{{::user.profile}}"></span>
+ <span>{{::user.byName}}</span>
+ </span>
+
+ <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span>
+ <i class="fa fa-edit fa-2x issue-status-edit cursor"
+ ng-click="fn.modifyIssueUser()" data-toggle="tooltip" data-placement="right" title="�떞�떦�옄 蹂�寃� �븯湲�"></i>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-md-4">
+ <div class="form-group">
+ <div class="col-md-8">
+ <div class="form-group">
+ <label class="issue-detail-label"><span translate="common.period">湲곌컙</span></label>
+ <div class="">
+ <span translate="{{vm.viewer.startDate}}"></span> ~ <span
+ translate="{{vm.viewer.completeDate}}"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-4">
+ <div class="form-group">
<label class="issue-detail-label"><span translate="common.importance">以묒슂�룄</span></label>
+ <label class="issue-detail-label offset-1"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
+ <label class="issue-detail-label offset-1"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
<div class="">
- <span class="badge"
- ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }"
- translate="{{vm.viewer.severityVo.name}}"></span>
- </div>
- </div>
- </div>
+ <span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.severityVo.name}}"></span>
- <div class="col-md-4">
- <div class="form-group">
- <label class="issue-detail-label"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
- <div class="">
- <span class="badge"
- ng-style="{'background-color' : vm.viewer.priorityVo.color, 'border-color' : vm.viewer.priorityVo.color, 'color' : '#FFFFFF' }"
- translate="{{vm.viewer.priorityVo.name}}"></span>
- </div>
- </div>
- </div>
+ <span class="badge offset-1" ng-style="{'background-color' : vm.viewer.priorityVo.color, 'border-color' : vm.viewer.priorityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.priorityVo.name}}"></span>
- <div class="col-md-4">
- <div class="form-group">
- <label class="issue-detail-label"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
- <!-- 沅뚰븳�쓣 媛뽮퀬 �엳�쓣 �븣 -->
- <div ng-if="vm.viewer.modifyPermissionCheck">
- <span class="editForm badge mr-5"
- ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">{{vm.viewer.issueStatusVo.name}}</span>
- <i class="fa fa-edit fa-2x issue-status-edit cursor"
- ng-click="fn.modifyIssueStatus()" data-toggle="tooltip" data-placement="right" title="�씪媛� �긽�깭 蹂�寃� �븯湲�"></i>
- </div>
-
- <!-- 沅뚰븳�씠 �뾾�쓣 �븣 -->
- <div ng-if="!vm.viewer.modifyPermissionCheck">
- <span class="editForm badge mr-5"
- ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">{{vm.viewer.issueStatusVo.name}}</span>
+ <!-- 沅뚰븳�쓣 媛뽮퀬 �엳�쓣 �븣 -->
+ <span ng-if="vm.viewer.modifyPermissionCheck">
+ <span class="editForm badge mr-5 offset-1" ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">{{vm.viewer.issueStatusVo.name}}</span><i class="fa fa-edit fa-2x issue-status-edit cursor" ng-click="fn.modifyIssueStatus()" data-toggle="tooltip" data-placement="right" title="�씪媛� �긽�깭 蹂�寃� �븯湲�"></i>
+ </span>
+ <!-- 沅뚰븳�씠 �뾾�쓣 �븣 -->
+ <span ng-if="!vm.viewer.modifyPermissionCheck">
+ <span class="editForm badge mr-5 offset-1" ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">{{vm.viewer.issueStatusVo.name}}</span>
+ </span>
</div>
</div>
</div>
@@ -155,30 +195,18 @@
<div class="row">
<div class="col-md-4">
<div class="form-group">
- <label class="issue-detail-label"><span translate="issue.issueType">�씠�뒋 ���엯</span> </label>
+ <label class="issue-detail-label"><span translate="common.detectingInfo">�깘吏��젙蹂�</span> </label>
<div class="">
- <span class="status-pill smaller"
- ng-style="{'background-color': vm.viewer.issueTypeVo.color }"></span><span>{{vm.viewer.issueTypeVo.name}}</span>
+ <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="col-md-4">
- <div class="form-group">
- <label class="issue-detail-label"><span translate="common.period">湲곌컙</span></label>
- <div class="">
- <span translate="{{vm.viewer.startDate}}"></span> ~ <span
- translate="{{vm.viewer.completeDate}}"></span>
- </div>
- </div>
- </div>
- <div class="col-md-4">
- <div class="form-group">
- <label class="issue-detail-label"><span translate="common.changeDate">蹂�寃쎌씪</span> </label>
- <div class="">
- {{vm.viewer.modifyDate}}
- </div>
- </div>
</div>
</div>
@@ -208,27 +236,7 @@
</div>
</div>
- <div class="row">
- <div class="col-xxl-12">
- <div class="form-group">
- <label class="issue-detail-label"><span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
- <div class="">
- <div class="select3-selection__choicediv">
- <span class="select3-selection__choice" ng-repeat="user in vm.viewer.userVos">
- <span class="avatar-w"><img ng-src="{{::user.profile}}"></span>
- <span>{{::user.byName}}</span>
- </span>
- <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">
- �떞�떦�옄媛� �뾾�뒿�땲�떎.
- </span>
- <i class="fa fa-edit fa-2x issue-status-edit cursor"
- ng-click="fn.modifyIssueUser()" data-toggle="tooltip" data-placement="right" title="�떞�떦�옄 蹂�寃� �븯湲�"></i>
- </div>
- </div>
- </div>
- </div>
- </div>
<div class="row">
<div class="col-md-4" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">
@@ -262,7 +270,7 @@
<!-- �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
<js-table data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
- event="relTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
+ event="relTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
<div class="row">
<div class="col-sm-4">
@@ -536,4 +544,4 @@
</div>
</div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index ec51092..91b5eb8 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -282,10 +282,10 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="companyField.name">�뾽泥댁씠由�</span> </label>
- <js-autocomplete-single data-input-name="companyField"
- selected-model="vm.form.companyFields"
+ <js-autocomplete-single data-input-name="issueCompanyField"
+ selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
- source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page, fn.getCompanyFieldListCallBack)"
+ source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page, fn.getIssueCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
total-page="vm.autoCompletePage.companyField.totalPage"
input-disabled="false"
@@ -375,9 +375,9 @@
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
<js-autocomplete-single data-input-name="ispField"
- selected-model="vm.form.ispFields"
+ selected-model="vm.form.issueIspFields"
search="vm.ispName"
- source="fn.getIspFieldList(vm.ispName, vm.form.ispFields, vm.autoCompletePage.ispField.page, fn.getIspFieldListCallBack)"
+ source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.ispField.page, fn.getIssueIspFieldListCallBack)"
page="vm.autoCompletePage.ispField.page"
total-page="vm.autoCompletePage.ispField.totalPage"
input-disabled="false"
@@ -481,9 +481,9 @@
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
<js-autocomplete-single data-input-name="hostingField"
- selected-model="vm.form.hostingFields"
+ selected-model="vm.form.issueHostingFields"
search="vm.hostingName"
- source="fn.getHostingFieldList(vm.hostingName, vm.form.hostingFields, vm.autoCompletePage.hostingField.page, fn.getHostingFieldListCallBack)"
+ source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
page="vm.autoCompletePage.hostingField.page"
total-page="vm.autoCompletePage.hostingField.totalPage"
input-disabled="false"
--
Gitblit v1.8.0