From f2fcf329cea64d71c671f1ab17f17d1634d1464d Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 3월 2022 17:08:23 +0900
Subject: [PATCH] - API로 이슈 추가 시 하위이슈처리기준 항목으로 동일한 업체 정보로 이슈 생성하여 하위이슈로 넣기 - 업체 테이블에 ip_start, ip_end 컬럼 추가
---
src/main/webapp/views/common/sidebar.html | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 1d94148..f864079 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -182,7 +182,12 @@
<div class="logo-element"></div>
</a>
</div>
+
<div class="logged-user-w avatar-inline">
+ <div class="row mb-1" ng-if="$root.user.levelName != null" >
+ <span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.user.levelName}}</span>
+ <span class="issue-main-label offset-detail-1 badge badge-department">{{$root.departments}}</span>
+ </div>
<div class="logged-user-i">
<div class="avatar-w">
<img alt="" ng-src="{{$root.user.profile}}">
@@ -192,7 +197,7 @@
{{$root.user.name}}
</div>
</div>
- <div class="logged-user-toggler-arrow">
+ <div class="logged-user-toggler-arrow_change">
<div class="os-icon os-icon-chevron-down"></div>
</div>
<div class="logged-user-menu color-style-bright">
@@ -248,11 +253,36 @@
<span translate="common.dashboard">���떆蹂대뱶</span>
</a>
</li>
+
<li class="sub-header">
- <span>ISSUE LIST</span>
+ <span>Project</span>
+ </li>
+ <li>
+ <a ui-sref="projects.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-package"></div>
+ </div>
+ <span translate="common.project">�봽濡쒖젥�듃</span></a>
</li>
- <li ng-repeat="issueType in $root.workIssueTypes">
+ <li class="sub-header">
+ <span>ISSUE LIST [{{$root.workProject.name}}]</span>
+ </li>
+
+ <li>
+ <a class="cursor" tabindex="-1" ng-click="fn.changeIssueListMenu(null, false)">
+ <div class="icon-w">
+ <div class="os-icon os-icon-layout"></div>
+ </div>
+ <span translate="common.allIssueList">�쟾泥댁씠�뒋</span>
+ </a>
+ </li>
+
+ <li class="sub-header">
+ <span>ISSUE TYPE LIST</span>
+ </li>
+
+ <li ng-repeat="issueType in $root.workIssueTypes" >
<a class="cursor" tabindex="-1" ng-click="fn.changeIssueListMenu(issueType.id)">
<div class="icon-w">
<div class="os-icon os-icon-layout"></div>
@@ -260,7 +290,14 @@
<span>{{issueType.name}}</span>
</a>
</li>
-
+ <li ng-if="$root.workIssueTypes.length == 0">
+ <a tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-delete"></div>
+ </div>
+ <span translate="common.notIssueType">�씠�뒋 �쑀�삎�씠 �뾾�뒿�땲�떎.</span>
+ </a>
+ </li>
<!--
<li class="">
<a ui-sref="tasks.agileBoard" tabindex="-1">
@@ -279,16 +316,6 @@
<span translate="calendar.calendarTitle">罹섎┛�뜑</span></a>
</li>
-->
- <li class="sub-header">
- <span>Project</span>
- </li>
- <li>
- <a ui-sref="projects.list" tabindex="-1">
- <div class="icon-w">
- <div class="os-icon os-icon-package"></div>
- </div>
- <span translate="common.project">�봽濡쒖젥�듃</span></a>
- </li>
<li class="sub-header" ng-if="$root.checkMngPermissionSettings()">
<span>custom workflow</span>
@@ -325,17 +352,17 @@
<span translate="managementType.managementIssueType">�씪媛� �쑀�삎 愿�由�</span></a>
</li>
- <li class="sub-header" ng-if="$root.checkMngPermissionSettings()">
- <span>LIST MANAGEMENT</span>
+ <li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
+ <span>PARTNER LIST</span>
</li>
- <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_ISSUE_STATUS')">
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<a ui-sref="companyField.list" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-agenda-1"></div>
</div>
<span translate="common.customCompanyField">�뾽泥� 愿�由�</span></a>
</li>
- <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_ISSUE_STATUS')">
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<a ui-sref="ispField.list" tabindex="-1">
<div class="icon-w">
@@ -343,14 +370,15 @@
</div>
<span translate="common.customIspField">ISP 愿�由�</span></a>
</li>
- <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_ISSUE_STATUS')">
+ <li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_PARTNER')">
<a ui-sref="hostingField.list" tabindex="-1">
<div class="icon-w">
<div class="os-icon os-icon-agenda-1"></div>
</div>
<span translate="common.customHostingField">�샇�뒪�똿 愿�由�</span></a>
</li>
- <li class="sub-header" ng-if="$root.checkMngPermissionManager()">
+
+ <li class="sub-header">
<span>Management</span>
</li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_NOTICE')">
@@ -367,6 +395,13 @@
</div>
<span translate="FAQ.manageFAQ">FAQ 愿�由�</span></a>
</li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_FAQ')">
+ <a ui-sref="faqs.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-ui-92"></div>
+ </div>
+ <span translate="FAQ.FAQ">FAQ</span></a>
+ </li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_QNA')">
<a ui-sref="qna.list" tabindex="-1">
<div class="icon-w">
@@ -374,6 +409,13 @@
</div>
<span translate="QNA.manageQNA">QnA 愿�由�</span></a>
</li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_QNA')">
+ <a ui-sref="qna.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-phone-21"></div>
+ </div>
+ <span translate="QNA.QNA">QnA</span></a>
+ </li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_GUIDE')">
<a ui-sref="guide.list" tabindex="-1">
<div class="icon-w">
@@ -381,6 +423,13 @@
</div>
<span translate="guide.manageGuide">媛��씠�뱶 愿�由�</span></a>
</li>
+ <li class="" ng-if="!$root.checkMngPermission('USER_PERMISSION_MNG_GUIDE')">
+ <a ui-sref="guide.list" tabindex="-1">
+ <div class="icon-w">
+ <div class="os-icon os-icon-phone-21"></div>
+ </div>
+ <span translate="guide.guide">媛��씠�뱶</span></a>
+ </li>
<li class="sub-header" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<span>API</span>
--
Gitblit v1.8.0