Index: arms/js/reqStatus.js =================================================================== diff -u -r84ea465698de16f8cee04286dbb2b7172b17988e -r2e4339e56718454a72b56e2279f62483d9b9fe37 --- arms/js/reqStatus.js (.../reqStatus.js) (revision 84ea465698de16f8cee04286dbb2b7172b17988e) +++ arms/js/reqStatus.js (.../reqStatus.js) (revision 2e4339e56718454a72b56e2279f62483d9b9fe37) @@ -47,7 +47,6 @@ "../reference/jquery-plugins/dataTables-1.10.16/media/js/jquery.dataTables.min.js", "../reference/jquery-plugins/dataTables-1.10.16/extensions/Responsive/js/dataTables.responsive.min.js", "../reference/jquery-plugins/dataTables-1.10.16/extensions/Select/js/dataTables.select.min.js", - "../reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/dataTables.rowsGroup.min.js", "../reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/dataTables.rowGroup.min.js", "../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/dataTables.buttons.min.js", "../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/buttons.html5.js", @@ -325,9 +324,10 @@ // -------------------- 데이터 테이블을 만드는 템플릿으로 쓰기에 적당하게 리팩토링 함. ------------------ // function dataTableLoad(selectId, endPointUrl) { var columnList = [ + { name: "parentReqKey", title: "부모 요구사항 키", data: "parentReqKey", visible: false }, { name: "isReq", - title: "요구사항 이슈 키", + title: "요구사항 구분", data: "isReq", render: function (data, type, row, meta) { if (isEmpty(data) || data == false) { @@ -341,22 +341,24 @@ visible: true }, { - name: "parentReqKey", - title: "요구사항 그룹", - data: "parentReqKey", + name: "key", + title: "ALM Issue Key", + data: "key", render: function (data, type, row, meta) { - if (isEmpty(data) || data == "") { - return row.key; + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; } return data; }, className: "dt-body-left", visible: true }, { - name: "key", - title: "이슈 키", - data: "key", + name: "summary", + title: "ALM Issue Title", + data: "summary", render: function (data, type, row, meta) { if (isEmpty(data) || data === "false") { return "
N/A
"; @@ -367,9 +369,130 @@ }, className: "dt-body-left", visible: true + }, + { + name: "project.project_key", + title: "ALM project", + data: "project.project_key", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "issuetype.issuetype_name", + title: "ALM Issue Type", + data: "issuetype.issuetype_name", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "assignee.assignee_displayName", + title: "ALM Assignee", + data: "assignee.assignee_displayName", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "priority.priority_name", + title: "ALM Priority", + data: "priority.priority_name", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "status.status_name", + title: "ALM Status", + data: "status.status_name", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "created", + title: "ALM Created", + data: "created", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "updated", + title: "ALM Updated", + data: "updated", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "resolutiondate", + title: "ALM Resolution", + data: "resolutiondate", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "false") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true } + ]; - var rowsGroupList = ['reqGroup:name']; + var rowsGroupList = []; var columnDefList = []; var orderList = [[1, "asc"]]; var jquerySelector = "#reqstatustable";