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 | 61 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 6dd109d..a004f45 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -340,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;
@@ -349,6 +350,7 @@
// 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;
@@ -358,6 +360,7 @@
// �샇�뒪�똿�젙蹂� 寃곌낵 媛� 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;
@@ -372,22 +375,6 @@
var content = {
title : $rootScope.preventXss($scope.vm.form.title), // �젣紐�
description : $rootScope.preventXss($scope.vm.form.description), // �궡�슜
- //
- companyManager : $rootScope.preventXss($scope.vm.companyManager), // �궡�슜
- companyTel : $rootScope.preventXss($scope.vm.companyTel), // �궡�슜
- companyEmail : $rootScope.preventXss($scope.vm.companyEmail), // �궡�슜
- companyMemo : $rootScope.preventXss($scope.vm.companyMemo), // �궡�슜
- ispCode : $rootScope.preventXss($scope.vm.ispCode), // �궡�슜
- ispManager : $rootScope.preventXss($scope.vm.ispManager), // �궡�슜
- ispTel : $rootScope.preventXss($scope.vm.ispTel), // �궡�슜
- ispEmail : $rootScope.preventXss($scope.vm.ispEmail), // �궡�슜
- ispMemo : $rootScope.preventXss($scope.vm.ispMemo), // �궡�슜
- hostingCode : $rootScope.preventXss($scope.vm.hostingCode ), // �궡�슜
- hostingManager : $rootScope.preventXss($scope.vm.hostingManager), // �궡�슜
- hostingTel : $rootScope.preventXss($scope.vm.hostingTel), // �궡�슜
- hostingEmail : $rootScope.preventXss($scope.vm.hostingEmail), // �궡�슜
- hostingMemo : $rootScope.preventXss($scope.vm.hostingMemo), // �궡�슜
- //
projectId : (function () { // �봽濡쒖젥�듃 �븘�씠�뵒
var projectId = "";
@@ -402,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;
})(),
@@ -448,6 +430,7 @@
return departmentIds;
})(),
+
attachedFileIds : (function () {
var attachedFileIds = [];
@@ -459,9 +442,43 @@
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 = [];
--
Gitblit v1.8.0