From 743fb98986d528be8b3b5bfd6d99fb1cabcd82b9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 21:44:45 +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 | 78 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index cc4ba3a..6d498ec 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -37,7 +37,8 @@
setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲�
startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
containsPartner : containsPartner,
- getPartners : getPartners
+ getPartners : getPartners,
+ getDepartments : getDepartments,
};
$scope.vm = {
@@ -58,7 +59,8 @@
attachedFiles : [], // �꽟癒몃끂�듃濡� �뙆�씪 �뾽濡쒕뱶瑜� �븷 寃쎌슦 �꽌踰꾩뿉�꽌 pk瑜� �뵲怨� issue id�� �뿰�룞 �옉�뾽�씠 �븘�슂�븯�떎.
startCompleteDateRange : "", // �떆�옉�씪 ~ 醫낅즺�씪
detectingDateRange : "", // �깘吏��씪
- issueCustomFields : [] // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
+ issueCustomFields : [], // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
+ issueStatusId: ""
},
infiniteAdd : false, // �뿰�냽 �깮�꽦
projectName : "", // �봽濡쒖젥�듃 紐� 寃��깋
@@ -399,6 +401,24 @@
$scope.vm.companyUrl = result[0].url;
$scope.vm.companyMemo = result[0].memo;
+ $scope.vm.ispId = "";
+ $scope.vm.ispName = "";
+ $scope.vm.ispCode = "";
+ $scope.vm.ispManager = "";
+ $scope.vm.ispTel = "";
+ $scope.vm.ispEmail = "";
+ $scope.vm.ispUrl = "";
+ $scope.vm.ispMemo = "";
+
+ $scope.vm.hostingId = "";
+ $scope.vm.hostingName = "";
+ $scope.vm.hostingCode = "";
+ $scope.vm.hostingManager = "";
+ $scope.vm.hostingTel = "";
+ $scope.vm.hostingEmail = "";
+ $scope.vm.hostingUrl = "";
+ $scope.vm.hostingMemo = "";
+
if (ispFieldVo != null){
$scope.vm.ispId = ispFieldVo.id;
$scope.vm.ispName = ispFieldVo.name;
@@ -530,12 +550,10 @@
return attachedFileIds;
})(),
-
issueCompanyFields : (function () {
var issueCompanyFields = [];
if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0 ){
var companyField = $scope.vm.form.issueCompanyFields[0];
-
issueCompanyFields.push({
companyId : $scope.vm.companyId,
name : $scope.vm.companyName,
@@ -546,9 +564,14 @@
memo : $scope.vm.companyMemo
});
}
-
return issueCompanyFields;
})(),
+ companyName : $scope.vm.companyName,
+ companyManager : $scope.vm.companyManager,
+ companyTel : $scope.vm.companyTel,
+ companyEmail :$scope.vm.companyEmail,
+ companyUrl :$scope.vm.companyUrl,
+ companyMemo : $scope.vm.companyMemo,
issueIspFields : (function () {
var issueIspFields = [];
@@ -556,7 +579,6 @@
&& $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
|| $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
var ispField = $scope.vm.form.issueIspFields[0];
-
issueIspFields.push({
ispId : $scope.vm.ispId,
name : $scope.vm.ispName,
@@ -567,11 +589,16 @@
url :$scope.vm.ispUrl,
memo : $scope.vm.ispMemo
});
-
}
-
return issueIspFields;
})(),
+ ispName : $scope.vm.ispName,
+ ispCode : $scope.vm.ispCode,
+ ispManager : $scope.vm.ispManager,
+ ispTel : $scope.vm.ispTel,
+ ispEmail :$scope.vm.ispEmail,
+ ispUrl :$scope.vm.ispUrl,
+ ispMemo : $scope.vm.ispMemo,
issueHostingFields : (function () {
var issueHostingFields = [];
@@ -579,7 +606,6 @@
&& $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
|| $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
var hostingField = $scope.vm.form.issueHostingFields[0];
-
issueHostingFields[0] = {
hostingId : $scope.vm.hostingId,
name : $scope.vm.hostingName,
@@ -593,6 +619,13 @@
}
return issueHostingFields;
})(),
+ hostingName : $scope.vm.hostingName,
+ hostingCode : $scope.vm.hostingCode,
+ hostingManager : $scope.vm.hostingManager,
+ hostingTel : $scope.vm.hostingTel,
+ hostingEmail :$scope.vm.hostingEmail,
+ hostingUrl :$scope.vm.hostingUrl,
+ hostingMemo : $scope.vm.hostingMemo,
startCompleteDateRange : $scope.vm.form.startCompleteDateRange,
detectingDateRange : $scope.vm.form.detectingDateRange,
@@ -632,6 +665,7 @@
fileFormDataName : "file"
}).then(function (result) {
if (result.data.message.status === "success") {
+
// �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬.
if ($scope.vm.infiniteAdd) {
$scope.fn.infiniteAddForm();
@@ -640,7 +674,9 @@
$scope.fn.cancel();
if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
- $state.go("issues.list");
+ $state.go($state.current, {}, {reload : true});
+ // $state.go("issues.list");
+ // $state.go("dashboards.dashboard")
}
}
@@ -834,6 +870,25 @@
$scope.vm.partnerVos = result.data.data;
}
});
+ }
+
+ function getDepartments() {
+ if($scope.vm.form.issueTypeId === ""){
+ $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+ }
+ var content = {
+ issueTypeId : $scope.vm.form.issueTypeId,
+ };
+ Issue.findReadyDepartments($resourceProvider.getContent(
+ content,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+ if (result.data.message.status === "success") {
+ angular.forEach(result.data.data, function (department) {
+ department.byName = department.departmentName;
+ $scope.vm.form.departments.push(department);
+ });
+ }
+ });
}
@@ -844,7 +899,8 @@
getIssueTypes : $scope.fn.getIssueTypes(),
getPriorities : $scope.fn.getPriorities(),
getSeverities : $scope.fn.getSeverities(),
- getPartners : $scope.fn.getPartners()
+ getPartners : $scope.fn.getPartners(),
+ getDepartments : $scope.fn.getDepartments()
};
$q.all(promises).then(function (results) {
// �쁽�옱 �봽濡쒖젥�듃 �꽕�젙
--
Gitblit v1.8.0