From bd0cc703f0a21cc04c359a96dfb11873e38148d5 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 13:34:12 +0900
Subject: [PATCH] 이슈리스트에 파트너리스트 항목 추가
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index c3cc61e..2be164a 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -37,12 +37,12 @@
if (tableConfig.dType === "checkbox") {
// 泥댄겕 諛뺤뒪�씪�븣
- if (scope.data.defaultYn) {
+ /*if (scope.data.defaultYn) {
makeTag += '<input type="checkbox" ng-checked="data.checked == true ? true : false" disabled ng-click="$root.$tableProvider.rowChecked(tableConfigs, data, fn.getResponseData())">';
}
- else {
+ else {*/
makeTag += '<input type="checkbox" ng-checked="data.checked == true ? true : false" ng-click="$root.$tableProvider.rowChecked(tableConfigs, data, fn.getResponseData())">';
- }
+ //}
tableConfig.hChecked = false;
}
@@ -151,17 +151,18 @@
case "USE_DEPARTMENT_LIST" :
makeTag += "<ul class='ul-not-comma'>";
-
- if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
- makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
- }else{
- makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
- angular.forEach(scope.data.departmentVos, function (departments) {
- makeTag += "<li>" + departments.departmentName + "</li>";
- });
- makeTag += "</div>";
+ if (scope.data.managerYn !== 'Y'){
+ if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
+ makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
+ }else{
+ makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
+ angular.forEach(scope.data.departmentVos, function (departments) {
+ makeTag += "<li>" + departments.departmentName + "</li>";
+ });
+ makeTag += "</div>";
+ }
+ makeTag += "</ul>";
}
- makeTag += "</ul>";
break;
case "WORKFLOW_DEPARTMENT_LIST" :
@@ -491,6 +492,33 @@
makeTag += "</ul>";
break;
+ // �뾽泥�
+ case "USE_COMPANY" :
+ if (scope.data.companyName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.companyName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
+ break;
+
+ // ISP
+ case "USE_ISP" :
+ if (scope.data.ispName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.ispName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
+ break;
+
+ // �샇�뒪�똿
+ case "USE_HOSTING" :
+ if (scope.data.ispName !== null) {
+ makeTag += "<span ng-click=\"event.changeDetailView(data.id)\" class='cursor' translate='" + scope.data.hostingName + "'></span>";
+ }else {
+ makeTag += "<span></span>";
+ }
+ break;
+
case "WORKFLOW_NAME":
makeTag += "<span>" + scope.data.workflowVo.name + "</span>";
break;
@@ -623,11 +651,17 @@
case "LEVEL_OPTION" :
//makeTag += "<select class='form-control input-sm' ng-model='data.levels[0].id' ng-options='levelName.id as levelName.levelName for levelName in data.levels' ></select>";
- makeTag +="<select class='form-control input-sm' ng-model='data.levelId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='level in data.levels' ng-value='level.fieldKey'>{{::level.fieldValue}}</option></select>";
+ if (scope.data.managerYn === 'Y'){
+ makeTag +="<span>理쒓퀬愿�由ъ옄</span>";
+ } else {
+ makeTag +="<select class='form-control input-sm' ng-model='data.levelId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='level in data.levels' ng-value='level.fieldKey'>{{::level.fieldValue}}</option></select>";
+ }
break;
case "WORKSPACE_USE_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>";
+ if (scope.data.managerYn !== 'Y'){
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>";
+ }
break;
case "COMPANYFIELD_MODIFY" :
--
Gitblit v1.8.0