From ad7e60c5d5a090160c6b9be63c02a75a6c369b91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 07 1월 2022 14:10:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js | 71 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
index 8019895..8da6eeb 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldAdd.controller.js
@@ -7,28 +7,54 @@
'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) {
+ app.controller('companyFieldAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$uibModalInstance', '$state', 'CompanyField', '$filter', '$injector','$controller',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $uibModalInstance, $state, CompanyField, $filter, $injector, $controller) {
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
+ getIssueIspFieldListCallBack : getIssueIspFieldListCallBack,
+ getIssueHostingFieldListCallBack : getIssueHostingFieldListCallBack
};
$scope.vm = {
form : {
name : "", //�뾽泥대챸
- //companyType : "", //�뾽泥대텇瑜�
- //profitYN : "", //�쁺由�/鍮꾩쁺由�
- //industry : "", //�궛�뾽遺꾨쪟
- //domain : "", //�룄硫붿씤
+ ispId : "",
+ ispName : "",
+ hostingName : "",
+ hostingId : "",
manager : "", //�떞�떦�옄
tel : "", //�쟾�솕踰덊샇
email : "", //�씠硫붿씪
+ url : "", // url
memo : "" //鍮꾧퀬
+ },
+ autoCompletePage : {
+ ispField : {
+ page : 0,
+ totalPage : 0
+ },
+ hostingField : {
+ page : 0,
+ totalPage : 0
+ }
}
};
+
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+
+
+ // ISP�젙蹂� autocomplete page �뾽�뜲�씠�듃
+ function getIssueIspFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.ispField.totalPage = result.data.page.totalPage;
+ }
+
+ // �샇�뒪�똿�젙蹂� autocomplete page �뾽�뜲�씠�듃
+ function getIssueHostingFieldListCallBack(result) {
+ $scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
+ }
// �뤌 泥댄겕
function formCheck(formInvalid) {
@@ -38,20 +64,41 @@
return false;
}
+ $scope.$on("ispFieldEvent", function (event, result) {
+ $scope.vm.form.ispId = result[0].id;
+ });
+
+ $scope.$on("hostingFieldEvent", function (event, result) {
+ $scope.vm.form.hostingId = result[0].id;
+ });
+
+
+
// �뤌 �쟾�넚
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, //�룄硫붿씤
+ ispId : (function () { // ISP �븘�씠�뵒
+ var ispId = -1;
+ if ($scope.vm.form.issueIspFields != null) {
+ ispId = $scope.vm.form.ispId;
+ }
+ return ispId;
+ })(),
+ hostingId : (function () { // Hosting �븘�씠�뵒
+ var hostingId = -1;
+ if ($scope.vm.form.issueHostingFields != null) {
+ hostingId = $scope.vm.form.hostingId;
+ }
+ return hostingId;
+ })(),
manager : $scope.vm.form.manager, //�떞�떦�옄
tel : $scope.vm.form.tel, //�쟾�솕踰덊샇
email : $scope.vm.form.email, //�씠硫붿씪
- desc : $scope.vm.form.desc //鍮꾧퀬
+ url : $scope.vm.form.url, // url
+ memo : $scope.vm.form.memo //鍮꾧퀬
};
CompanyField.add($resourceProvider.getContent(content,
@@ -77,9 +124,7 @@
$uibModalInstance.dismiss('cancel');
$(document).unbind("keydown"); // �떒異뺥궎 �씠踰ㅽ듃 �젣嫄�
}
-
}
-
]);
}
);
\ No newline at end of file
--
Gitblit v1.8.0