From 534e55efdf01d429aa030d0738573becfa4d61bb Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 16 11월 2021 16:53:43 +0900
Subject: [PATCH] 이슈 만들기 진행[프론트]
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 1
src/main/webapp/views/issue/issueAdd.html | 39 ++++++++++++++++++-
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 48 +++++++++++++++++++++++-
3 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index d6eb016..b47b8df 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -16,7 +16,7 @@
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
- formCheck : formCheck, // �뤌 泥댄겕
+ formCheck : formCheck, // �뤌 泥댄겕
getUserListCallBack : getUserListCallBack, // �떞�떦�옄 autocomplete �럹�씠吏�
getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 autocomplete �럹�씠吏�
getCompanyFieldListCallBack : getCompanyFieldListCallBack, // �뾽泥댁젙蹂� autocomplete �럹�씠吏�
@@ -61,11 +61,13 @@
userName : "", // �궗�슜�옄 寃��깋
departmentName : "", // 遺��꽌紐� 寃��깋
companyName : "", // �뾽泥대챸 寃��깋
+ companyCode : "", // �뾽泥� 肄붾뱶
companyManager : "", // �뾽泥� �떞�떦�옄
companyTel : "", // �뾽泥� �쟾�솕踰덊샇
companyEmail : "", // �뾽泥� �씠硫붿씪
companyMemo : "", // �뾽泥� 鍮꾧퀬
ispName : "", // ISP 紐�
+ ispCode : "", // ISP 肄붾뱶
ispManager : "", // ISP �떞�떦�옄
ispTel : "", // ISP �쟾�솕踰덊샇
ispEmail : "", // ISP �씠硫붿씪
@@ -344,6 +346,7 @@
// ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("ispFieldEvent", function (event, result) {
+ $scope.vm.ispCode = result[0].code;
$scope.vm.ispManager = result[0].manager;
$scope.vm.ispTel = result[0].tel;
$scope.vm.ispEmail = result[0].email;
@@ -351,12 +354,12 @@
});
// �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("hostingFieldEvent", function (event, result) {
+ $scope.vm.hostingCode = result[0].code;
$scope.vm.hostingManager = result[0].manager;
$scope.vm.hostingTel = result[0].tel;
$scope.vm.hostingEmail = result[0].email;
$scope.vm.hostingMemo = result[0].memo;
});
-
// �뤌 �쟾�넚
function formSubmit() {
@@ -377,6 +380,35 @@
issueTypeId : $scope.vm.form.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : $scope.vm.form.priorityId, // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : $scope.vm.form.severityId, // 以묒슂�룄 �븘�씠�뵒
+ companyId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
+ var companyId = "";
+
+ if ($scope.vm.form.companyFields.length > 0) {
+ companyId = $scope.vm.form.companyFields[0].id;
+ }
+
+ return companyId;
+ })(),
+
+ ispId : (function () {
+ var ispId = "";
+
+ if ($scope.vm.form.ispFields.length > 0) {
+ ispId = $scope.vm.form.ispFields[0].id;
+ }
+
+ return ispId;
+ })(),
+ hostingId : (function () {
+ var hostingId = "";
+
+ if ($scope.vm.form.hostingFields.length > 0) {
+ hostingId = $scope.vm.form.hostingFields[0].id;
+ }
+
+ return hostingId;
+ })(),
+
userIds : (function () {
var userIds = [];
@@ -385,6 +417,16 @@
});
return userIds;
+ })(),
+
+ departmentIds : (function () {
+ var departmentIds = [];
+
+ angular.forEach($scope.vm.form.departments, function (user) {
+ departmentIds.push(user.id);
+ });
+
+ return departmentIds;
})(),
attachedFileIds : (function () {
var attachedFileIds = [];
@@ -425,6 +467,8 @@
})()
};
+ alert($scope.vm.form.issueTypeId);
+ alert($scope.vm.form.companyId);
Issue.add({
method : "POST",
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 5a4c131..3d9aed3 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -191,6 +191,7 @@
function getUserDepartmentList(query, excludeList, page, callBack) {
var conditions = {
departmentName : query,
+ departmentId : $rootScope.department.id,
excludeIds : (function () { //excludeIds : �젣�쇅 �븷 由ъ뒪�듃
var excludeIds = [];
angular.forEach(excludeList, function (exclude) {
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 2d2f090..7b40110 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -123,7 +123,7 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
- <js-autocomplete-multi data-input-name="department�꽩"
+ <js-autocomplete-multi data-input-name="department"
selected-model="vm.form.departments"
search="vm.departmentName"
source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
@@ -271,8 +271,9 @@
</div>
<hr>
<div class="row">
- <div class="col-lg-4 fontcolor_green">
- <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span></label>
+ <div class="col-lg-8 fontcolor_green">
+ <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span>
+ <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> 媛� �젙蹂댁쓽 �씠由� �겢由��떆 �빐�떦 �씠由꾩쓽 �젙蹂닿� 議고쉶�맗�땲�떎.</span></label>
</div>
</div>
@@ -384,6 +385,22 @@
</div>
<div class="col-lg-4">
<div class="form-group mb10">
+ <label for="ispFieldCodeAddForm" class="issue-label"><span translate="ispField.code">肄붾뱶</span></label>
+ <input id="ispFieldCodeAddForm"
+ name="ispCode"
+ 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.ispCode"
+ ng-maxlength="100"
+ maxlength="100">
+ </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"
@@ -471,6 +488,22 @@
</div>
<div class="col-lg-4">
<div class="form-group mb10">
+ <label for="hostingCodeManagerAdd" class="issue-label"><span translate="hostingField.code">�떞�떦�옄</span></label>
+ <input id="hostingCodeManagerAdd"
+ name="hostingCode"
+ 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.hostingCode"
+ ng-maxlength="100"
+ maxlength="100">
+ </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"
--
Gitblit v1.8.0