| src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/scripts/app/issue/issueDetail.controller.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/scripts/components/utils/dateRangePicker.directive.js | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/views/issue/issueAddDownTableConfig.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/views/issue/issueAddRelationTableConfig.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 | |
| src/main/webapp/views/issue/issueDetail.html | ●●●●● 패치 | 보기 | raw | blame | 히스토리 |
src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -24,48 +24,61 @@ $scope.vm = { issueId : "", issueDownTableConfigs : [{ name : $filter("translate")("common.priority"), // 우선순위 key : "PRIORITY", name : $filter("translate")("issue.downIssueTitle"), // 하위 이슈 제목 key : "DOWN_ISSUE_TITLE", width : "width-80-p", position : 1, display : false }, { name : $filter("translate")("common.importance"), // 중요도 key : "SEVERITY", width : "width-80-p", position : 2, display : false }, { name : $filter("translate")("common.assigneeTeam"), // 담당부서 key : "ASSIGNEE_TEAM", width : "width-100-p", position : 3, display : false }, { name : $filter("translate")("common.register"), // 등록자 key : "REGISTER", width : "width-100-p", position : 4, display : false }, { name : $filter("translate")("common.period"), // 기간 key : "PERIOD", width : "width-140-p", position : 5, display : false }, { name : $filter("translate")("common.lastChangeDate"), // 최근 변경일 key : "MODIFY_DATE", width : "width-100-p", position : 6, display : false position : 0, display : true, checkboxShow : false }, { name : $filter("translate")("issue.issueStatus"), // 이슈 상태 key : "ISSUE_DOWN_STATUS_TYPE", width : "width-50-p", position : 1, display : false, checkboxShow : true }, { name : $filter("translate")("common.priority"), // 우선순위 key : "DOWN_PRIORITY", width : "width-50-p", position : 2, display : false, checkboxShow : true }, { name : $filter("translate")("common.importance"), // 중요도 key : "DOWN_SEVERITY", width : "width-50-p", position : 3, display : false, checkboxShow : true }, { name : $filter("translate")("common.assigneeTeam"), // 담당부서 key : "DOWN_ASSIGNEE_TEAM", width : "width-50-p", position : 4, display : false, checkboxShow : true }, { name : $filter("translate")("common.register"), // 등록자 key : "DOWN_REGISTER", width : "width-50-p", position : 5, display : false, checkboxShow : true }, { name : $filter("translate")("common.period"), // 기간 key : "DOWN_PERIOD", width : "width-100-p", position : 6, display : false, checkboxShow : true }, { name : $filter("translate")("common.lastChangeDate"), // 최근 변경일 key : "DOWN_MODIFY_DATE", width : "width-100-p", position : 7, display : false },{ display : false, checkboxShow : true }] }; @@ -137,7 +150,7 @@ var content = { issueId : $rootScope.currentDetailIssueId, delValue : $scope.vm.issueDownTableConfigs.splice(7,1), //delValue : $scope.vm.issueDownTableConfigs.splice(8,1), issueTypeId : $rootScope.getCurrentIssueTypeId(), issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs) }; @@ -163,6 +176,7 @@ key : "CUSTOM_FIELD_" + customField.id, width : "width-100-p", display : false, checkboxShow : true, position : count });
@@ -25,41 +25,61 @@ $scope.vm = { issueTypeId: "", issueRelTableConfigs : [{ name : $filter("translate")("issue.relationIssueType"), // 연관 이슈 구분 key : "RELATION_ISSUE_TYPE", width : "width-60-p", position : 0, display : true, checkboxShow : false }, { name : $filter("translate")("issue.relationIssueTitle"), // 연관 이슈 제목 key : "RELATION_ISSUE_TITLE", width : "width-60-p", position : 0, display : true, checkboxShow : false }, { name : $filter("translate")("common.priority"), // 우선순위 key : "PRIORITY", width : "width-100-p", key : "RELATION_PRIORITY", width : "width-50-p", position : 1, display : false display : false, checkboxShow : true }, { name : $filter("translate")("common.importance"), // 중요도 key : "SEVERITY", width : "width-100-p", key : "RELATION_SEVERITY", width : "width-50-p", position : 2, display : false display : false, checkboxShow : true }, { name : $filter("translate")("common.assigneeTeam"), // 담당부서 key : "ASSIGNEE_TEAM", key : "RELATION_ASSIGNEE_TEAM", width : "width-50-p", position : 3, display : false display : false, checkboxShow : true }, { name : $filter("translate")("common.register"), // 등록자 key : "REGISTER", key : "RELATION_REGISTER", width : "width-50-p", position : 4, display : false display : false, checkboxShow : true }, { name : $filter("translate")("common.period"), // 기간 key : "PERIOD", key : "RELATION_PERIOD", width : "width-100-p", position : 5, display : false display : false, checkboxShow : true }, { name : $filter("translate")("common.lastChangeDate"), // 최근 변경일 key : "MODIFY_DATE", key : "RELATION_MODIFY_DATE", width : "width-100-p", position : 6, display : false display : false, checkboxShow : true }, { }] }; @@ -134,7 +154,7 @@ var content = { issueId : $rootScope.currentDetailIssueId, issueTypeId : $rootScope.getCurrentIssueTypeId(), delValue : $scope.vm.issueRelTableConfigs.splice(6,1), delValue : $scope.vm.issueRelTableConfigs.splice(8,1), issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs) }; @@ -152,13 +172,14 @@ // 사용자 정의 필드를 조회한 후 표시할 이슈 테이블 컬럼을 준비한다. $scope.fn.getCustomFields().then(function (result) { var count = 7; var count = 8; angular.forEach(result, function (customField) { $scope.vm.issueRelTableConfigs.push({ name : customField.name, key : "CUSTOM_FIELD_" + customField.id, width : "width-100-p", display : false, checkboxShow : true, position : count });
@@ -244,73 +244,80 @@ // 연관 이슈 컬럼 switch(Rel_issueTableConfig.key) { // 연관 이슈 구분 case "RELATION_ISSUE_TYPE" : case "RELATION_ISSUE_TYPE" : // 연관 이슈 구분 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueType") .setDName("relationIssueType") .setDType("renderer") .setHWidth("width-30 bold") .setHSort(false) .setDAlign("text-center") .setHWidth("bold " + Rel_issueTableConfig.width) .setDRenderer("ISSUE_RELATION_TYPE")) /*.setHWidth("width-30 bold")*/ /*.setHSort(false)*/ break; // 연관 이슈 제목 case "RELATION_ISSUE_TITLE" : case "RELATION_ISSUE_TITLE" : // 연관 이슈 제목 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueTitle") .setDName("relationIssueTitle") .setDType("renderer") .setHWidth("width-60 bold") .setHSort(false) .setDAlign("text-center") .setHWidth("bold " + Rel_issueTableConfig.width) .setDRenderer("ISSUE_RELATION_MOVE")) /*.setHWidth("width-60 bold")*/ /*.setHSort(true)*/ break; case "PRIORITY" : // 연관 이슈 우선순위 case "RELATION_PRIORITY" : // 연관 이슈 우선순위 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.priority") .setDName("priorityName") .setDName("relPriority") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("REL_COMMON_PRIORITY")); break; case "SEVERITY" : // 연관 이슈 중요도 case "RELATION_SEVERITY" : // 연관 이슈 중요도 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.importance") .setDName("severityName") .setDName("relSeverity") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("REL_COMMON_SEVERITY")); break; case "ASSIGNEE_TEAM" : // 연관 이슈 담당부서 case "RELATION_ASSIGNEE_TEAM" : // 연관 이슈 담당부서 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.assigneeTeam") .setDName("relAssigneeTeam") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("REL_ISSUE_DEPARTMENT")); break; case "REGISTER" : // 연관 이슈 등록자 case "RELATION_REGISTER" : // 연관 이슈 등록자 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.register") .setDName("relRegister") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("REL_REGISTER")); break; case "PERIOD" : // 연관 이슈 기간 case "RELATION_PERIOD" : // 연관 이슈 기간 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.period") .setDName("relPeriod") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("REL_ISSUE_DUE_DATE")); break; case "MODIFY_DATE" : // 연관 이슈 최근 변경일 case "RELATION_MODIFY_DATE" : // 연관 이슈 최근 변경일 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.lastChangeDate") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setDName("modifyDate")); .setDName("relModifyDate")); break; } @@ -324,6 +331,7 @@ $scope.vm.relTableConfigs.push($tableProvider.config() .setHName(customField.name) .setDType("renderer") .setDName("relCustomFieldName" + [count]) .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setColumnHint(customField) @@ -341,10 +349,10 @@ // 하위 이슈 컬럼 switch(Down_issueTableConfig.key) { // 하위 이슈 제목 case "DOWN_ISSUE_TITLE" : case "DOWN_ISSUE_TITLE" : // 하위 이슈 제목 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("issue.downIssueTitle") .setDName("downIssueTitle") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") @@ -354,60 +362,64 @@ case "ISSUE_DOWN_STATUS_TYPE" : // 이슈 상태 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("issue.issueStatus") .setDName("downIssueStatus") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("ISSUE_DOWN_STATUS_TYPE")); break; case "PRIORITY" : // 하위 이슈 우선순위 case "DOWN_PRIORITY" : // 하위 이슈 우선순위 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.priority") .setDName("priorityName") .setDName("downPriority") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("DOWN_COMMON_PRIORITY")); break; case "SEVERITY" : // 중요도 case "DOWN_SEVERITY" : // 중요도 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.importance") .setDName("severityName") .setDName("downSeverity") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("DOWN_COMMON_SEVERITY")); break; case "ASSIGNEE_TEAM" : // 담당부서 case "DOWN_ASSIGNEE_TEAM" : // 담당부서 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.assigneeTeam") .setDName("downAssigneeTeam") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("DOWN_ISSUE_DEPARTMENT")); break; case "REGISTER" : // 등록자 case "DOWN_REGISTER" : // 등록자 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.register") .setDName("downRegister") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("DOWN_REGISTER")); break; case "PERIOD" : // 기간 case "DOWN_PERIOD" : // 기간 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.period") .setDName("downPeriod") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setDRenderer("DOWN_ISSUE_DUE_DATE")); break; case "MODIFY_DATE" : // 최근 변경일 case "DOWN_MODIFY_DATE" : // 최근 변경일 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.lastChangeDate") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setDName("modifyDate")); .setDName("downModifyDate")); break; } @@ -421,6 +433,7 @@ $scope.vm.downTableConfigs.push($tableProvider.config() .setHName(customField.name) .setDType("renderer") .setDName("downCustomFieldName" + [count]) .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setColumnHint(customField) @@ -439,7 +452,7 @@ .setHName("issue.relationIssueType") .setDType("renderer") .setDAlign("text-center") .setHWidth("width-30-p bold") .setHWidth("width-60-p bold") .setHSort(false) .setDRenderer("ISSUE_RELATION_TYPE")) $scope.vm.relTableConfigs.push($tableProvider.config() @@ -453,7 +466,7 @@ .setHName("issue.relationIssueDelete") .setDType("renderer") .setDAlign("text-center") .setHWidth("width-20-p bold") .setHWidth("width-40-p bold") .setDRenderer("ISSUE_RELATION_DELETE") .setHSort(false) .setDAlign("text-center")) @@ -482,7 +495,7 @@ .setHName("issue.relationIssueDelete") .setDType("renderer") .setDAlign("text-center") .setHWidth("width-20-p bold") .setHWidth("width-40-p bold") .setDRenderer("ISSUE_DOWN_DELETE") .setHSort(false) .setDAlign("text-center")) @@ -516,20 +529,20 @@ }); $scope.vm.relTableConfigs = []; /* $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueType") .setDType("renderer") .setDAlign("text-center") .setHWidth("width-30-p bold") .setHSort(false) .setDRenderer("ISSUE_RELATION_TYPE")) $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueType") .setDType("renderer") .setDAlign("text-center") .setHWidth("width-30-p bold") .setHSort(false) .setDRenderer("ISSUE_RELATION_TYPE")) $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueTitle") .setDType("renderer") .setDAlign("text-center") .setHWidth("width-60-p bold") .setHSort(false) .setDRenderer("ISSUE_RELATION_MOVE")) .setHName("issue.relationIssueTitle") .setDType("renderer") .setDAlign("text-center") .setHWidth("width-60-p bold") .setHSort(false) .setDRenderer("ISSUE_RELATION_MOVE"))*/ angular.forEach($scope.vm.issueRelTableConfigs, function (Rel_issueTableConfig) { // 표시 대상인 컬럼만 화면에 그려준다. if (Rel_issueTableConfig.display) { @@ -541,7 +554,7 @@ $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueDelete") .setDType("renderer") .setHWidth("width-20-p bold") .setHWidth("width-40-p bold") .setDRenderer("ISSUE_RELATION_DELETE") .setHSort(false) .setDAlign("text-center")) @@ -566,13 +579,13 @@ return a.position < b.position ? -1 : a.position > b.position ? 1 : 0; }); $scope.vm.downTableConfigs = []; $scope.vm.downTableConfigs.push($tableProvider.config() /* $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("issue.downIssueTitle") .setDType("renderer") .setDAlign("text-center") .setHWidth("width-60-p bold") .setHSort(false) .setDRenderer("ISSUE_DOWN_MOVE")) .setDRenderer("ISSUE_DOWN_MOVE"))*/ angular.forEach($scope.vm.issueDownTableConfigs, function (Down_issueTableConfig) { // 표시 대상인 컬럼만 화면에 그려준다. if (Down_issueTableConfig.display) { @@ -583,7 +596,7 @@ $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueDelete") .setDType("renderer") .setHWidth("width-20-p bold") .setHWidth("width-40-p bold") .setDRenderer("ISSUE_DOWN_DELETE") .setHSort(false) .setDAlign("text-center")) src/main/webapp/scripts/components/utils/dateRangePicker.directive.js
@@ -86,7 +86,7 @@ //parentEl : $scope.parentEl !== undefined ? $scope.parentEl : "", locale: { format: 'YYYY-MM-DD/hh-mm-ss A', format: 'YYYY-MM-DD/hh:mm:ss A', applyLabel: options.applyLabel, cancelLabel: options.cancelLabel, daysOfWeek: options.daysOfWeek, src/main/webapp/views/issue/issueAddDownTableConfig.html
@@ -28,14 +28,14 @@ </tr> </thead> <tbody> <tr> <!--<tr> <td class="text-center"> <span class="bold" translate="issue.downIssueTitle">하위 이슈 제목</span> </td> <td class="text-center" colspan="3"> <span class="text-danger bold" translate="issue.cannotChangedIssueTitle">이슈 제목은 변경할 수 없습니다.</span> </td> </tr> </tr>--> <tr ng-repeat="issueTableConfig in vm.issueDownTableConfigs"> <td class="text-center"> <span class="bold">{{issueTableConfig.name}}</span> @@ -74,7 +74,11 @@ </select> </td> <td class="text-center"> <label class='switch'><input type='checkbox' ng-model='issueTableConfig.display'><span class='slider round'></span></label> <!-- 하위 이슈 제목 표시 버튼 disabled --> <label ng-if="!issueTableConfig.checkboxShow" class='switch'><input type="checkbox" ><span class='slider-disabled round'></span></label> <!-- 나머지 버튼 표시 --> <label ng-if="issueTableConfig.checkboxShow" class='switch'><input type="checkbox" ng-model="issueTableConfig.display"><span class='slider round'></span ></label> <!--<label class='switch'><input type='checkbox' ng-model='issueTableConfig.display'><span class='slider round'></span></label>--> </td> <td class="text-center"> <input type="text" class="form-control" ng-model="issueTableConfig.position" maxlength="2" input-regex="[^0-9]"> src/main/webapp/views/issue/issueAddRelationTableConfig.html
@@ -28,7 +28,7 @@ </tr> </thead> <tbody> <tr> <!--<tr> <td class="text-center"> <span class="bold" translate="issue.relationIssueType">연관 이슈 구분</span> </td> @@ -43,7 +43,7 @@ <td class="text-center" colspan="3"> <span class="text-danger bold" translate="issue.cannotChangedIssueTitle">이슈 제목은 변경할 수 없습니다.</span> </td> </tr> </tr>--> <tr ng-repeat="issueTableConfig in vm.issueRelTableConfigs"> <td class="text-center"> <span class="bold">{{issueTableConfig.name}}</span> @@ -82,7 +82,12 @@ </select> </td> <td class="text-center"> <label class='switch'><input type='checkbox' ng-model='issueTableConfig.display'><span class='slider round'></span></label> <!-- 연관 이슈 구분, 연관 이슈 제목 표시 버튼 disabled --> <label ng-if="!issueTableConfig.checkboxShow" class='switch'><input type="checkbox" ><span class='slider-disabled round'></span></label> <!-- 나머지 버튼 표시 --> <label ng-if="issueTableConfig.checkboxShow" class='switch'><input type="checkbox" ng-model="issueTableConfig.display"><span class='slider round'></span ></label> <!--<label class='switch'><input type='checkbox' ng-model='issueTableConfig.display'><span class='slider round'></span></label>--> </td> <td class="text-center"> <input type="text" class="form-control" ng-model="issueTableConfig.position" maxlength="2" input-regex="[^0-9]"> src/main/webapp/views/issue/issueDetail.html
@@ -101,7 +101,6 @@ </span> </div> </span> <a class="show-ticket-info cursor"> <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> @@ -110,7 +109,7 @@ <i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)" ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="이슈 수정 하기"></i> <!-- 상위 이슈가 있을때 뒤로가기 버튼 생성 --> <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-skip-back" data-toggle="tooltip" data-placement="left" title="이슈 뒤로 이동"></i></span> <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="이슈 뒤로 이동"></i></span> <!-- 상위 이슈가 있을때 상세화면 닫기버튼 위치 조정 --> <span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="상세 화면 닫기"></i></span> </a>
