From f01dc01ba632addc8e893fea0843a3d77aac7e25 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 18 11월 2021 09:41:54 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index b47b8df..a004f45 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -309,22 +309,25 @@
function getProjectListCallBack(result) {
$scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage;
}
+
// �뾽泥댁젙蹂� autocomplete page �뾽�뜲�씠�듃
function getCompanyFieldListCallBack(result) {
$scope.vm.autoCompletePage.companyField.totalPage = result.data.page.totalPage;
}
+ // 遺��꽌�젙蹂� autocomplete page �뾽�뜲�씠�듃
function getIssueDepartmentListCallBack(result) {
$scope.vm.autoCompletePage.department.totalPage = result.data.page.totalPage;
}
+ // ISP�젙蹂� autocomplete page �뾽�뜲�씠�듃
function getIspFieldListCallBack(result) {
$scope.vm.autoCompletePage.ispField.totalPage = result.data.page.totalPage;
-
}
+
+ // �샇�뒪�똿�젙蹂� autocomplete page �뾽�뜲�씠�듃
function getHostingFieldListCallBack(result) {
$scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
-
}
// �뤌 泥댄겕
@@ -337,6 +340,7 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
+ $scope.vm.companyId = result[0].id;
$scope.vm.companyManager = result[0].manager;
$scope.vm.companyTel = result[0].tel;
$scope.vm.companyEmail = result[0].email;
@@ -346,14 +350,17 @@
// ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("ispFieldEvent", function (event, result) {
+ $scope.vm.ispId = result[0].id;
$scope.vm.ispCode = result[0].code;
$scope.vm.ispManager = result[0].manager;
$scope.vm.ispTel = result[0].tel;
$scope.vm.ispEmail = result[0].email;
$scope.vm.ispMemo = result[0].memo;
});
+
// �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("hostingFieldEvent", function (event, result) {
+ $scope.vm.hostingId = result[0].id;
$scope.vm.hostingCode = result[0].code;
$scope.vm.hostingManager = result[0].manager;
$scope.vm.hostingTel = result[0].tel;
@@ -382,30 +389,25 @@
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;
})(),
@@ -422,12 +424,13 @@
departmentIds : (function () {
var departmentIds = [];
- angular.forEach($scope.vm.form.departments, function (user) {
- departmentIds.push(user.id);
+ angular.forEach($scope.vm.form.departments, function (department) {
+ departmentIds.push(department.id);
});
return departmentIds;
})(),
+
attachedFileIds : (function () {
var attachedFileIds = [];
@@ -439,8 +442,42 @@
return attachedFileIds;
})(),
+
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
detectingDateRange : $scope.vm.form.detectingDateRange,
+
+ issueCompanyFields : (function () {
+ var companyFields = [];
+
+ var companyField = $scope.vm.form.companyFields[0];
+ companyField.companyId = companyField.id;
+ companyField.id = null;
+ companyFields.push(companyField);
+
+ return companyFields;
+ })(),
+
+ issueIspFields : (function () {
+ var ispFields = [];
+
+ var ispField = $scope.vm.form.ispFields[0];
+ ispField.ispId = ispField.id;
+ ispField.id = null;
+ ispFields.push(ispField);
+
+ return ispFields;
+ })(),
+
+ issueHostingFields : (function () {
+ var hostingFields = [];
+
+ var hostingField = $scope.vm.form.hostingFields[0];
+ hostingField.hostingId = hostingField.id;
+ hostingField.id = null;
+ hostingFields.push(hostingField);
+
+ return hostingFields;
+ })(),
issueCustomFields : (function () { // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
var issueCustomFields = [];
@@ -466,9 +503,6 @@
return issueCustomFields;
})()
};
-
- alert($scope.vm.form.issueTypeId);
- alert($scope.vm.form.companyId);
Issue.add({
method : "POST",
--
Gitblit v1.8.0