From 8672cdbd8817957c1fb1996fb870e358c5b6022c Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 17 1월 2022 16:28:21 +0900 Subject: [PATCH] - 헤더에 일반 메일 보내기 기능 추가 - 업체 엑셀 다운로드 시 카테고리 항목들도 보여지도록 수정 --- src/main/webapp/scripts/app/common/common.controller.js | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js index d34e718..9097071 100644 --- a/src/main/webapp/scripts/app/common/common.controller.js +++ b/src/main/webapp/scripts/app/common/common.controller.js @@ -6,8 +6,8 @@ function (app, angular) { app.controller('commonController', ['$scope', '$rootScope', '$log', 'Auth', '$state', 'User', '$resourceProvider', '$uibModal', 'SweetAlert', 'Workspace', '$translate', '$q', - '$interval', 'IssueSearch', '$filter', 'Notice', 'Project', 'IssueType', - function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $interval, IssueSearch, $filter, Notice, Project, IssueType) { + '$controller', '$injector', '$interval', 'IssueSearch', '$filter', 'Notice', 'Project', 'IssueType', + function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $controller, $injector, $interval, IssueSearch, $filter, Notice, Project, IssueType) { $scope.fn = { logout: logout, // 濡쒓렇�븘�썐 @@ -24,7 +24,8 @@ findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲� changeIssueListMenu : changeIssueListMenu, setLastIssueType : setLastIssueType, - searchAll : searchAll // �긽�떒 寃��깋 + searchAll : searchAll, // �긽�떒 寃��깋 + sendCommonMail : sendCommonMail }; $scope.vm = { @@ -35,6 +36,8 @@ keyWord : "" } }; + + angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector})); // �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎. $scope.$on("makeIssueSearch", function (event, args) { @@ -66,6 +69,21 @@ } }); + // �씪諛� 硫붿씪 諛쒖넚 (�궗�슜�옄 吏곸젒 �옉�꽦) + function sendCommonMail() { + $uibModal.open({ + templateUrl : 'views/issue/issueCommonSendMail.html', + size : "md", + controller : 'issueCommonSendMailController', + backdrop : 'static', + resolve : { + parameter : { + issueId : null, + } + } + }); + } + // 硫붿씤 �긽�떒 寃��깋 function searchAll() { if ($rootScope.isDefined($scope.vm.searchAll.keyWord)) { -- Gitblit v1.8.0