From a42f592181c23cb1d84d5b66b4b165aa855d57e2 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 01 12월 2021 11:06:42 +0900
Subject: [PATCH] - api 이슈 추가 기능 완료
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 106 +++++++++++++++++++++++++----------------------------
1 files changed, 50 insertions(+), 56 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index cb2300e..fe209d8 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -9,8 +9,8 @@
],
function (app, angular) {
app.controller('issueDetailController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$tableProvider', '$state', '$uibModal', '$q',
- '$controller', '$injector', 'SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'Priority', 'Severity','IssueStatus', 'HostingField', 'IssueTableConfig', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, Priority, Severity, IssueStatus, HostingField, IssueTableConfig, $filter) {
+ '$controller', '$injector', 'SweetAlert', '$timeout', 'Issue', 'IssueComment', 'IssueRelation', 'AttachedFile', 'Priority', 'Severity','IssueStatus', 'IssueTableConfig', '$filter',
+ function ($scope, $rootScope, $log, $resourceProvider, $tableProvider, $state, $uibModal, $q, $controller, $injector, SweetAlert, $timeout, Issue, IssueComment, IssueRelation, AttachedFile, Priority, Severity, IssueStatus, IssueTableConfig, $filter) {
// IssueListController vm, fn 蹂��닔 �긽�냽.
@@ -42,10 +42,10 @@
$scope.fn.getRelTableConfigs = getRelTableConfigs;
$scope.fn.getDownTableConfigs = getDownTableConfigs;
$scope.fn.containsPartner = containsPartner;
- $scope.fn.getPartners = getPartners;
+ $scope.fn.onActivate = onActivate;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
- $scope.vm.viewer = [];
+ $scope.vm.viewer = {};
$scope.vm.images = []; // 泥⑤��맂 �뙆�씪 以� �씠誘몄� �뙆�씪
$scope.vm.activeTab = "ALL"; // �솢�룞 �궡�뿭 �꺆
// �씠�뒋 �긽�깭 蹂�寃� �몴�떆 �뿬遺�
@@ -86,6 +86,7 @@
$scope.vm.issueName = ""; // �꽑�깮�맂 �뿰愿� �씪媛� �씠由�
$scope.vm.issueId = ""; //
+ $scope.vm.issueTypeId = "";
$scope.vm.autoCompletePage = {
issue : {
page : 0,
@@ -111,8 +112,13 @@
function changeDetailView(issue) {
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- // $rootScope.$broadcast("makeIssueSearch", issue);
+ //$rootScope.$broadcast("makeIssueSearch",issue);
$scope.$parent.tableEvent.changeDetailView(issue.id);
+ $scope.fn.onActivate();
+ }
+
+ function onActivate() {
+ window.scroll(0,240);
}
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
@@ -280,14 +286,6 @@
.setDAlign("text-center")
.setDName("modifyDate"));
break;
- // default :"ISSUE_RELATION_DELETE" // �뿰愿� �궘�젣
- // $scope.vm.relTableConfigs.push($tableProvider.config()
- // .setHName("issue.downIssueTitle")
- // .setDType("renderer")
- // .setHWidth("bold" + issueTableConfig.width)
- // .setHSort(false)
- // .setDRenderer("ISSUE_RELATION_DELETE"));
- // break;
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
@@ -582,9 +580,6 @@
});
}
-
-
-
// �뿰愿� �씠�뒋 異붽�
function addRelationIssue() {
if ($scope.vm.issueName.length == 0 || $scope.vm.form.issues.length == 0
@@ -657,6 +652,7 @@
$scope.vm.editor.issueStatus = false;
$scope.vm.issueForm.issueStatusList = [];
$scope.vm.issueForm.issueStatusId = "";
+ $scope.vm.issueTypeId = $rootScope.getCurrentIssueTypeId();
/*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
$scope.$apply();
}*/
@@ -750,6 +746,7 @@
return {
issueTypeId : $scope.vm.viewer.issueTypeVo.id
};
+
}
}
});
@@ -783,6 +780,21 @@
});
}
+ // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤
+ function containsPartner(name) {
+ var result = false;
+
+ if ($scope.vm.viewer.usePartnerVos != null) {
+ $scope.vm.viewer.usePartnerVos.forEach(function (partnerVo) {
+ if (name === partnerVo.name) {
+ result = true;
+ }
+ });
+ }
+ return result;
+
+ }
+
// �씠�뒋 �긽�꽭 �젙蹂� 議고쉶
function getIssueDetail() {
// 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
@@ -792,13 +804,12 @@
$scope.fn.getDownTableConfigs();
Issue.detail($resourceProvider.getContent(
- {id : $scope.vm.viewer.id, deep : "02"},
+ {id : $scope.vm.viewer.id, deep : "02", customFields : $scope.vm.customFields},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
if (angular.isDefined(result.data.data)) {
$scope.vm.viewer = angular.copy(result.data.data);
-
// �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲�
$scope.fn.makePreviewImages(result.data.data.attachedFileVos);
// �솢�룞 �씠�젰 留뚮뱾湲�
@@ -820,16 +831,19 @@
$scope.vm.form.issuesDown.push(result.data.data);
// �뿰愿� �씠�뒋 諛섎났臾�
- angular.forEach(result.data.data.issueRelationVos, function (issueRelationVo){
- issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name;
- $scope.vm.form.issues.push(issueRelationVo.issueRelation);
- });
+ if (result.data.data.issueRelationVos !== null) {
+ angular.forEach(result.data.data.issueRelationVos, function (issueRelationVo){
+ issueRelationVo.relationIssueTypeName = $scope.vm.relationIssueTypes[issueRelationVo.relationIssueType].name;
+ $scope.vm.form.issues.push(issueRelationVo.issueRelation);
+ });
+ }
// �븯�쐞 �씠�뒋 諛섎ぉ臾�
- angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
- $scope.vm.form.issuesDown.push(issueDownVo.issue);
- });
-
+ if (result.data.data.issueDownVos !== null){
+ angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
+ $scope.vm.form.issuesDown.push(issueDownVo.issue);
+ });
+ }
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
}
@@ -840,25 +854,8 @@
});
}
-
// ===================================================================================
- // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤
- function containsPartner(name) {
- var result = false;
- // �씪�떒 viewer瑜� 留⑥쐞�뿉 �꽑�뼵�빐 {} �씠�젃寃� �꽑�뼵�빐 �몢�뿀�뒗�뜲 媛믩뱾�씠 �뼱�뼡�떇�쑝濡� 蹂��솚�씠 �맟�뒗吏��뒗
- // 紐곕씪�꽌 諛곗뿴濡� �꽆�뼱���꽌 珥덇린媛믪쓣 諛곗뿴濡� 諛붽씀�뿀�뜑�땲 �씠�뒋 �긽�꽭�뿉�꽌�뒗 蹂댁씤�떎
- // �씠�젣 �씠�뒋 異붽��뿉�꽌 媛믪씠 �뼱�뼸寃� �꽆�뼱�삤�뒗吏� �솗�씤�빐蹂댁옄!
- if ($scope.vm.viewer.usePartnerVos != null) {
- $scope.vm.viewer.usePartnerVos.forEach(function (partnerVo) {
- if (name === partnerVo.name) {
- result = true;
- }
- });
- }
- return result;
-
- }
// �씠�뒋 �씠誘몄� 誘몃━ 蹂닿린 留뚮뱾湲�
function makePreviewImages(attachedFileVos) {
// 誘몃━蹂닿린 �씠誘몄� 珥덇린�솕
@@ -885,6 +882,12 @@
switch (issueTypeCustomField.customFieldVo.customFieldType) {
case "INPUT" :
case "SINGLE_SELECT" :
+ case "NUMBER" :
+ case "DATETIME" :
+ case "IP_ADDRESS" :
+ case "EMAIL" :
+ case "SITE" :
+ case "TEL" :
issueTypeCustomField.useValues = "";
break;
@@ -1035,18 +1038,6 @@
});
}
- function getPartners() {
-
- HostingField.getPartnerList($resourceProvider.getContent(
- {},
- $resourceProvider.getPageContent(0, 1))).then(function (result) {
- if (result.data.message.status === "success") {
- $scope.vm.partnerVos = result.data.data.usePartnerVos;
- }
- });
-
- }
-
// �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋瑜� 硫붿씪濡� 諛쒖넚
function sendMail(issueId, projectId) {
$uibModal.open({
@@ -1057,6 +1048,10 @@
resolve : {
parameter : function () {
return {
+ departmentVos : [$scope.vm.form.issues[0].departmentVos],
+ issueCompanyFields : [$scope.vm.form.issues[0].issueCompanyVos],
+ issueIspFields : [$scope.vm.form.issues[0].issueIspVos],
+ issueHostingFields : [$scope.vm.form.issues[0].issueHostingVos],
issueId : issueId,
projectId : projectId
};
@@ -1098,7 +1093,6 @@
}
});
}
-
}
]);
}
--
Gitblit v1.8.0