From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 9789935..c81b38c 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -44,6 +44,7 @@
getChildSectorListCallBack : getChildSectorListCallBack,
getRegionListCallBack : getRegionListCallBack,
getStatusListCallBack : getStatusListCallBack,
+ getIssueTypeOfProject : getIssueTypeOfProject
};
$scope.vm = {
@@ -200,6 +201,8 @@
} else {
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲�
$scope.fn.getIssueTypeCustomFields();
+ // �꽑�깮�븳 �봽濡쒖젥�듃�뿉 �냽�빐�엳�뒗 �씠�뒋�쑀�삎留� 蹂댁뿬二쇨린
+ $scope.fn.getIssueTypeOfProject();
}
}
});
@@ -543,6 +546,27 @@
$scope.vm.hostingMemo = result[0].memo;
});
+ $scope.$on("companyTypeEvent", function (event, result) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ });
+ $scope.$on("parentSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ }
+
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ $scope.vm.form.childSectorId = result[0].id;
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ $scope.vm.form.regionId = result[0].id;
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ $scope.vm.form.statusId = result[0].id;
+ });
+
// �뤌 �쟾�넚
function formSubmit() {
$rootScope.spinner = true;
@@ -631,7 +655,6 @@
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,
@@ -640,11 +663,11 @@
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
memo : $scope.vm.companyMemo,
- companyTypeId : companyField.companyTypeId,
- parentSectorId : companyField.parentSectorId,
- childSectorId : companyField.childSectorId,
- regionId : companyField.regionId,
- statusId : companyField.statusId
+ companyTypeId : $scope.vm.form.companyTypeId,
+ parentSectorId : $scope.vm.form.parentSectorId,
+ childSectorId : $scope.vm.form.childSectorId,
+ regionId : $scope.vm.form.regionId,
+ statusId : $scope.vm.form.statusId
});
}
return issueCompanyFields;
@@ -821,6 +844,10 @@
function getIssueTypes() {
var deferred = $q.defer();
+ if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
+ return;
+ }
+
IssueType.find($resourceProvider.getContent({},
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
@@ -837,6 +864,26 @@
return deferred.promise;
}
+ // �꽑�깮�븳 �봽濡쒖젥�듃�뿉 �냽�빐�엳�뒗 �씠�뒋�쑀�삎留� 蹂댁뿬二쇨린 (�쟾泥� �봽濡쒖젥�듃 �씪 寃쎌슦)
+ function getIssueTypeOfProject() {
+ var deferred = $q.defer();
+
+ IssueType.find($resourceProvider.getContent({projectId : $scope.vm.form.projects[0].id},
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.vm.issueTypes = result.data.data;
+ }
+ else {
+ SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // �씠�뒋 ���엯 紐⑸줉 議고쉶 �떎�뙣
+ }
+
+ deferred.resolve(result.data.data);
+ });
+
+ return deferred.promise;
+ }
+
// �슦�꽑�닚�쐞 紐⑸줉
function getPriorities() {
var deferred = $q.defer();
--
Gitblit v1.8.0