From b31979feb926bad9e0070332fb5ed7a896fd378d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 15 11월 2021 17:09:21 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 13 +
src/main/java/kr/wisestone/owl/vo/IssueVo.java | 9
src/main/webapp/views/issue/issueListTimeline.html | 2
src/main/webapp/views/issue/issueAdd.html | 383 +++++++++++++++++++++++++++++-----
src/main/webapp/views/issue/issueListNormal.html | 2
src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js | 85 +++++++
src/main/webapp/assets/styles/main.css | 32 ++
src/main/resources/migration/V1_1__Initial_Setup.sql | 6
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 40 +++
src/main/webapp/views/issue/issueModifyUser.html | 2
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 4
src/main/webapp/views/issue/issueCompanyFieldDetail.html | 37 +++
src/main/java/kr/wisestone/owl/domain/IssueUser.java | 12 +
src/main/webapp/scripts/app/issue/issueList.controller.js | 8
src/main/webapp/i18n/ko/global.json | 9
src/main/webapp/views/issue/issueModify.html | 2
src/main/webapp/views/issue/issueDetail.html | 2
17 files changed, 578 insertions(+), 70 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/IssueUser.java b/src/main/java/kr/wisestone/owl/domain/IssueUser.java
index e5876a4..88ceb1d 100644
--- a/src/main/java/kr/wisestone/owl/domain/IssueUser.java
+++ b/src/main/java/kr/wisestone/owl/domain/IssueUser.java
@@ -23,6 +23,10 @@
@JoinColumn(name = "workspace_id")
private Workspace workspace;
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "department_id")
+ private Department department;
+
public IssueUser() {
}
@@ -62,4 +66,12 @@
public void setWorkspace(Workspace workspace) {
this.workspace = workspace;
}
+
+ public Department getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(Department department) {
+ this.department = department;
+ }
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 8fec89e..797434f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -744,6 +744,7 @@
issueVo.setSeverityVo(ConvertUtil.copyProperties(issue.getSeverity(), SeverityVo.class));
this.setRegister(issue, issueVo); // �벑濡앹옄 �젙蹂� �뀑�똿
this.setIssueUser(issue, issueVo); // �떞�떦�옄 �젙蹂� �뀑�똿
+ this.setIssueDepartment(issue, issueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setAttachedFiles(issue, issueVo); // 泥⑤� �뙆�씪 �젙蹂� �뀑�똿
this.setIssueCustomFields(issue, issueVo); // �궗�슜�옄 �젙�쓽 �븘�뱶 媛� �젙蹂� �뀑�똿
this.setIssueComments(issue, issueVo); // �뙎湲� �젙蹂� �뀑�똿
@@ -830,6 +831,18 @@
issueVo.setUserVos(userVos);
}
+ // �씠�뒋 �떞�떦遺��꽌 �젙蹂대�� �뀑�똿�븳�떎.
+ private void setIssueDepartment(Issue issue, IssueVo issueVo) {
+ List<DepartmentVo> departmentVos = Lists.newArrayList();
+
+ for (IssueUser issueUser : issue.getIssueUsers()) {
+ DepartmentVo departmentVo = ConvertUtil.copyProperties(issueUser.getDepartment(), DepartmentVo.class);
+ departmentVo.setByName(departmentVo.getByName());
+ departmentVos.add(departmentVo);
+ }
+ issueVo.setDepartmentVos(departmentVos);
+ }
+
// �씠�뒋 泥⑤��뙆�씪 �젙蹂대�� �뀑�똿�븳�떎.
private void setAttachedFiles(Issue issue, IssueVo issueVo) {
List<AttachedFileVo> attachedFileVos = Lists.newArrayList();
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index 71fe386..e906deb 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -237,11 +237,11 @@
} else if(validAdmin == 1) { // �씪�씠�꽱�뒪 �엯�젰 愿�由ъ옄
- DepartmentForm departmentForm = new DepartmentForm();
+ /*DepartmentForm departmentForm = new DepartmentForm();
departmentForm.setDepartmentName("遺��꽌 �뾾�쓬");
Department department = this.departmentService.add(departmentForm);
- this.departmentRepository.saveAndFlush(department);
+ this.departmentRepository.saveAndFlush(department);*/
Workspace primaryWorkspace = this.workspaceService.getPrimaryWorkspace();
diff --git a/src/main/java/kr/wisestone/owl/vo/IssueVo.java b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
index ee7808a..8d4b6a4 100644
--- a/src/main/java/kr/wisestone/owl/vo/IssueVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IssueVo.java
@@ -37,6 +37,7 @@
private UserVo registerVo; // �씠�뒋 �긽�꽭�뿉�꽌 �궗�슜
private Boolean modifyPermissionCheck = Boolean.FALSE;
private List<UserVo> userVos = Lists.newArrayList();
+ private List<DepartmentVo> departmentVos = Lists.newArrayList(); //�떞�떦遺��꽌 異붽�
private List<AttachedFileVo> attachedFileVos = Lists.newArrayList();
private List<IssueCommentVo> issueCommentVos = Lists.newArrayList();
private List<IssueHistoryVo> issueHistoryVos = Lists.newArrayList();
@@ -370,4 +371,12 @@
public List<IssueVo> getIssueRelationIssueVos() { return this.issueRelationVos; }
public void setIssueRelationIssueVos(List<IssueVo> issueRelationVos) { this.issueRelationVos = issueRelationVos; }
+
+ public List<DepartmentVo> getDepartmentVos() {
+ return departmentVos;
+ }
+
+ public void setDepartmentVos(List<DepartmentVo> departmentVos) {
+ this.departmentVos = departmentVos;
+ }
}
diff --git a/src/main/resources/migration/V1_1__Initial_Setup.sql b/src/main/resources/migration/V1_1__Initial_Setup.sql
index 6dc56c9..91a8e2d 100644
--- a/src/main/resources/migration/V1_1__Initial_Setup.sql
+++ b/src/main/resources/migration/V1_1__Initial_Setup.sql
@@ -303,7 +303,8 @@
-- �뀒�씠釉� owl_en_1.5.issue_user 援ъ“ �궡蹂대궡湲�
CREATE TABLE IF NOT EXISTS `issue_user` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
- `user_id` bigint(20) NOT NULL,
+ `user_id` bigint(20) NULL,
+ `department_id` bigint(20) NOT NULL,
`issue_id` bigint(20) NOT NULL,
`workspace_id` bigint(20) NOT NULL,
`register_id` bigint(20) NOT NULL,
@@ -314,7 +315,8 @@
KEY `userIdAndIssueIdIndex` (`user_id`,`issue_id`),
KEY `issueIdIndex` (`issue_id`),
KEY `workspaceIdIndex` (`workspace_id`),
- KEY `userIdIndex` (`user_id`)
+ KEY `userIdIndex` (`user_id`),
+ KEY `departmentIdIndex` (`department_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- �뀒�씠釉� �뜲�씠�꽣 owl_en_1.5.issue_user:~0 rows (���왂�쟻) �궡蹂대궡湲�
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 7a8dce6..198571c 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -3132,6 +3132,29 @@
border-color: #292b2c;
}
+.btn-indigo {
+ color: #fff;
+ background-color: #1973EB;
+ border-color: #1973EB;
+}
+
+.btn-indigo:hover {
+ color: #fff;
+ background-color: #0f0165;
+ border-color: #0f0165;
+}
+
+.btn-indigo:focus, .btn-secondary.focus {
+ -webkit-box-shadow: 0 0 0 0.2rem rgba(41, 43, 44, 0.5);
+ box-shadow: 0 0 0 0.2rem rgba(41, 43, 44, 0.5);
+}
+
+.btn-indigo.disabled, .btn-secondary:disabled {
+ color: #fff;
+ background-color: #292b2c;
+ border-color: #292b2c;
+}
+
.btn-success {
color: #fff;
background-color: #5eb314;
@@ -28580,7 +28603,6 @@
.tab .tablabel::after {
display: inline-block;
color: #4d8bf5;
- background-color:;
width: 30px;
font-size: 0.80rem;
line-height: 40px;
@@ -30173,4 +30195,12 @@
width: 100%
}
+.fontcolor_green {
+ color: #6C9266;
+ font-size: 15px;
+}
+.fontcolor_neon_green {
+ color: #282c34;
+ font-size: 15px;
+}
/* 媛꾪듃李⑦듃 end */
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 386b178..7f4d968 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -767,7 +767,10 @@
"departmentName": "遺��꽌紐�",
"departmentEx": "遺��꽌�꽕紐�",
"departmentCount": "遺��꽌�씤�썝",
- "departmentUser": "遺��꽌 ���썝"
+ "departmentUser": "遺��꽌 ���썝",
+ "detectingInfo": "�깘吏��젙蹂�",
+ "detectingData": "�깘吏��씪�떆",
+ "import": "媛��졇�삤湲�"
},
"tasks": {
"agileBoardTitle": "移몃컲 蹂대뱶"
@@ -798,12 +801,14 @@
"successToApiTokenAdd" : "API �넗�겙 �깮�꽦 �꽦怨�"
},
"companyField" : {
+ "info": "�뾽泥� �젙蹂�",
"add" : "�뾽泥� �깮�꽦",
"name" : "�뾽泥� �씠由�",
"company" : "�뾽泥� 遺꾨쪟",
"profitYN" : "�쁺由�/鍮꾩쁺由�",
"industry" : "�궛�뾽 遺꾨쪟",
"domain" : "�룄硫붿씤",
+ "ipAdress" : "ip二쇱냼",
"manager" : "�떞�떦�옄",
"tel" : "�쟾�솕踰덊샇",
"code" : "肄붾뱶",
@@ -819,6 +824,7 @@
"invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂."
},
"ispField" : {
+ "info": "ISP �젙蹂�",
"add" : "ISP �깮�꽦",
"name" : "ISP �씠由�",
"manager" : "�떞�떦�옄",
@@ -836,6 +842,7 @@
"invalidCodeFormat": "肄붾뱶紐낆뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎."
},
"hostingField" : {
+ "info": "�샇�뒪�똿 �젙蹂�",
"add" : "�샇�뒪�똿 �깮�꽦",
"name" : "�샇�뒪�똿 �씠由�",
"manager" : "�떞�떦�옄",
diff --git a/src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js b/src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js
new file mode 100644
index 0000000..bca5967
--- /dev/null
+++ b/src/main/webapp/scripts/app/issue/issueCompanyFieldDetail.controller.js
@@ -0,0 +1,85 @@
+/**
+ * Created by wisestone on 2018-02-19.
+ */
+'use strict';
+
+define([
+ 'app'
+ ],
+ function (app) {
+ app.controller('companyFieldAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$uibModalInstance', '$state', 'CompanyField', '$filter',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $uibModalInstance, $state, CompanyField, $filter) {
+
+ $scope.fn = {
+ cancel : cancel, // �뙘�뾽 李� �떕湲�
+ formSubmit : formSubmit, // �뤌 �쟾�넚
+ formCheck : formCheck, // �뤌 泥댄겕
+ };
+
+ $scope.vm = {
+ form : {
+ name : "", //�뾽泥대챸
+ //companyType : "", //�뾽泥대텇瑜�
+ //profitYN : "", //�쁺由�/鍮꾩쁺由�
+ //industry : "", //�궛�뾽遺꾨쪟
+ //domain : "", //�룄硫붿씤
+ manager : "", //�떞�떦�옄
+ tel : "", //�쟾�솕踰덊샇
+ email : "", //�씠硫붿씪
+ memo : "" //鍮꾧퀬
+ }
+ };
+
+ // �뤌 泥댄겕
+ function formCheck(formInvalid) {
+ if (formInvalid) {
+ return true;
+ }
+ return false;
+ }
+
+ // �뤌 �쟾�넚
+ function formSubmit(condition) {
+ $rootScope.spinner = true;
+
+ var content = {
+ name : $rootScope.preventXss($scope.vm.form.name), // �뾽泥대챸
+ //companyType : $scope.vm.form.companyType, //�뾽泥대텇瑜�
+ //profitYN : $scope.vm.form.profitYN, //�쁺由�/鍮꾩쁺由�
+ //industry : $scope.vm.form.industry, //�궛�뾽遺꾨쪟
+ //domain : $scope.vm.form.domain, //�룄硫붿씤
+ manager : $scope.vm.form.manager, //�떞�떦�옄
+ tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
+ email : $scope.vm.form.email, //�씠硫붿씪
+ memo : $scope.vm.form.memo //鍮꾧퀬
+ };
+
+ CompanyField.add($resourceProvider.getContent(content,
+ $resourceProvider.getPageContent(0, 10))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.fn.cancel();
+ // 紐⑸줉 �솕硫� 媛깆떊
+ $rootScope.$broadcast("getPageList", {});
+ }
+ else {
+ SweetAlert.error($filter("translate")("companyField.failedCompanyFieldRegistration"), result.data.message.message);
+ }
+
+ $rootScope.spinner = false;
+ });
+
+ }
+
+ // �뙘�뾽 李� �떕湲�
+ function cancel() {
+ $rootScope.$broadcast("closeLayer"); // �뙘�뾽�씠 �뿴由ш퀬 �굹�꽌 js-multi, js-single �벑�뿉�꽌 body �씠踰ㅽ듃媛� �궇�븘媛��뒗 �쁽�긽 �닔�젙
+ $uibModalInstance.dismiss('cancel');
+ $(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
+ }
+
+ }
+
+ ]);
+ }
+);
\ No newline at end of file
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 0a51d11..9b7b944 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -240,9 +240,9 @@
.setDAlign("text-center")
.setDName("issueTypeName"));
break;
- case "ASSIGNEE" : // �떞�떦�옄
+ case "ASSIGNEETEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("common.assignee")
+ .setHName("common.assigneeTeam")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -866,8 +866,8 @@
position : 3,
display : true
}, {
- name : $filter("translate")("common.assignee"), // �떞�떦�옄
- key : "ASSIGNEE",
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "ASSIGNEETEAM",
width : "width-140-p",
position : 4,
display : true
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index bc694ec..97563fc 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -17,6 +17,7 @@
var User = $injector.get("User");
var Project = $injector.get("Project");
var Workflow = $injector.get("Workflow");
+ var CompanyField = $injector.get("CompanyField");
var Issue = $injector.get("Issue");
var UserWorkspace = $injector.get("UserWorkspace");
var $log = $injector.get("$log");
@@ -28,6 +29,7 @@
$scope.fn.getIssueList = getIssueList; // �씪媛� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getWorkflowList = getWorkflowList; // �썙�겕�뵆濡쒖슦 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getUserDepartmentList = getUserDepartmentList; // 遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getCompanyFieldList = getCompanyFieldList; // 遺��꽌 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
function getUserList(query, excludeList, page, callBack) {
var conditions = {
@@ -94,6 +96,8 @@
var deferred = $q.defer();
+
+
Project.findWork($resourceProvider.getContent( // �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
if (result.data.message.status === "success") {
@@ -111,6 +115,42 @@
return deferred.promise;
}
+ function getCompanyFieldList(query, excludeList, page, callBack, statuses, roleTypes) {
+ var conditions = {
+ companyName : query,
+ excludeIds : (function () {
+ var excludeIds = [];
+
+ angular.forEach(excludeList, function (exclude) {
+ excludeIds.push(exclude.id);
+ });
+
+ return excludeIds;
+ })()
+ };
+
+ var deferred = $q.defer();
+
+
+
+ CompanyField.find($resourceProvider.getContent( // �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
+ 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);
+ }
+
+ deferred.resolve(result.data.data);
+ }
+ else {
+ SweetAlert.swal($filter("translate")("common.failedToProjectListLookUp"), result.data.message.message, "error"); // "�봽濡쒖젥�듃 紐⑸줉 議고쉶 �떎�뙣"
+ }
+ });
+
+ return deferred.promise;
+ }
+
+
function getUserDepartmentList(query, excludeList, page, callBack) {
var conditions = {
departmentName : query,
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 0eccfe0..578e9c1 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -136,7 +136,7 @@
<div class="row">
<div class="col-lg-4">
<div class="form-group mb10">
- <label class="issue-label"> <span translate="common.assignee">�떞�떦�옄</span> </label>
+ <label class="issue-label"> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
<js-input-autocomplete data-input-name="users"
selected-model="vm.form.users"
search="vm.userName"
@@ -148,7 +148,6 @@
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : true, imagePathProp : 'profile',
type : 'user', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
- <small translate="issue.setUpUsersParticipatingInProject">�봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 �궗�슜�옄瑜� �꽕�젙�빀�땲�떎.</small>
<div class="select3-selection__choicediv">
<span class="select3-selection__choice" ng-repeat="user in vm.form.users">
<span class="avatar-w"><img ng-src="{{user.profile}}"></span>
@@ -158,10 +157,10 @@
</span>
</div>
</div>
-
+ </div>
+ <div class="col-lg-4">
<div class="form-group mb10">
- <label for="issueAddForm5" class="issue-label"> <span translate="common.period">湲곌컙</span>
- </label>
+ <label for="issueAddForm5" class="issue-label"> <span translate="common.period">湲곌컙</span></label>
<input id="issueAddForm5"
tabindex="-1"
type="text"
@@ -179,7 +178,8 @@
</div>
</div>
</div>
-
+ </div>
+ <div class="col-lg-4">
<div class="form-group mgb5">
<label class="issue-label"><span translate="common.attachFiles">�뙆�씪 泥⑤�</span></label>
<div class="filebox input-group">
@@ -196,9 +196,6 @@
multiple
ng-file-select="fn.onFileSelect($files)">
</div>
- <small translate="issue.attachOnlyFiles">hwp, jpg, png, txt, pptx, ppt, pdf, xlsx, xls, docx,
- zip, gif, jpeg, doc, tif, bmp, wmv, avi, mp4, mkv, mov �뙆�씪留� 泥⑤��븷 �닔 �엳�뒿�땲�떎.
- </small>
<div class="select2-selection__choicediv">
<div class="select2-selection__choice2" ng-repeat="file in vm.form.files">
@@ -230,59 +227,335 @@
</div>
</div>
</div>
+ </div>
- <div class="col-lg-8 bdl1">
- <div class="row">
- <div class="col-md-12">
- <div class="form-group mgb5" ng-show="vm.form.issueCustomFields.length < 1">
- <label class="issue-label" translate="issue.notIssueTypeCustomFields">�씠�뒋 ���엯�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽
- �븘�뱶媛� �뾾�뒿�땲�떎.</label>
+ <div class="row">
+ <div class="col-lg-4 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="common.detectingInfo">�깘吏��젙蹂�</span></label>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="detectingDateAddForm" class="issue-label"> <span translate="common.detectingData">�깘吏��씪�떆</span> </label>
+ <input id="detectingDateAddForm"
+ tabindex="-1"
+ type="text"
+ readonly
+ class="form-control cursor"
+ placeholder="{{'issue.clickToSelectDate' | translate}}"
+ ng-model="vm.form.startCompleteDateRange"
+ modal-form-auto-scroll
+ date-format="YYYY-MM-DD"
+ parent-el="'#createdWidget2'"
+ date-range-picker>
+ <div class="row">
+ <div class="col-xs-12">
+ <div id="createdWidget2" class="bootstrap-datepicker"></div>
</div>
</div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="domainAddForm" class="issue-label"><span translate="companyField.domain">�룄硫붿씤</span></label>
+ <input id="domainAddForm"
+ name="domain"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.domain"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ipAdressAddForm" class="issue-label"><span translate="companyField.ipAdress">ip二쇱냼</span></label>
+ <input id="ipAdressAddForm"
+ name="ipAdress"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.ipAdress"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span></label>
+ <button class="btn btn-sm col-lg-6 btn-indigo" ng-click="fn.companyImport()">
+ <span translate="common.import">媛��졇�삤湲�</span>
+ </button>
+ </div>
+ </div>
- <div class="col-md-6" ng-repeat="issueCustomField in vm.form.issueCustomFields">
- <div class="form-group mgb5">
- <label class="issue-label">{{issueCustomField.customFieldVo.name}}</label>
-
- <div ng-switch on="issueCustomField.customFieldVo.customFieldType">
- <!-- 湲곕낯 �엯�젰 -->
- <div ng-switch-when="INPUT">
- <input type="text" class="form-control input-sm"
- ng-model="issueCustomField.useValues"
- maxlength="100"
- autocomplete="off"
- kr-input
- ng-required="issueCustomField.fieldOption == '01'">
- </div>
-
- <!-- �떒�씪 ���젆�듃 -->
- <div ng-switch-when="SINGLE_SELECT">
- <select class="form-control input-sm issue-select-label"
- ng-required="issueCustomField.fieldOption == '01'"
- ng-model="issueCustomField.useValues">
- <option value="" value="" translate="common.choose">�꽑�깮�븯�꽭�슂.</option>
- <option ng-repeat="customFieldValueVo in issueCustomField.customFieldVo.customFieldValueVos"
- value="{{customFieldValueVo.value}}"
- ng-selected="$root.selectOption(issueCustomField.useValues, customFieldValueVo.value)">
- {{customFieldValueVo.value}}
- </option>
- </select>
- </div>
-
- <!-- 硫��떚 ���젆�듃 -->
- <div ng-switch-when="MULTI_SELECT">
- <ng-dropdown-multiselect class="multiSelect cursor"
- data-input-name=""
- modal-form-auto-scroll
- selected-model="issueCustomField.useValues"
- extra-settings="{ 'idProp' : 'value', 'externalIdProp' : 'value', 'displayProp' : 'value', 'stringTypeOption' : 'true', stopRemoveBodyEvent : true }"
- options="issueCustomField.customFieldVo.customFieldValueVos"></ng-dropdown-multiselect>
- </div>
- </div>
- </div>
+ <div class="row">
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="companyFieldNameAddForm" class="issue-label"> <span translate="companyField.name">�뾽泥대챸</span> </label>
+ <input id="companyFieldNameAddForm"
+ name="companyName"
+ type="text"
+ class="form-control"
+ autofocus
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.companyName"
+ ng-maxlength="100"
+ maxlength="100"
+ required>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="companyFieldManagerAddForm" class="issue-label"><span translate="companyField.manager">�떞�떦�옄</span></label>
+ <input id="companyFieldManagerAddForm"
+ name="companyManager"
+ type="text"
+ class="form-control"
+ autofocus
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.companyManager"
+ ng-maxlength="100"
+ maxlength="100"
+ required>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldTelAddForm" class="issue-label"><span translate="companyField.tel">�쟾�솕踰덊샇</span></label>
+ <input id="companyFieldTelAddForm"
+ name="companyTel"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ autocomplete="off"
+ ng-model="vm.form.companyTel"
+ maxlength="20">
+ <div ng-show="issueAddForm.companyTel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
</div>
</div>
</div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldEmailAddForm" class="issue-label"><span translate="companyField.email">�씠硫붿씪</span></label>
+ <input id="companyFieldEmailAddForm"
+ name="companyEmail"
+ type="email"
+ class="form-control"
+ autocomplete="off"
+ maxLength="50"
+ ng-model="vm.form.companyEmail"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
+ <div ng-show="issueAddForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="companyFieldDescAddForm" class="issue-label"><span translate="companyField.desc">鍮꾧퀬</span></label>
+ <input id="companyFieldDescAddForm"
+ name="companyDesc"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.companyDesc"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span></label>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="ispFieldNameAddForm" class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
+ <input id="ispFieldNameAddForm"
+ name=ispName"
+ type="text"
+ class="form-control"
+ autofocus
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.ispName"
+ ng-maxlength="100"
+ maxlength="100"
+ required>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="ispFieldManagerAddForm" class="issue-label"><span translate="ispField.manager">�떞�떦�옄</span></label>
+ <input id="ispFieldManagerAddForm"
+ name="ispManager"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.ispManager"
+ ng-maxlength="100"
+ maxlength="100">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ispFieldTelAddForm" class="issue-label"><span translate="ispField.tel">�쟾�솕踰덊샇</span></label>
+ <input id="ispFieldTelAddForm"
+ name="ispTel"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ autocomplete="off"
+ ng-model="vm.form.ispTel"
+ maxlength="20">
+ <div ng-show="issueAddForm.ispTel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ispFieldEmailAddForm" class="issue-label"><span translate="ispField.email">�씠硫붿씪</span></label>
+ <input id="ispFieldEmailAddForm"
+ name="ispEmail"
+ type="email"
+ class="form-control"
+ autocomplete="off"
+ maxLength="50"
+ ng-model="vm.form.ispEmail"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
+ <div ng-show="issueAddForm.ispEmail.$error.pattern" class="help-block form-text text-danger"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="ispFieldDescAddForm" class="issue-label"><span translate="ispField.desc">鍮꾧퀬</span></label>
+ <input id="ispFieldDescAddForm"
+ name="ispDesc"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.ispDesc"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-4 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">�샇�뒪�똿 �젙蹂�</span></label>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="hostingFieldNameAdd" class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
+ <input id="hostingFieldNameAdd"
+ name="hostingName"
+ type="text"
+ class="form-control"
+ autofocus
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.hostingName"
+ ng-maxlength="100"
+ maxlength="100"
+ required>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mb10">
+ <label for="hostingFieldManagerAdd" class="issue-label"><span translate="hostingField.manager">�떞�떦�옄</span></label>
+ <input id="hostingFieldManagerAdd"
+ name="hostingManager"
+ type="text"
+ class="form-control"
+ kr-input
+ input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ autocomplete="off"
+ ng-model="vm.form.hostingManager"
+ ng-maxlength="100"
+ maxlength="100">
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="hostingFieldTelAdd" class="issue-label"><span translate="hostingField.tel">�쟾�솕踰덊샇</span></label>
+ <input id="hostingFieldTelAdd"
+ name="hostingTel"
+ type="text"
+ class="form-control"
+ kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ autocomplete="off"
+ ng-model="vm.form.hostingTel"
+ maxlength="20">
+ <div ng-show="issueAddForm.hostingTel.$error.pattern" class="help-block form-text text-danger"
+ translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="hostingFieldEmailAdd" class="issue-label"><span translate="hostingField.email">�씠硫붿씪</span></label>
+ <input id="hostingFieldEmailAdd"
+ name="hostingEmail"
+ type="email"
+ class="form-control"
+ autocomplete="off"
+ maxLength="50"
+ ng-model="vm.form.hostingEmail"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
+ <div ng-show="issueAddForm.hostingEmail.$error.pattern" class="help-block form-text text-danger"
+ translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <div class="form-group mgb5">
+ <label for="hostingFieldDescAdd" class="issue-label"><span translate="hostingField.desc">鍮꾧퀬</span></label>
+ <input id="hostingFieldDescAdd"
+ name="hostingDesc"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.form.hostingDesc"
+ ng-maxlength="200"
+ maxlength="200">
+ </div>
+ </div>
</div>
</form>
</div>
diff --git a/src/main/webapp/views/issue/issueCompanyFieldDetail.html b/src/main/webapp/views/issue/issueCompanyFieldDetail.html
new file mode 100644
index 0000000..8e78ee0
--- /dev/null
+++ b/src/main/webapp/views/issue/issueCompanyFieldDetail.html
@@ -0,0 +1,37 @@
+<div class="formModal">
+ <div class="modal-header faded smaller">
+ <div class="modal-title">
+ <strong>�뾽泥� �젙蹂�</strong>
+ </div>
+ <button aria-label="Close" class="close" type="button" ng-click="fn.cancel()">
+ <span aria-hidden="true"> ×</span>
+ </button>
+ </div>
+
+ <div class="modal-body">
+ <form role="form" name="companyFieldImportForm">
+ <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"
+ search="vm.companyName"
+ source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page, fn.getCompanyFieldListCallBack)"
+ page="vm.autoCompletePage.companyField.page"
+ total-page="vm.autoCompletePage.companyField.totalPage"
+ input-disabled="false"
+ extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ </div>
+ <div class="modal-footer buttons-on-right">
+ <button type="button" class="btn btn-md btn-grey" ng-click="fn.cancel()"><span translate="common.cancel">痍⑥냼</span></button>
+ <button type="button" class="btn btn-md btn-primary bold"
+ js-short-cut
+ js-short-cut-action="(fn.formCheck(companyFieldModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(companyFieldImportForm.$invalid)"
+ ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
+ </button>
+ </div>
+ </form>
+ </div>
+</div>
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 7913e9c..89d3763 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -207,7 +207,7 @@
<div class="row">
<div class="col-xxl-12">
<div class="form-group">
- <label class="issue-detail-label"><span translate="common.assignee">�떞�떦�옄</span> </label>
+ <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">
diff --git a/src/main/webapp/views/issue/issueListNormal.html b/src/main/webapp/views/issue/issueListNormal.html
index 8ebb4a0..b52df46 100644
--- a/src/main/webapp/views/issue/issueListNormal.html
+++ b/src/main/webapp/views/issue/issueListNormal.html
@@ -185,7 +185,7 @@
<div class="col-lg-3">
<div class="form-group">
- <label> <span translate="common.assignee">�떞�떦�옄</span></label>
+ <label> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span></label>
<js-autocomplete-multi data-input-name="users"
selected-model="vm.users"
search="vm.userName"
diff --git a/src/main/webapp/views/issue/issueListTimeline.html b/src/main/webapp/views/issue/issueListTimeline.html
index 65f51d0..86e4a75 100644
--- a/src/main/webapp/views/issue/issueListTimeline.html
+++ b/src/main/webapp/views/issue/issueListTimeline.html
@@ -184,7 +184,7 @@
<div class="col-lg-3">
<div class="form-group">
- <label> <span translate="common.assignee">�떞�떦�옄</span></label>
+ <label> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span></label>
<js-autocomplete-multi data-input-name="users"
selected-model="vm.users"
search="vm.userName"
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index 01bd3db..863a4f5 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -138,7 +138,7 @@
<div class="row">
<div class="col-lg-4">
<div class="form-group mgb5">
- <label class="issue-label"> <span translate="common.assignee">�떞�떦�옄</span> </label>
+ <label class="issue-label"> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
<js-input-autocomplete data-input-name="users"
selected-model="vm.form.users"
search="vm.userName"
diff --git a/src/main/webapp/views/issue/issueModifyUser.html b/src/main/webapp/views/issue/issueModifyUser.html
index 80fab2f..f56e075 100644
--- a/src/main/webapp/views/issue/issueModifyUser.html
+++ b/src/main/webapp/views/issue/issueModifyUser.html
@@ -12,7 +12,7 @@
<form role="form" name="issueUserModifyForm">
<div class="form-group">
<div class="form-group mgb5">
- <label class="issue-label"> <span translate="common.assignee">�떞�떦�옄</span> </label>
+ <label class="issue-label"> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
<js-input-autocomplete data-input-name="users"
selected-model="vm.form.users"
search="vm.userName"
--
Gitblit v1.8.0