Index: arms/html/reqStatus/content-container.html =================================================================== diff -u -r5e8faa9aa82ecf4e600d72aafcb67c82f8c3c2f1 -r5339d30f2209bcdadd3493518c3d92577438b82f --- arms/html/reqStatus/content-container.html (.../content-container.html) (revision 5e8faa9aa82ecf4e600d72aafcb67c82f8c3c2f1) +++ arms/html/reqStatus/content-container.html (.../content-container.html) (revision 5339d30f2209bcdadd3493518c3d92577438b82f) @@ -476,7 +476,7 @@ style="float: right"> Index: arms/js/reqStatus.js =================================================================== diff -u -r1241640d1740f2b7b44e11f2772fe4d566238f91 -r5339d30f2209bcdadd3493518c3d92577438b82f --- arms/js/reqStatus.js (.../reqStatus.js) (revision 1241640d1740f2b7b44e11f2772fe4d566238f91) +++ arms/js/reqStatus.js (.../reqStatus.js) (revision 5339d30f2209bcdadd3493518c3d92577438b82f) @@ -354,6 +354,12 @@ // 이슈리스트 데이터테이블 dataTableLoad($("#selected_pdService").val(), endPointUrl); + $("#deleted_issue_report_modal").on("shown.bs.modal", function(event) { + endPointUrl = "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/deletedIssueList.do?version="+selectedVersionId; + getDeletedIssueData($("#selected_pdService").val(), endPointUrl) + }); + + $(".multiple-select").multipleSelect("refresh"); ////////////////////////////////////////////////////////// } @@ -604,9 +610,9 @@ return "
N/A
"; } else { if( isEmpty(row.isReq) || row.isReq == false){ - return "
" + dateFormat(data) + "
"; + return "
" + data + "
"; } - return "
" + dateFormat(data) + "
"; + return "
" + data + "
"; } return data; }, @@ -1152,90 +1158,87 @@ errorMode ); } -function deletedIssueTableEvent() { - let $modalBtn; - $("#deleted_issue_report_modal").on("shown.bs.modal", function(event) { - console.log("[ reqStatus :: deletedIssueTableEvent ] :: deleted_issue_report_modal btn is clicked"); - $modalBtn = $(event.relatedTarget); - var selectedRow = $modalBtn.data("row"); - console.log(selectedRow); - var endPointUrl = "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() + "/requirement-linkedissue.do?version="+selectedVersionId; - //getDeletedIssueData(endPointUrl); // 데이터테이블 그리기 - }); -} -/* -function getDeletedIssueData(endPointUrl) { - - var columnList = [ +function getDeletedIssueData(selectId, endPointUrl) { + console.log(endPointUrl); + console.log(selectId); + var columnList = [ + { name: "parentReqKey", title: "부모 요구사항 키", data: "parentReqKey", visible: false }, { name: "isReq", title: "요구사항 구분", data: "isReq", render: function (data, type, row, meta) { if (isEmpty(data) || data == false) { - return "
연결 이슈
"; + return "
" + row.parentReqKey + "의 연결 이슈
"; } else { - return "
요구사항 이슈
"; + return "
" + row.key + "
"; } return data; }, className: "dt-body-left", visible: true }, { - name: "issueID", - title: "이슈아이디", - data: "issueID", - render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { - return "
N/A
"; - } else { - return "
" + data + "
"; - } - return data; - }, - className: "dt-body-left", - visible: false - }, - { name: "key", title: "ALM Issue Key", data: "key", render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { + if (isEmpty(data) || data === "false") { return "
N/A
"; } else { - return "
" + data + "
"; + if( isEmpty(row.isReq) || row.isReq == false){ + return "
" + data + "
"; + } + + return ("
" + data +"
"); + } return data; }, className: "dt-body-left", visible: true }, { - name: "parentReqKey", - title: "부모이슈 키", - data: "parentReqKey", + name: "pdServiceVersions", + title: "Version", + data: "pdServiceVersions", render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { + if (isEmpty(data) || data === "false") { return "
N/A
"; } else { - return "
" + data + "
"; + let verNameList = []; + let verHtml =``; + data.forEach(version_id => { + let versionInfo = versionListData.find(version => version["c_id"] === version_id); + if(versionInfo) { + verNameList.push(versionInfo["c_title"]); + verHtml+= versionInfo["c_title"]+`
`; + } + }); + if( isEmpty(row.isReq) || row.isReq == false){ + return "
" + verHtml + "
"; + } else { + return "
" + verHtml + "
"; + } + } return data; }, className: "dt-body-left", - visible: false + visible: true }, { name: "summary", - title: "ALM Issue Title ", + title: "ALM Issue Title", data: "summary", render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { + if (isEmpty(data) || data === "false") { return "
N/A
"; } else { + if( isEmpty(row.isReq) || row.isReq == false){ + return "
" + data + "
"; + } return "
" + data + "
"; } return data; @@ -1244,9 +1247,9 @@ visible: true }, { - name: "issuetype.issuetype_name", - title: "Issue Type", - data: "issuetype.issuetype_name", + name: "project.project_key", + title: "ALM project", + data: "project.project_name", render: function (data, type, row, meta) { if (isEmpty(data) || data === "false") { return "
N/A
"; @@ -1262,110 +1265,82 @@ visible: true }, { - name: "priority", - title: "Issue Priority", - data: "priority.priority_name", + name: "assignee.assignee_displayName", + title: "ALM Assignee", + data: "assignee.assignee_displayName", render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { + if (isEmpty(data) || data === "false") { return "
N/A
"; } else { - return "
" + data + "
"; + if( isEmpty(row.isReq) || row.isReq == false){ + return "
" + data + "
"; + } else { + return "
" + data + "
"; + } + } - return data; }, className: "dt-body-left", visible: true }, - { - name: "status.status_name", - title: "Issue Status", - data: "status.status_name", + { + name: "deleted", + title: "ALM Deleted", + data: "deleted", render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { + if (isEmpty(data) || data === "false") { return "
N/A
"; } else { + if( isEmpty(row.isReq) || row.isReq == false){ + + return "
" + data+ "
"; + } return "
" + data + "
"; } return data; }, className: "dt-body-left", visible: true }, - { - name: "reporter.reporter_displayName", - title: "Issue Reporter", - data: "reporter.reporter_displayName", + { + name: "deleted", + title: "삭제 예정일", + data: "deleted", render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { + if (isEmpty(data) || data === "false") { return "
N/A
"; } else { - return "
" + data + "
"; + var date = new Date(data); + date.setDate(date.getDate()+2); + let year = date.getFullYear(); + let month = String(date.getMonth() + 1).padStart(2, '0'); + let day = String(date.getDate()).padStart(2, '0'); + + let newDateString = `${year}-${month}-${day}`; + if( isEmpty(row.isReq) || row.isReq == false){ + return "
" +newDateString + "
"; + } + return "
" + newDateString + "
"; } return data; }, className: "dt-body-left", visible: true - }, - { - name: "assignee.assignee_displayName", - title: "Issue Assignee", - data: function (row, type, set, meta) { - return row.assignee ? row.assignee.assignee_displayName : null; - }, - render: function (data, type, row, meta) { - //if (isEmpty(data) || data === "unknown") { - if ([null, undefined, ""].includes(data)) { - 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 === "unknown") { - return "
N/A
"; - } else { - return "
" + dateFormat(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 === "unknown") { - return "
N/A
"; - } else { - return "
" + dateFormat(data) + "
"; - } - return data; - }, - className: "dt-body-left", - visible: true } ]; var rowsGroupList = []; - var columnDefList = []; + var columnDefList = [{ + "defaultContent": "
N/A
", + "targets": "_all" + }]; var orderList = [[1, "asc"]]; var jquerySelector = "#deletedIssueTable"; var ajaxUrl = "/auth-user/api/arms/reqStatus" + endPointUrl; - var jsonRoot = "response"; + var jsonRoot = "body"; var buttonList = []; var selectList = {}; var isServerSide = false; - var errorMode = false; reqStatusDataTable = dataTable_build( jquerySelector, @@ -1377,7 +1352,8 @@ selectList, orderList, buttonList, - isServerSide, - errorMode + isServerSide ); -}*/ +} + +