From d31323b4a8a314f010c54d8d9b502126a079eb67 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 17:11:59 +0900
Subject: [PATCH] 대시보드 - 멤버별 진행률 하위 프로젝트와 합쳐서 보여주는 함수 생성 및 파트너리스트 사이드바 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 101 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 66 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 2a82faf..955bfbb 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -42,6 +42,8 @@
$scope.fn.getRelTableConfigs = getRelTableConfigs;
$scope.fn.getDownTableConfigs = getDownTableConfigs;
$scope.fn.containsPartner = containsPartner;
+ $scope.fn.onActivate = onActivate;
+ $scope.fn.makePartnersEmail = makePartnersEmail;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -71,7 +73,10 @@
$scope.vm.form = {
issues : [], //�뿰愿� �씪媛�
- issuesDown : [] // �븯�쐞 �씪媛�
+ issuesDown : [], // �븯�쐞 �씪媛�
+ issueCompanyVos : [],
+ issueIspVos : [],
+ issueHostingVos : []
};
@@ -85,6 +90,7 @@
$scope.vm.issueName = ""; // �꽑�깮�맂 �뿰愿� �씪媛� �씠由�
$scope.vm.issueId = ""; //
+ $scope.vm.issueTypeId = "";
$scope.vm.autoCompletePage = {
issue : {
page : 0,
@@ -110,8 +116,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}));
@@ -279,14 +290,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;
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 而щ읆
@@ -581,9 +584,6 @@
});
}
-
-
-
// �뿰愿� �씠�뒋 異붽�
function addRelationIssue() {
if ($scope.vm.issueName.length == 0 || $scope.vm.form.issues.length == 0
@@ -640,25 +640,35 @@
}
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
- $rootScope.$on("getIssueDetail", function (event, args) {
- $scope.vm.viewer.id = args["id"];
- $scope.fn.getIssueDetail();
- });
+ // $rootScope.$on("getIssueDetail", function (event, args) {
+ // $scope.vm.viewer.id = args["id"];
+ // $scope.fn.getIssueDetail();
+ // });
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
- $scope.$on("getIssueDetail", function (event, args) {
- $scope.vm.viewer.id = args["id"];
- $scope.fn.getIssueDetail();
- });
+ // $scope.$on("getIssueDetail", function (event, args) {
+ // $scope.vm.viewer.id = args["id"];
+ // $scope.fn.getIssueDetail();
+ // });
+
+ $scope.$watch(function() {
+ return $rootScope.currentDetailIssueId;
+ }, function() {
+ if ($rootScope.currentDetailIssueId != null) {
+ $scope.vm.viewer.id = $rootScope.currentDetailIssueId;
+ $scope.fn.getIssueDetail();
+ }
+ }, true);
// 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
function initReload() {
$scope.vm.editor.issueStatus = false;
$scope.vm.issueForm.issueStatusList = [];
$scope.vm.issueForm.issueStatusId = "";
- /*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
- $scope.$apply();
- }*/
+ $scope.vm.issueTypeId = $rootScope.getCurrentIssueTypeId();
+ // if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
+ // $scope.$apply();
+ // }
}
// �씠�뒋 �긽�깭 蹂�寃�
@@ -834,18 +844,25 @@
$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;
+
+ if ($rootScope.workProject.id > -1) {
+ $rootScope.changeLastProject(result.data.data.projectVo.id);
+ }
}
}
else {
@@ -882,6 +899,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;
@@ -1032,8 +1055,15 @@
});
}
+ // �뾽泥�/ISP/�샇�뒪�똿 諛곗뿴媛믪쓣 �븯�굹濡� �빀爾먯꽌 硫붿씪 �겢由��떆 �쟾�떖
+ function makePartnersEmail() {
+ $scope.vm.form.partnersEmail = $scope.vm.viewer.issueCompanyVos.concat($scope.vm.viewer.issueIspVos, $scope.vm.viewer.issueHostingVos)
+ return $scope.vm.form.partnersEmail;
+ }
+
// �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋瑜� 硫붿씪濡� 諛쒖넚
function sendMail(issueId, projectId) {
+ makePartnersEmail();
$uibModal.open({
templateUrl : 'views/issue/issueSendMail.html',
size : "md",
@@ -1043,11 +1073,12 @@
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],
+ partners : $scope.vm.form.partnersEmail,
issueId : issueId,
projectId : projectId
+ // issueCompanyFields : [$scope.vm.viewer.issueCompanyVos[0]],
+ // issueIspFields : [$scope.vm.viewer.issueIspVos[0]],
+ // issueHostingFields : [$scope.vm.viewer.issueHostingVos[0]],
};
}
}
--
Gitblit v1.8.0