Index: arms/html/reqStatus/content-container.html =================================================================== diff -u -rb79d80bf0bd594eb4e5df089cd6b73ff78125802 -r2a8ed0ea9e2eb04bc66870db733dc14e30845ac6 --- arms/html/reqStatus/content-container.html (.../content-container.html) (revision b79d80bf0bd594eb4e5df089cd6b73ff78125802) +++ arms/html/reqStatus/content-container.html (.../content-container.html) (revision 2a8ed0ea9e2eb04bc66870db733dc14e30845ac6) @@ -760,13 +760,13 @@ id="my_modal2_title" style="font-weight: bold"> - 연결 이슈 및 서브테스크 + 연결 이슈 및 서브테스크 조회

- 선택한 이슈와 연결된 이슈와 하위 이슈 정보입니다. + 선택한 요구사항 이슈와 연결이슈 및 서브테스크(하위작업)의 상세정보를 확인하실 수 있습니다.

@@ -807,7 +807,7 @@ class="modal-body" style="padding: 5px; border-top: 1px solid rgba(51, 51, 51, 0.3); padding-top: 5px">
FishEye: Tag 2a8ed0ea9e2eb04bc66870db733dc14e30845ac6 refers to a dead (removed) revision in file `arms/js/analysis/table/workerDetailInfoTable.js'. FishEye: No comparison available. Pass `N' to diff? Index: arms/js/reqStatus.js =================================================================== diff -u -rb79d80bf0bd594eb4e5df089cd6b73ff78125802 -r2a8ed0ea9e2eb04bc66870db733dc14e30845ac6 --- arms/js/reqStatus.js (.../reqStatus.js) (revision b79d80bf0bd594eb4e5df089cd6b73ff78125802) +++ arms/js/reqStatus.js (.../reqStatus.js) (revision 2a8ed0ea9e2eb04bc66870db733dc14e30845ac6) @@ -99,7 +99,7 @@ //버전 멀티 셀렉트 박스 이니시에이터 makeVersionMultiSelectBox(); - //popup_size_setting(); + reqIssueAndItsSubtasksEvent(); // 스크립트 실행 로직을 이곳에 추가합니다. $("#progress_status").slimScroll({ @@ -289,7 +289,7 @@ selectedVersionId = versionTag.join(","); if (versionTag === null || versionTag == "") { - alert("버전이 선택되지 않았습니다."); + alert("버전이 선택되지 않았습니다.");ㅔㅇ return; } @@ -393,8 +393,21 @@ return "
" + data + "
"; } // data-row 에 API에 맞는 param 설정 예정. - return "
" + data + - "
"; + + let btn_data_row = { + pdServiceVersions : row.pdServiceVersions.join(","), + jiraServerId : row.jira_server_id, + issueKey : data + }; + + return ("
" + data + + $("
"); + } return data; }, @@ -682,20 +695,7 @@ reqStatusDataTable.button(".buttons-pdf").trigger(); }); -function click_issue_key(c_jira_server_link, c_issue_key, c_pds_version_link) { - selectedIssueKey = ""; - console.log("clicked_issue_name ==> " + name); - if (name !== "" || name !== undefined) { - selectedIssueKey = name; - } - var endPointUrl = "/T_ARMS_REQSTATUS_" + $("#selected_pdService").val() - + "/getIssueAndSubLinks.do?serverId=" + c_jira_server_link - + "&issueKey=" + c_issue_key - + "&versionId=" + c_pds_version_link; - getLinkedIssueAndSubtask("not Use this parameter",endPointUrl); // 데이터테이블 그리기 -} - function getLinkedIssueAndSubtask(notUse, endPointUrl) { var columnList = [ { @@ -715,7 +715,7 @@ }, { name: "key", - title: "요구사항 이슈 키", + title: "ALM Issue Key", data: "key", render: function (data, type, row, meta) { if (isEmpty(data) || data === "unknown") { @@ -729,8 +729,23 @@ visible: true }, { + name: "parentReqKey", + title: "부모이슈 키", + data: "parentReqKey", + 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: "summary", - title: "요구사항", + title: "ALM Issue Title ", data: "summary", render: function (data, type, row, meta) { if (isEmpty(data) || data === "unknown") { @@ -744,19 +759,19 @@ visible: true }, { - name: "parentReqKey", - title: "부모이슈 키", - data: "parentReqKey", + name: "issuetype.issuetype_name", + title: "ALM Issue Type", + data: "issuetype.issuetype_name", render: function (data, type, row, meta) { - if (isEmpty(data) || data === "unknown") { + if (isEmpty(data) || data === "false") { return "
N/A
"; } else { return "
" + data + "
"; } return data; }, className: "dt-body-left", - visible: false + visible: true }, { name: "priority", @@ -791,7 +806,7 @@ { name: "reporter", title: "이슈 보고자", - data: "reporter.reporter_accountId", + data: "reporter.reporter_displayName", render: function (data, type, row, meta) { if (isEmpty(data) || data === "unknown") { return "
N/A
"; @@ -806,7 +821,7 @@ { name: "assignee", title: "이슈 할당자", - data: "assignee.assignee_accountId", + data: "assignee.assignee_displayName", render: function (data, type, row, meta) { if (isEmpty(data) || data === "unknown") { return "
N/A
"; @@ -880,19 +895,236 @@ ); } -function popup_size_setting() { - $("#modal_popup_id").click(function () { - console.log("modal_popup_id clicked"); - var height = $(document).height() - 600; +function reqIssueAndItsSubtasksEvent() { + let $modalBtn; + $("#subtask_linkedissue_modal").on("shown.bs.modal", function(event) { + console.log("[ reqStatus :: reqIssueAndItsSubtasksEvent ] :: subtask_linkedissue_modal btn is clicked"); + $modalBtn = $(event.relatedTarget); + var selectedRow = $modalBtn.data("row"); + console.log(selectedRow); - $("#my_modal2").on("hidden.bs.modal", function (e) { - console.log("modal close"); - console.log($(this).find('form')[0]); - $(this).find('form')[0].reset(); - }); - - $(".modal-body") - .find(".cke_contents:eq(0)") - .css("height", height + "px"); + var endPointUrl = "/T_ARMS_REQSTATUS_" + selectedPdServiceId + + "/getIssueAndItsSubtasks.do?" + + "pdServiceVersions=" + selectedRow.pdServiceVersions + + "&jiraServerId=" + selectedRow.jiraServerId + + "&issueKey=" + selectedRow.issueKey; + getReqIssueAndItsSubtakss(endPointUrl); // 데이터테이블 그리기 }); +} + +function getReqIssueAndItsSubtakss(endPointUrl) { + + var columnList = [ + { + name: "isReq", + title: "요구사항 구분", + data: "isReq", + render: function (data, type, row, meta) { + if (isEmpty(data) || data == false) { + return "
연결 이슈
"; + } else { + return "
요구사항 이슈
"; + } + 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") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "parentReqKey", + title: "부모이슈 키", + data: "parentReqKey", + 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: "summary", + title: "ALM Issue Title ", + data: "summary", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "unknown") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "issuetype.issuetype_name", + title: "Issue Type", + data: "issuetype.issuetype_name", + render: function (data, type, row, meta) { + 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: "priority", + title: "Issue Priority", + data: "priority.priority_name", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "unknown") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "status.status_name", + title: "Issue Status", + data: "status.status_name", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "unknown") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + return data; + }, + className: "dt-body-left", + visible: true + }, + { + name: "reporter.reporter_displayName", + title: "Issue Reporter", + data: "reporter.reporter_displayName", + render: function (data, type, row, meta) { + if (isEmpty(data) || data === "unknown") { + return "
N/A
"; + } else { + return "
" + data + "
"; + } + 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 orderList = [[1, "asc"]]; + var jquerySelector = "#reqIssueAndItsSubtasksTable"; + var ajaxUrl = "/auth-user/api/arms/reqStatus" + endPointUrl; + var jsonRoot = "response"; + var buttonList = []; + var selectList = {}; + var isServerSide = false; + var errorMode = false; + + reqStatusDataTable = dataTable_build( + jquerySelector, + ajaxUrl, + jsonRoot, + columnList, + rowsGroupList, + columnDefList, + selectList, + orderList, + buttonList, + isServerSide, + errorMode + ); } \ No newline at end of file