From 145928e42a8ae18129fcbc720824a9e4f78999bd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 17 12월 2021 17:23:03 +0900
Subject: [PATCH] 상위이슈의 상세페이지에서 하위이슈에 대한 활동내역 보여주기
---
src/main/webapp/views/issue/issueDetail.html | 378 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 291 insertions(+), 87 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 5b82040..6afd634 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -86,8 +86,8 @@
<!-- �긽�꽭 �솕硫� -->
<div class="support-ticket-content-w" ng-controller="issueDetailController">
<div class="support-ticket-content">
- <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : vm.viewer.issueStatusVo.color, 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">
- <span>�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
+ <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : '#353535', 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">
+ <span class="cursor" ng-click="fn.issueBack()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
</span>
<div class="">
@@ -97,13 +97,13 @@
<span class="ticket-header">
<div class="tasks-header-w">
<span class="tags">
- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>
+ <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}} <span ng-if="vm.viewer.isApi == 'Y'">/</span> <span ng-if="vm.viewer.isApi == 'Y'" class="badge" ng-style="{'background-color' : '#EF8D9A', 'border-color' : '#EF8D9A', 'color' : '#FFFFFF' }">API</span></span>
</span>
</div>
</span>
<a class="show-ticket-info cursor">
- <i class="os-icon os-icon-email-forward mr-20" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)" data-toggle="tooltip" data-placement="right" title="�떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 蹂대궡湲�"></i>
+ <i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="�떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 蹂대궡湲�"></i>
<i class="os-icon os-icon-airplay mr-20" ng-click="fn.versionView(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 蹂�寃� �씠�젰 �긽�꽭 蹂닿린"></i>
<i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 諛쒖깮 �삁�빟 �븯湲�"></i>
@@ -139,6 +139,7 @@
<span ng-if="vm.viewer.departmentVos.length < 1" translate="common.noDepartment">�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.</span>
<i class="fa fa-edit fa-2x issue-status-edit cursor"
+ ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.modifyIssueDepartment()" data-toggle="tooltip" data-placement="right" title="�떞�떦�옄 蹂�寃� �븯湲�"></i>
</div>
</div>
@@ -165,12 +166,12 @@
<div class="col-md-4">
<div class="form-group">
<label class="issue-detail-label"><span translate="common.importance">以묒슂�룄</span></label>
- <label class="issue-detail-label offset-1"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
- <label class="issue-detail-label offset-1"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
+ <label class="issue-detail-label offset-detail-2"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
+ <label class="issue-detail-label offset-detail-1"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
<div class="">
<span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.severityVo.name}}"></span>
- <span class="badge offset-1" ng-style="{'background-color' : vm.viewer.priorityVo.color, 'border-color' : vm.viewer.priorityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.priorityVo.name}}"></span>
+ <span class="badge offset-detail-4" ng-style="{'background-color' : vm.viewer.priorityVo.color, 'border-color' : vm.viewer.priorityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.priorityVo.name}}"></span>
<!-- 沅뚰븳�쓣 媛뽮퀬 �엳�쓣 �븣 -->
<span ng-if="vm.viewer.modifyPermissionCheck">
@@ -188,7 +189,8 @@
<div class="row">
<div class="col-md-4">
<div class="form-group">
- <h6 class="info_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
+ <h6 class="info_detail_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
+ <span class="issue-detail-label" style="position: relative; top: 1rem" ng-show="vm.viewer.issueCustomFields == ''">�궗�슜�옄 �젙�쓽 �븘�뱶媛믪씠 �뾾�뒿�땲�떎.</span>
</div>
</div>
</div>
@@ -196,7 +198,6 @@
<div class="row">
<div class="col-md-2" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">
<label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label>
-
<div ng-switch on="issueCustomField.customFieldVo.customFieldType">
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
@@ -204,6 +205,43 @@
<span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
<span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
+
+ <div ng-switch-when="NUMBER">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="DATETIME">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="IP_ADDRESS">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="SITE">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="TEL">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
@@ -217,9 +255,18 @@
ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
<span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
+
</div>
+
+ </div>
+ <!--�씠誘몄� 誘몃━蹂닿린-->
+ <div class="col-md-2">
+ <issue-detail-image-preview images="vm.images"></issue-detail-image-preview>
+ </div>
+ <div ng-show="vm.images.length < 1" class="detail-not-elements width-100">
</div>
</div>
+
<!-- <div class="">
<label class="issue-detail-label"><span>{{vm.viewer.issueCustomFieldValueVos[0].useValue}}</span> </label>
@@ -230,15 +277,16 @@
</div>-->
<hr>
<!-- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>-->
- <div class="row">
+ <div class="issue-detail-label">
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-sm-2">
<div class="form-group">
- <h6 class="info_font" translate="companyField.info">�뾽泥댁젙蹂�</h6>
+ <h6 class="info_detail_font" translate="companyField.info">�뾽泥댁젙蹂�</h6>
</div>
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-sm-2">
<div class="form-group">
<span translate="companyField.companyName">�뾽泥대챸</span>:
@@ -268,7 +316,16 @@
<div class="form-group">
<div class="">
<span translate="companyField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueCompanyVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueCompanyVos)">{{vm.viewer.issueCompanyVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.url">url</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].url}}</span>
</div>
</div>
</div>
@@ -282,16 +339,17 @@
</div>
</div>
</div>
-
- <div class="row">
+ </div>
+ <div class="issue-detail-label">
+ <div ng-show="fn.containsPartner('ISP');" class="row">
<div class="col-sm-2">
<div class="form-group">
- <h6 class="info_font" translate="ispField.info">ISP�젙蹂�</h6>
+ <h6 class="info_detail_font" translate="ispField.info">ISP�젙蹂�</h6>
</div>
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('ISP');" class="row">
<div class="col-sm-2">
<div class="form-group">
<span translate="ispField.ispName">ISP紐�</span>:
@@ -328,7 +386,16 @@
<div class="form-group">
<div class="">
<span translate="ispField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueIspVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueIspVos)">{{vm.viewer.issueIspVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.url">url</span>:
+ <span>{{vm.viewer.issueIspVos[0].url}}</span>
</div>
</div>
</div>
@@ -342,16 +409,18 @@
</div>
</div>
</div>
-
- <div class="row">
+ </div>
+ <div class="issue-detail-label">
+ <div ng-show="fn.containsPartner('�샇�뒪�똿');" class="row">
<div class="col-sm-2">
<div class="form-group">
- <h6 class="info_font" translate="hostingField.info">�샇�뒪�똿�젙蹂�</h6>
+ <h6 class="info_detail_font" translate="hostingField.info">�샇�뒪�똿�젙蹂�</h6>
</div>
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('�샇�뒪�똿');" class="row">
+
<div class="col-sm-2">
<div class="form-group">
<span translate="hostingField.hostingName">�샇�뒪�똿紐�</span>:
@@ -388,7 +457,16 @@
<div class="form-group">
<div class="">
<span translate="hostingField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueHostingVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueHostingVos)">{{vm.viewer.issueHostingVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.url">url</span>:
+ <span>{{vm.viewer.issueHostingVos[0].url}}</span>
</div>
</div>
</div>
@@ -402,22 +480,21 @@
</div>
</div>
</div>
-
-
+ </div>
<div class="row mt-30">
<div class="col-md-10">
- <span class="info_font h3" translate="issue.relationIssue">�뿰愿� �씠�뒋</span>
+ <span class="info_detail_font h3" translate="issue.relationIssue">�뿰愿� �씠�뒋</span>
</div>
<div class="col-md-1">
- <button class="btn btn-darkgrey offset-12" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
+ <button class="btn btn-darkgrey offset-10" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
</div>
</div>
<!-- �뿰愿� �씠�뒋 �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
<js-table data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
- event="relTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
+ event="relTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
<div class="row">
<div class="col-sm-4">
@@ -435,7 +512,7 @@
<js-autocomplete-single data-input-name="issue"
selected-model="vm.form.issues"
search="vm.issueName"
- source="fn.getIssueList(vm.issueName, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"
+ source="fn.getIssueList(vm.issueName, vm.issueTypeId, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"
page="vm.autoCompletePage.issue.page"
total-page="vm.autoCompletePage.issue.totalPage"
input-disabled="false"
@@ -443,35 +520,48 @@
extra-settings="{ displayProp : 'title' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : true, stopRemoveBodyEvent : true }"></js-autocomplete-single>
</div>
- <div class="col-auto vertical-middle">
- <button type="button" class="btn btn-primary form-control input-sm"
+ <div class="col-auto vertical-middle" style="display: flex">
+ <button type="button" class="btn btn-primary"
+ ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.addRelationIssue()"
translate="issue.addRelationIssue">�뿰愿� �씠�뒋 異붽�</button>
+ <button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1"
+ ng-if="vm.viewer.modifyPermissionCheck"
+ ng-click="fn.addRelationIssueForm(vm.viewer.id)">
+ <i class="os-icon os-icon-plus"><span></span></i>
+ </button>
</div>
</div>
</div>
<div class="row mt-30">
- <div class="col-md-10">
- <span class="info_font h3" translate="issue.downIssue">�븯�쐞 �씠�뒋</span>
+ <div class="col-md-8">
+ <span class="info_detail_font h3" translate="issue.downIssue">�븯�쐞 �씠�뒋</span>
</div>
- <div class="col-md-1">
- <button class="btn btn-darkgrey offset-12" ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
+ <div class="col-sm-2">
+ <a><button type="button" class="btn btn-darkgrey offset-7" ng-if="vm.viewer.modifyPermissionCheck"
+ ng-click="fn.modifyDownIssueStatus()">
+ <span ng-if="vm.viewer.modifyPermissionCheck" translate="common.updateDownIssueAllStatus">�븯�쐞�씠�뒋 �긽�깭 �쟾泥� 蹂�寃�</span>
+ </button></a>
+ </div>
+ <div class="col-sm-1">
+ <button class="btn btn-darkgrey offset-10" ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
</div>
</div>
<!-- �븯�쐞 �씠�뒋 �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
<js-table data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs"
- event="downTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
+ event="downTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
<div class="row">
+
<div class="col-sm-6">
<js-autocomplete-single data-input-name="issue"
selected-model="vm.form.issuesDown"
search="vm.issueNameDown"
- source="fn.getIssueList(vm.issueNameDown, vm.form.issuesDown, vm.autoCompletePageDown.issue.page, fn.getIssueListCallBack)"
+ source="fn.getDownIssueList(vm.issueNameDown, vm.issueTypeId, vm.form.issuesDown, vm.autoCompletePageDown.issue.page, fn.getDownIssueListCallBack)"
page="vm.autoCompletePageDown.issue.page"
total-page="vm.autoCompletePageDown.issue.totalPage"
input-disabled="false"
@@ -479,10 +569,16 @@
extra-settings="{ displayProp : 'title' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : true, stopRemoveBodyEvent : true }"></js-autocomplete-single>
</div>
- <div class="col-auto vertical-middle">
- <button type="button" class="btn btn-primary form-control input-sm"
+ <div class="col-auto vertical-middle" style="display: flex">
+ <button type="button" class="btn btn-primary"
+ ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.addDownIssue()"
translate="issue.addDownIssue">異붽�</button>
+ <button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1"
+ ng-if="vm.viewer.modifyPermissionCheck"
+ ng-click="fn.addDownIssueForm(vm.viewer.id)">
+ <i class="os-icon os-icon-plus"><span></span></i>
+ </button>
</div>
</div>
@@ -490,7 +586,7 @@
<h6 class="todo-content-subheader mt-30" translate="common.content">�궡�슜</h6>
<div class="box mt-10 issue-detail-word-break width-100" >
- <div ng-bind-html="$root.$sce.trustAsHtml(vm.viewer.description)"></div>
+ <div class="issue-detail-tab" ng-bind-html="$root.$sce.trustAsHtml(vm.viewer.description)"></div>
<span class="fc-grey" ng-if="!$root.isDefined(vm.viewer.description)" translate="common.noContent">
�궡�슜�씠 �뾾�뒿�땲�떎.
</span>
@@ -535,19 +631,31 @@
<span translate="common.noAttachedFile">泥⑤��맂 �뙆�씪�씠 �뾾�뒿�땲�떎.</span>
</div>
</div>
-
<div class="row">
<div class="col-sm-12">
- <h6 class="todo-content-subheader mt-20"><span translate="issue.previewImage">�씠誘몄� 誘몃━ 蹂닿린</span>
- </h6>
- <div class="pdt10">
- <issue-detail-image-preview images="vm.images"></issue-detail-image-preview>
- </div>
+ <h6 class="todo-content-subheader mt-20" translate="common.writeComment">�뙎湲� �벐湲�</h6>
+ <form name="commentForm" ng-enter="fn.addComment()">
+ <div class="form-group row ">
+ <div class="col-sm-12">
+ <div class="input-group">
+ <input class="form-control"
+ kr-input
+ maxlength="300"
+ placeholder="{{'common.pleaseEnterComments' | translate}}"
+ ng-model="vm.viewer.comment"
+ type="text">
+ <div class="input-group-prepend">
+ <div class="input-group-text2"
+ ng-class="{ 'disable' : !$root.isDefined(vm.viewer.comment) }"
+ ng-click="fn.addComment()">
+ <i class="os-icon os-icon-mail-18"></i>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
</div>
- <div ng-show="vm.images.length < 1" class="detail-not-elements width-100">
- <span translate="common.noImage">泥⑤��맂 �씠誘몄�媛� �뾾�뒿�땲�떎.</span>
- </div>
-
</div>
<!-- �솢�룞 �궡�뿭 -->
@@ -562,14 +670,22 @@
ng-click="fn.updateActiveHistory()"><span
translate="common.fullView">�쟾泥대낫湲�</span></a>
</li>
- <li class="nav-item cursor">
+ <!--<li class="nav-item cursor">
<a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'REPLY' }"
ng-click="vm.activeTab = 'REPLY'"><span translate="common.comments">�뙎湲�</span></a>
- </li>
+ </li>-->
<li class="nav-item cursor">
<a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'RECODE' }"
ng-click="vm.activeTab = 'RECODE'"><span translate="common.record">湲곕줉</span></a>
</li>
+ <li class="nav-item cursor">
+ <a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'RECODE_DOWN' }"
+ ng-click="vm.activeTab = 'RECODE_DOWN'"><span translate="common.recordDown">�븯�쐞�씠�뒋 湲곕줉</span></a>
+ </li>
+ <!--<li class="nav-item cursor">
+ <a class="nav-link" ng-class="{ 'active' : vm.activeTab == 'REPLY_DOWN' }"
+ ng-click="vm.activeTab = 'REPLY_DOWN'"><span translate="common.downComments">�븯�쐞�씠�뒋 �뙎湲�</span></a>
+ </li>-->
</ul>
</div>
@@ -580,12 +696,18 @@
<!-- 湲곕줉�씤 寃쎌슦 -->
<div class="aei-content"
ng-if="$root.isDefined(activeHistory.issueHistoryType)">
- <h6 ng-if="activeHistory.issueHistoryType == 'TOTAL'"
+ <!--<h6 ng-if="activeHistory.issueHistoryType == 'TOTAL'"
translate="issue.summaryIssueActivity">�씠�뒋 �솢�룞 �궡�뿭 �슂�빟 <i
- class="os-icon os-icon-arrow-down"></i></h6>
+ class="os-icon os-icon-arrow-down"></i></h6>-->
<div dom-append dom="activeHistory.description"></div>
</div>
<!-- �뙎湲��씤 寃쎌슦 -->
+ <div ng-if="!$root.isDefined(activeHistory.issueHistoryType)"
+ ng-show="vm.viewer.title !== activeHistory.title">
+ <div>
+ �븯�쐞�씠�뒋 : {{::activeHistory.title}}
+ </div>
+ </div>
<div class="aei-image" ng-if="!$root.isDefined(activeHistory.issueHistoryType)">
<div class="user-avatar-w">
<img alt="image" ng-src="{{::activeHistory.profile}}">
@@ -646,53 +768,135 @@
<span class="issue-detail-word-break">{{::comment.description}}</span>
</div>
</div>
-
</div>
</div>
</div>
- <form name="commentForm" ng-enter="fn.addComment()">
- <div class="form-group row ">
- <div class="col-sm-12">
- <div class="input-group">
- <input class="form-control"
- kr-input
- maxlength="300"
- placeholder="{{'common.pleaseEnterComments' | translate}}"
- ng-model="vm.viewer.comment"
- type="text">
- <div class="input-group-prepend">
- <div class="input-group-text2"
- ng-class="{ 'disable' : !$root.isDefined(vm.viewer.comment) }"
- ng-click="fn.addComment()">
- <i class="os-icon os-icon-mail-18"></i>
- </div>
- </div>
- </div>
- </div>
- </div>
- </form>
</div>
<!-- 湲곕줉 蹂닿린 -->
<div ng-if="vm.activeTab == 'RECODE'">
- <div class="no-cont2"
- ng-if="vm.viewer.issueHistoryVos.length < 1"
- translate="common.noRecord">
+ <div class="no-cont2" ng-if="vm.viewer.activeParentHistory.length < 1" translate="common.noRecord">
湲곕줉�씠 �뾾�뒿�땲�떎.
</div>
- <div>
- {{vm.viewer.issueHistoryVos}}
- </div>
- <div class="activity-item"
- ng-repeat="issueHistory in vm.viewer.issueHistoryVos">
- <h6 ng-if="issueHistory.issueHistoryType == 'TOTAL'"
+ <div class="activity-item" ng-repeat="issueHistory in vm.viewer.activeParentHistory">
+ <!--<h6 ng-if="issueHistory.issueHistoryType == 'TOTAL'"
translate="issue.summaryIssueActivity">�씠�뒋 �솢�룞 �궡�뿭 �슂�빟
<i class="os-icon os-icon-arrow-down"></i>
- </h6>
- <div class="activity-content">
+ </h6>-->
+ <div class="activity-content" ng-if="$root.isDefined(issueHistory.issueHistoryType)">
<div dom-append dom="issueHistory.description"></div>
</div>
+ <!-- �뙎湲��씤 寃쎌슦 -->
+ <div class="aei-image" ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <div class="user-avatar-w">
+ <img alt="image" ng-src="{{::issueHistory.profile}}">
+ </div>
+ </div>
+ <div class="aei-content"
+ ng-if="!$root.isDefined(issueHistory.issueHistoryType)">
+ <h6 class="aei-title">
+ {{::issueHistory.registerName}}
+ </h6>
+ <div class="date-break">
+ <span>{{::issueHistory.registerDate}}</span>
+ </div>
+ <div class="aei-delete"
+ ng-click="fn.removeComment(comment)"
+ ng-show="$root.user.id == comment.registerId">
+ <i class="os-icon os-icon-close"></i>
+ </div>
+ <div class="chat-messages">
+ <div class="message">
+ <div class="message-content">
+ <span class="issue-detail-word-break">{{::issueHistory.description}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!-- �븯�쐞�씠�뒋 湲곕줉 蹂닿린 -->
+ <div ng-if="vm.activeTab == 'RECODE_DOWN'">
+ <div class="no-cont2" ng-if="vm.viewer.activeDownAllHistory.length < 1" translate="common.noRecord">
+ 湲곕줉�씠 �뾾�뒿�땲�떎.
+ </div>
+ <div class="activity-item" ng-repeat="issueDownHistory in vm.viewer.activeDownAllHistory">
+ <!-- 湲곕줉�씤 寃쎌슦 -->
+ <div class="activity-content" ng-if="$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div dom-append dom="issueDownHistory.description"></div>
+ </div>
+ <!-- �뙎湲��씤 寃쎌슦 -->
+ <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div class="aei-title">
+ �븯�쐞�씠�뒋 : {{::issueDownHistory.title}}
+ </div>
+ </div>
+ <div class="aei-image" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
+ <div class="user-avatar-w">
+ <img alt="image" ng-src="{{::issueDownHistory.profile}}">
+ </div>
+ </div>
+ <div class="aei-content" ng-if="!$root.isDefined(issueDownHistory.issueHistoryType)">
+ <h6 class="aei-title">
+ {{::issueDownHistory.registerName}}
+ </h6>
+ <div class="date-break">
+ <span>{{::issueDownHistory.registerDate}}</span>
+ </div>
+ <div class="aei-delete"
+ ng-click="fn.removeComment(comment)"
+ ng-show="$root.user.id == comment.registerId">
+ <i class="os-icon os-icon-close"></i>
+ </div>
+ <div class="chat-messages">
+ <div class="message">
+ <div class="message-content">
+ <span class="issue-detail-word-break">{{::issueDownHistory.description}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- �븯�쐞�씠�뒋 �뙎湲� 蹂닿린 -->
+ <div ng-if="vm.activeTab == 'REPLY_DOWN'">
+ <div class="no-cont2" ng-if="$scope.vm.viewer.downComment.length < 1"
+ translate="common.noComments">
+ �뙎湲��씠 �뾾�뒿�땲�떎.
+ </div>
+ <div class="ae-item" ng-repeat="comment in vm.viewer.downComment">
+ <div class="re-title">
+ <div class='dot'>
+ �븯�쐞�씠�뒋: {{::comment.title}}
+ </div>
+ </div>
+ <div class="aei-image">
+ <div class="user-avatar-w">
+ <img alt="image" ng-src="{{::comment.profile}}">
+ </div>
+ </div>
+ <div class="aei-content">
+ <h6 class="aei-title">
+ {{::comment.registerName}}
+ </h6>
+ <div class="date-break">
+ <span>{{::comment.registerDate}}</span>
+ </div>
+ <div class="aei-delete"
+ ng-click="fn.removeComment(comment)"
+ ng-show="$root.user.id == comment.registerId">
+ <i class="os-icon os-icon-close"></i>
+ </div>
+ <div class="chat-messages">
+ <div class="message">
+ <div class="message-content">
+ <span class="issue-detail-word-break">{{::comment.description}}</span>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
--
Gitblit v1.8.0