Index: arms/js/reqStatus.js =================================================================== diff -u -r2cd7a51f4ecaeb386dc0171c500ca0a0ad03d3f7 -rc49410b704ed9c5062cc0b116d0e8e97b80c503b --- arms/js/reqStatus.js (.../reqStatus.js) (revision 2cd7a51f4ecaeb386dc0171c500ca0a0ad03d3f7) +++ arms/js/reqStatus.js (.../reqStatus.js) (revision c49410b704ed9c5062cc0b116d0e8e97b80c503b) @@ -433,8 +433,8 @@ ]; } -function format(d) { - return '
요구사항 구분ALM Issue KeyVersionALM Issue TitleALM projectALM Issue TypeALM AssigneeALM PriorityALM StatusALM CreatedALM UpdatedALM Resolution
'; +function format() { + return '
요구사항 구분ALM Issue KeyVersionALM Issue TitleALM projectALM Issue TypeALM AssigneeALM PriorityALM StatusALM CreatedALM UpdatedALM DeletedALM Resolution
'; } function initializeChildTable(childrenData, container) { @@ -692,6 +692,28 @@ className: "dt-body-left", visible: true }, + { + name: "deleted", + title: "ALM Deleted", + data: "deleted.deleted_date", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + let displayText = dateFormat(data); + let color = "#f8f8f8"; // 기본 텍스트 색상 + if (row.deleted && row.deleted.deleted_isDeleted === true) { + displayText = "" + displayText + ""; + } else if (row.deleted && row.deleted.deleted_isDeleted === false) { + color = "#808080"; + } + return "
" + displayText + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, { name: "resolutiondate", title: "ALM Resolution", @@ -1207,6 +1229,8 @@ scrollPos = $(window).scrollTop(); $(window).scrollTop(scrollPos); }); + + reqStatusDataTable.columns.adjust(); } // -------------------- 데이터 테이블을 만드는 템플릿으로 쓰기에 적당하게 리팩토링 함. ------------------ // @@ -1237,7 +1261,7 @@ tr.removeClass('shown'); icon.removeClass('fa-angle-up').addClass('fa-angle-down'); } else { - row.child(format(row.data())).show(); + row.child(format()).show(); tr.addClass('shown'); icon.removeClass('fa-angle-down').addClass('fa-angle-up'); initializeChildTable(row.data().children, tr.next('tr').find('div.child-table-container'));