From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 수, 08 12월 2021 17:25:23 +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 | 89 +++++++++++++++++++++++++++++++------------- 1 files changed, 62 insertions(+), 27 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js index 1985f6c..18cb24a 100644 --- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js @@ -69,6 +69,7 @@ companyManager : "", // �뾽泥� �떞�떦�옄 companyTel : "", // �뾽泥� �쟾�솕踰덊샇 companyEmail : "", // �뾽泥� �씠硫붿씪 + companyUrl : "", // �뾽泥� url companyMemo : "", // �뾽泥� 鍮꾧퀬 ispId : -1, // ISP ID ispName : "", // ISP 紐� @@ -76,12 +77,14 @@ ispManager : "", // ISP �떞�떦�옄 ispTel : "", // ISP �쟾�솕踰덊샇 ispEmail : "", // ISP �씠硫붿씪 + ispUrl : "", // url ispMemo : "", // ISP 鍮꾧퀬 hostingId : -1, // �샇�뒪�똿 ID hostingName : "", // �샇�뒪�똿紐� 寃��깋 hostingManager : "", // �샇�뒪�똿 �떞�떦�옄 hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇 hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪 + hostingUrl : "", // url hostingMemo :"", // �샇�뒪�똿 鍮꾧퀬 autoCompletePage : { @@ -120,6 +123,18 @@ fileTableConfigs : [], // �뙆�씪 �뾽濡쒕뱶 �젙蹂� �뀒�씠釉� }; + // �뿰愿� �씪媛� 愿��젴 + $scope.vm.relationIssueTypes = + [ + { id: 0, name: $filter("translate")("issue.relationIssueType1") }, + { id: 1, name: $filter("translate")("issue.relationIssueType2") }, + { id: 2, name: $filter("translate")("issue.relationIssueType3") }, + { id: 3, name: $filter("translate")("issue.relationIssueType4") }, + { id: 4, name: $filter("translate")("issue.relationIssueType5") }, + { id: 5, name: $filter("translate")("issue.relationIssueType6") } + ]; + $scope.vm.relationIssueType = $scope.vm.relationIssueTypes[0]; + angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector})); function getStartProjectListCallback(result){ @@ -132,13 +147,15 @@ // �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦�옄 珥덇린�솕 $scope.$watch("vm.form.projects", function (newValue, oldValue) { + + if (angular.isDefined(newValue)) { if (newValue.length < 1) { $scope.vm.form.users = []; + } else { + // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲� + $scope.fn.getIssueTypeCustomFields(); } - - // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲� - $scope.fn.getIssueTypeCustomFields(); } }); @@ -376,6 +393,7 @@ $scope.vm.companyManager = result[0].manager; $scope.vm.companyTel = result[0].tel; $scope.vm.companyEmail = result[0].email; + $scope.vm.companyUrl = result[0].url; $scope.vm.companyMemo = result[0].memo; }); @@ -388,6 +406,7 @@ $scope.vm.ispManager = result[0].manager; $scope.vm.ispTel = result[0].tel; $scope.vm.ispEmail = result[0].email; + $scope.vm.ispUrl = result[0].url; $scope.vm.ispMemo = result[0].memo; }); @@ -399,6 +418,7 @@ $scope.vm.hostingManager = result[0].manager; $scope.vm.hostingTel = result[0].tel; $scope.vm.hostingEmail = result[0].email; + $scope.vm.hostingUrl = result[0].url; $scope.vm.hostingMemo = result[0].memo; }); @@ -492,6 +512,7 @@ manager : $scope.vm.companyManager, tel : $scope.vm.companyTel, email :$scope.vm.companyEmail, + url :$scope.vm.companyUrl, memo : $scope.vm.companyMemo }); } @@ -512,6 +533,7 @@ manager : $scope.vm.ispManager, tel : $scope.vm.ispTel, email :$scope.vm.ispEmail, + url :$scope.vm.ispUrl, memo : $scope.vm.ispMemo }; @@ -534,6 +556,7 @@ manager : $scope.vm.hostingManager, tel : $scope.vm.hostingTel, email :$scope.vm.hostingEmail, + url :$scope.vm.hostingUrl, memo : $scope.vm.hostingMemo }; } @@ -578,27 +601,27 @@ }, fileFormDataName : "file" }).then(function (result) { - if (result.data.message.status === "success") { - // �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬. - if ($scope.vm.infiniteAdd) { - $scope.fn.infiniteAddForm(); - } - else { - $scope.fn.cancel(); - - if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") { - $state.go("issues.list"); - } - } - - $rootScope.$broadcast("getIssueList", {}); + if (result.data.message.status === "success") { + // �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬. + if ($scope.vm.infiniteAdd) { + $scope.fn.infiniteAddForm(); } else { - SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣 + $scope.fn.cancel(); + + if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") { + $state.go("issues.list"); + } } - $rootScope.spinner = false; - }); + $rootScope.$broadcast("getIssueList", {}); + } + else { + SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣 + } + + $rootScope.spinner = false; + }); } // �뙘�뾽 李� �떕湲� @@ -686,9 +709,16 @@ if (result.data.message.status === "success") { + $scope.vm.form.issueCustomFields = []; angular.forEach(result.data.data, function (issueTypeCustomField) { switch (issueTypeCustomField.customFieldVo.customFieldType) { case "INPUT" : + case "NUMBER" : + case "DATETIME" : + case "IP_ADDRESS" : + case "EMAIL" : + case "SITE" : + case "TEL" : issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue; break; case "SINGLE_SELECT" : @@ -707,7 +737,6 @@ }); break; } - $scope.vm.form.issueCustomFields.push(issueTypeCustomField); }); } @@ -762,8 +791,11 @@ } function getPartners() { + if($scope.vm.form.issueTypeId === ""){ + $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id + } var content = { - issueTypeId : $scope.vm.form.issueTypeId + issueTypeId : $scope.vm.form.issueTypeId, }; Issue.findPartners($resourceProvider.getContent( content, @@ -788,15 +820,18 @@ // �쁽�옱 �봽濡쒖젥�듃 �꽕�젙 if ($rootScope.workProject != null && $rootScope.workProject.id > -1) { $scope.vm.projectName = $rootScope.workProject.name; - $scope.fn.projects = []; - $scope.fn.projects.push($rootScope.workProject); - $scope.fn.getProjectList($scope.vm.projectName, $scope.vm.form.projects, $scope.vm.autoCompletePage.project.page, getStartProjectListCallback); + $scope.vm.form.projects = []; + $scope.vm.form.projects.push($rootScope.workProject); } - + // �쁽�옱 �씠�뒋���엯 �쑀�삎 �꽕�젙 + var id = $rootScope.getCurrentIssueTypeId(); + if (id != null) { + $scope.vm.form.issueTypeId = id.toString(); + } $log.debug("promises 寃곌낵 ", results); }); } $scope.fn.startExecute(); }]); - }); + }); \ No newline at end of file -- Gitblit v1.8.0