OWL ITS + 탐지시스템(인터넷 진흥원)
wyu
2021-12-01 7476ad22442c349f0751709957fee068d463980a
이슈 수정 오류 및 메일 보내기 템플릿 이미지 추가
6개 파일 변경됨
67 ■■■■■ 파일 변경됨
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java 9 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/web/controller/IssueController.java 3 ●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/assets/styles/main.css 20 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueDetail.controller.js 7 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js 16 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/webapp/views/issue/issueSendMailPartners.html 12 ●●●●● 패치 | 보기 | raw | blame | 히스토리
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1819,6 +1819,10 @@
        for(IssueIsp issueIsp : issue.getIssueIspFields()){
            IssueIspVo issueIspVo = ConvertUtil.copyProperties(issueIsp, IssueIspVo.class);
            issueIspVo.setId(issueIsp.getId());
            IspField ispField = issueIsp.getIspField();
            if (ispField != null) {
                issueIspVo.setIspId(ispField.getId());
            }
            issueIspVos.add(issueIspVo);
        }
        issueVo.setIssueIspVos(issueIspVos);
@@ -1831,6 +1835,11 @@
        for(IssueHosting issueHosting : issue.getIssueHostingFields()){
            IssueHostingVo issueHostingVo = ConvertUtil.copyProperties(issueHosting, IssueHostingVo.class);
            issueHostingVo.setId(issueHosting.getId());
            HostingField hostingField = issueHosting.getHostingField();
            if (hostingField != null) {
                issueHostingVo.setHostingId(hostingField.getId());
            }
            issueHostingVos.add(issueHostingVo);
        }
        issueVo.setIssueHostingVos(issueHostingVos);
src/main/java/kr/wisestone/owl/web/controller/IssueController.java
@@ -31,7 +31,8 @@
@Controller
public class IssueController extends BaseController {
    private static final Logger log = LoggerFactory.getLogger(IssueController.class);
    private static final Logger
            log = LoggerFactory.getLogger(IssueController.class);
    @Autowired
    private IssueService issueService;
src/main/webapp/assets/styles/main.css
@@ -30237,4 +30237,24 @@
    margin-right: 1rem;
}
.TemplateIMG {
    height: 50px;
    width: 50px;
}
.TemplateIMG-selected {
    border: 2px solid #0066ff;
}
.TemplateIMG:active {
    border: 2px solid #0066ff;
}
.TemplateIMG:visited {
    border: 2px solid #0066ff;
}
.Template-area {
    text-align: center;
}
/* 간트차트 end */
src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -131,6 +131,13 @@
                angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
                //  이슈 목록 데이터 갱신
                $scope.$on("getIssueList", function () {
                    $scope.fn.getIssueDetail();
                });
                // 하위 이슈 삭제
                function removeDownIssue(id) {
                    //  삭제 알림
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -15,6 +15,7 @@
                    removeMailTarget : removeMailTarget,
                    formSubmit : formSubmit,    //  폼 전송
                    formCheck : formCheck,   //  폼 체크
                    changeTemplate : changeTemplate
                };
                $scope.vm = {
@@ -59,7 +60,6 @@
                // 업체/ISP/호스팅 이메일 폼 전송
                function formSubmit() {
                    $rootScope.spinner = true;
                    var content = {
                        id : $scope.vm.form.id,
                        template : $scope.vm.form.template,
@@ -121,5 +121,19 @@
                    return deferred.promise;
                }
                function changeTemplate(templateId){
                    $scope.vm.form.template = templateId;
                    // var matches = document.getElementsByClassName('TemplateIMG');
                    var elements = document.getElementsByClassName("TemplateIMG");
                    for (let i = elements.length - 1; i >= 0; i--) {
                        if (elements[i].id === templateId) {
                            elements[i].className += " TemplateIMG-selected";
                        } else {
                            elements[i].className = "TemplateIMG";
                        }
                    }
                }
            }]);
    });
src/main/webapp/views/issue/issueSendMailPartners.html
@@ -32,10 +32,14 @@
                                       input-disabled="vm.form.mailUsers == null"
                                       extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile',
                                       type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
                <input ng-model="vm.form.template" value="ISSUE_SEND_1" type="radio">1
                <input ng-model="vm.form.template" value="ISSUE_SEND_2" type="radio">2
                <input ng-model="vm.form.template" value="ISSUE_SEND_3" type="radio">3
                    <div class="Template-area mt-20">
                        <label class="issue-detail-label">이메일 템플릿
                            <div class="mt-20">
                                <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/btn_naver.PNG" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
                                <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/btn_google.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
                                <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/btn_kakao.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
                            </div>
                    </div>
            </div>
        </form>
    </div>