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 | 90 ++++++++++-----------------------------------
1 files changed, 20 insertions(+), 70 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 14a3616..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 = "";
@@ -443,6 +430,7 @@
return departmentIds;
})(),
+
attachedFileIds : (function () {
var attachedFileIds = [];
@@ -454,77 +442,39 @@
return attachedFileIds;
})(),
+
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
detectingDateRange : $scope.vm.form.detectingDateRange,
- companyFields : (function () {
+ issueCompanyFields : (function () {
var companyFields = [];
- angular.forEach($scope.vm.form.companyFields, function (companyField) {
- var useValues = [];
-
- 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);
- });
+ var companyField = $scope.vm.form.companyFields[0];
+ companyField.companyId = companyField.id;
+ companyField.id = null;
+ companyFields.push(companyField);
return companyFields;
})(),
- ispFields : (function () {
+ issueIspFields : (function () {
var ispFields = [];
- angular.forEach($scope.vm.form.ispFields, function (ispField) {
- var useValues = [];
-
- 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);
- });
+ var ispField = $scope.vm.form.ispFields[0];
+ ispField.ispId = ispField.id;
+ ispField.id = null;
+ ispFields.push(ispField);
return ispFields;
})(),
- hostingFields : (function () {
+ issueHostingFields : (function () {
var hostingFields = [];
- angular.forEach($scope.vm.form.hostingFields, function (hostingField) {
- var useValues = [];
-
- 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);
- });
+ var hostingField = $scope.vm.form.hostingFields[0];
+ hostingField.hostingId = hostingField.id;
+ hostingField.id = null;
+ hostingFields.push(hostingField);
return hostingFields;
})(),
--
Gitblit v1.8.0